X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f42d2aba7645ab25ed3764d55394e58649ab0363..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/common/textfile.cpp?ds=sidebyside diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index 931c5048b6..ff284db484 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -14,27 +14,35 @@ // ============================================================================ #ifdef __GNUG__ -#pragma implementation "textfile.h" + #pragma implementation "textfile.h" #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif //__BORLANDC__ -#include -#include -#include -#include -#include +#if !wxUSE_FILE + #undef wxUSE_TEXTFILE + #define wxUSE_TEXTFILE 0 +#endif // wxUSE_FILE + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/file.h" + #include "wx/log.h" +#endif + +#include "wx/textfile.h" // ============================================================================ // wxTextFile class implementation // ============================================================================ // ---------------------------------------------------------------------------- -// static variables +// static methods (always compiled in) // ---------------------------------------------------------------------------- // default type is the native one @@ -45,11 +53,91 @@ const wxTextFileType wxTextFile::typeDefault = wxTextFileType_Unix; #elif defined(__WXMAC__) wxTextFileType_Mac; +#elif defined(__WXPM__) + wxTextFileType_Os2; #else wxTextFileType_None; #error "wxTextFile: unsupported platform." #endif +const wxChar *wxTextFile::GetEOL(wxTextFileType type) +{ + switch ( type ) { + default: + wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL.")); + // fall through nevertheless - we must return something... + + case wxTextFileType_None: return wxT(""); + case wxTextFileType_Unix: return wxT("\n"); + case wxTextFileType_Dos: return wxT("\r\n"); + case wxTextFileType_Mac: return wxT("\r"); + } +} + +wxString wxTextFile::Translate(const wxString& text, wxTextFileType type) +{ + // don't do anything if there is nothing to do + if ( type == wxTextFileType_None ) + return text; + + // GRG: don't do anything either if it is empty + if ( text.IsEmpty() ) + return text; + + wxString eol = GetEOL(type), result; + + // optimization: we know that the length of the new string will be about + // the same as the length of the old one, so prealloc memory to aviod + // unnecessary relocations + result.Alloc(text.Len()); + + wxChar chLast = 0; + for ( const wxChar *pc = text.c_str(); *pc; pc++ ) + { + wxChar ch = *pc; + switch ( ch ) { + case _T('\n'): + // Dos/Unix line termination + result += eol; + chLast = 0; + break; + + case _T('\r'): + if ( chLast == _T('\r') ) { + // Mac empty line + result += eol; + } + else { + // just remember it: we don't know whether it is just "\r" + // or "\r\n" yet + chLast = _T('\r'); + } + break; + + default: + if ( chLast == _T('\r') ) { + // Mac line termination + result += eol; + + // reset chLast to avoid inserting another eol before the + // next character + chLast = 0; + } + + // add to the current line + result += ch; + } + } + + if ( chLast ) { + // trailing '\r' + result += eol; + } + + return result; +} + +#if wxUSE_TEXTFILE // ---------------------------------------------------------------------------- // ctors & dtor @@ -57,6 +145,8 @@ const wxTextFileType wxTextFile::typeDefault = wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile) { + m_nCurLine = 0; + m_isOpened = FALSE; } wxTextFile::~wxTextFile() @@ -68,14 +158,45 @@ wxTextFile::~wxTextFile() // file operations // ---------------------------------------------------------------------------- -bool wxTextFile::Open(const wxString& strFile) +bool wxTextFile::Exists() const +{ + return wxFile::Exists(m_strFile); +} + +bool wxTextFile::Create(const wxString& strFile) +{ + m_strFile = strFile; + + return Create(); +} + +bool wxTextFile::Create() +{ + // file name must be either given in ctor or in Create(const wxString&) + wxASSERT( !m_strFile.IsEmpty() ); + + // if the file already exists do nothing + if ( Exists() ) return FALSE; + + if ( m_file.Open(m_strFile, wxFile::write) ) + { + m_file.Close(); + return TRUE; + } + else + { + return FALSE; + } +} + +bool wxTextFile::Open(const wxString& strFile, wxMBConv& conv) { m_strFile = strFile; - return Open(); + return Open(conv); } -bool wxTextFile::Open() +bool wxTextFile::Open(wxMBConv& conv) { // file name must be either given in ctor or in Open(const wxString&) wxASSERT( !m_strFile.IsEmpty() ); @@ -85,24 +206,23 @@ bool wxTextFile::Open() return FALSE; // read file into memory - bool bRet = Read(); + m_isOpened = Read(conv); m_file.Close(); - return bRet; + return m_isOpened; } // analyse some lines of the file trying to guess it's type. // if it fails, it assumes the native type for our platform. wxTextFileType wxTextFile::GuessType() const { - // file should be opened and we must be in it's beginning - wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); + wxASSERT( IsOpened() ); // scan the file lines size_t nUnix = 0, // number of '\n's alone - nDos = 0, // number of '\r\n' - nMac = 0; // number of '\r's + nDos = 0, // number of '\r\n' + nMac = 0; // number of '\r's // we take MAX_LINES_SCAN in the beginning, middle and the end of file #define MAX_LINES_SCAN (10) @@ -127,8 +247,8 @@ wxTextFileType wxTextFile::GuessType() const #undef AnalyseLine - // interpret the results (@@ far from being even 50% fool proof) - if ( nDos + nUnix + nMac == 0 ) { + // interpret the results (FIXME far from being even 50% fool proof) + if ( nScan > 0 && nDos + nUnix + nMac == 0 ) { // no newlines at all wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str()); } @@ -156,20 +276,27 @@ wxTextFileType wxTextFile::GuessType() const return typeDefault; } -bool wxTextFile::Read() +bool wxTextFile::Read(wxMBConv& conv) { // file should be opened and we must be in it's beginning wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); +#if wxUSE_UNICODE + char conv_mbBuf[2]; + wchar_t conv_wcBuf[2]; + conv_mbBuf[1] = 0; +#else + (void)conv; +#endif + wxString str; char ch, chLast = '\0'; char buf[1024]; int n, nRead; - while ( !m_file.Eof() ) { + do { nRead = m_file.Read(buf, WXSIZEOF(buf)); if ( nRead == wxInvalidOffset ) { // read error (error message already given in wxFile::Read) - m_file.Close(); return FALSE; } @@ -188,7 +315,7 @@ bool wxTextFile::Read() case '\r': if ( chLast == '\r' ) { // Mac empty line - m_aLines.Add(""); + m_aLines.Add(wxEmptyString); m_aTypes.Add(wxTextFileType_Mac); } else @@ -201,15 +328,27 @@ bool wxTextFile::Read() m_aLines.Add(str); m_aTypes.Add(wxTextFileType_Mac); chLast = ch; +#if wxUSE_UNICODE + if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1) + conv_wcBuf[0] = ch; + str = conv_wcBuf[0]; +#else str = ch; +#endif } else { // add to the current line +#if wxUSE_UNICODE + if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1) + conv_wcBuf[0] = ch; + str += conv_wcBuf[0]; +#else str += ch; +#endif } } } - } + } while ( nRead == WXSIZEOF(buf) ); // anything in the last line? if ( !str.IsEmpty() ) { @@ -225,11 +364,12 @@ bool wxTextFile::Close() m_aTypes.Clear(); m_aLines.Clear(); m_nCurLine = 0; + m_isOpened = FALSE; return TRUE; } -bool wxTextFile::Write(wxTextFileType typeNew) +bool wxTextFile::Write(wxTextFileType typeNew, wxMBConv& conv) { wxTempFile fileTmp(m_strFile); @@ -242,24 +382,12 @@ bool wxTextFile::Write(wxTextFileType typeNew) for ( size_t n = 0; n < nCount; n++ ) { fileTmp.Write(m_aLines[n] + GetEOL(typeNew == wxTextFileType_None ? m_aTypes[n] - : typeNew)); + : typeNew), conv); } // replace the old file with this one return fileTmp.Commit(); } -const char *wxTextFile::GetEOL(wxTextFileType type) - { - switch ( type ) { - case wxTextFileType_None: return ""; - case wxTextFileType_Unix: return "\n"; - case wxTextFileType_Dos: return "\r\n"; - case wxTextFileType_Mac: return "\r"; - - default: - wxFAIL_MSG("bad file type in wxTextFile::GetEOL."); - return (const char *) NULL; - } - } +#endif // wxUSE_TEXTFILE