Fix history in wxWebViewIE when using a custom file scheme.

[wxWidgets.git] / src / common / txtstrm.cpp

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 9617ae5e215e7f6dcce66d07de7154710eace511..94083459604484ffd4c4ce691548884a31ce56a6 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,18 +1,14 @@
-/////////////////////////////////////////////////////////////////////////////////
-// Name:        txtstrm.cpp
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/txtstrm.cpp

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
-// Licence:    wxWindows license
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "txtstrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,328 +20,524 @@
 
 #include "wx/txtstrm.h"
 
 
 #include "wx/txtstrm.h"
 

-wxTextInputStream::wxTextInputStream(wxInputStream& s)
-  : m_input(&s)
+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+
+#include <ctype.h>
+
+// ----------------------------------------------------------------------------
+// wxTextInputStream
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())

 {
 {

+    memset((void*)m_lastBytes, 0, 10);

 }
 }

+#else
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
+  : m_input(s), m_separators(sep)
+{
+    memset((void*)m_lastBytes, 0, 10);
+}
+#endif

 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+void wxTextInputStream::UngetLast()
+{
+    size_t byteCount = 0;
+    while(m_lastBytes[byteCount]) // pseudo ANSI strlen (even for Unicode!)
+        byteCount++;
+    m_input.Ungetch(m_lastBytes, byteCount);
+    memset((void*)m_lastBytes, 0, 10);

 }
 
 }
 

-wxUint32 wxTextInputStream::Read32()
+wxChar wxTextInputStream::NextChar()

 {
 {

-  /* I only implemented a simple integer parser */
-  int c; 
-  int sign;
-  wxInt32 i;
+#if wxUSE_UNICODE
+    wxChar wbuf[2];
+    memset((void*)m_lastBytes, 0, 10);
+    for(size_t inlen = 0; inlen < 9; inlen++)
+    {
+        // actually read the next character
+        m_lastBytes[inlen] = m_input.GetC();
+
+        if(m_input.LastRead() <= 0)
+            return wxEOT;
+
+        switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+        {
+            case 0:
+                // this is a bug in converter object as it should either fail
+                // or decode non-empty string to something non-empty
+                wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+                break;
+
+            case wxCONV_FAILED:
+                // the buffer probably doesn't contain enough bytes to decode
+                // as a complete character, try with more bytes
+                break;
+
+            default:
+                // if we couldn't decode a single character during the last
+                // loop iteration we shouldn't be able to decode 2 or more of
+                // them with an extra single byte, something fishy is going on
+                wxFAIL_MSG("unexpected decoding result");
+                // fall through nevertheless and return at least something
+
+            case 1:
+                // we finally decoded a character
+                return wbuf[0];
+        }
+    }

 
 

-  while (isspace( c = m_input->GetC() ) )
-     /* Do nothing */ ;
+    // there should be no encoding which requires more than nine bytes for one
+    // character so something must be wrong with our conversion but we have no
+    // way to signal it from here
+    return wxEOT;
+#else
+    m_lastBytes[0] = m_input.GetC();

 
 

-  i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
-    m_input->Ungetch(c);
-    return 0;
-  }
+    if(m_input.LastRead() <= 0)
+        return wxEOT;

 
 

-  if (c == '-') {
-    sign = -1;
-    c = m_input->GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = m_input->GetC();
-  } else {
-    sign = 1;
-  }
+    return m_lastBytes[0];
+#endif

 
 

-  while (isdigit(c)) {
-    i = i*10 + (c - (int)'0');
-    c = m_input->GetC();
-  }
+}

 
 

-  if (c != '\n' && c != '\r')
-    m_input->Ungetch(c);
+wxChar wxTextInputStream::NextNonSeparators()
+{
+    for (;;)
+    {
+        wxChar c = NextChar();
+        if (c == wxEOT) return (wxChar) 0;

 
 

-  i *= sign;
+        if (c != wxT('\n') &&
+            c != wxT('\r') &&
+            m_separators.Find(c) < 0)
+          return c;
+    }

 
 

-  return (wxUint32)i;

 }
 
 }
 

-wxUint16 wxTextInputStream::Read16()
+bool wxTextInputStream::EatEOL(const wxChar &c)

 {
 {

-  return (wxUint16)Read32();
+    if (c == wxT('\n')) return true; // eat on UNIX
+
+    if (c == wxT('\r')) // eat on both Mac and DOS
+    {
+        wxChar c2 = NextChar();
+        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)
+
+        if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
+        return true;
+    }
+
+    return false;

 }
 
 }
 

-wxUint8 wxTextInputStream::Read8()
+wxUint32 wxTextInputStream::Read32(int base)

 {
 {

-  return (wxUint8)Read32();
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
+    if(!m_input) return 0;
+
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtoul(word.c_str(), 0, base);
+}
+
+wxUint16 wxTextInputStream::Read16(int base)
+{
+    return (wxUint16)Read32(base);
+}
+
+wxUint8 wxTextInputStream::Read8(int base)
+{
+    return (wxUint8)Read32(base);
+}
+
+wxInt32 wxTextInputStream::Read32S(int base)
+{
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
+    if(!m_input) return 0;
+
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtol(word.c_str(), 0, base);
+}
+
+wxInt16 wxTextInputStream::Read16S(int base)
+{
+    return (wxInt16)Read32S(base);
+}
+
+wxInt8 wxTextInputStream::Read8S(int base)
+{
+    return (wxInt8)Read32S(base);

 }
 
 double wxTextInputStream::ReadDouble()
 {
 }
 
 double wxTextInputStream::ReadDouble()
 {

-  /* I only implemented a simple float parser */
-  double f;
-  int c, sign;
-
-  while (isspace( c = m_input->GetC() ) || c == '\n' || c == '\r')
-     /* Do nothing */ ;
-
-  f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
-    m_input->Ungetch(c);
-    return 0.0;
-  }
-
-  if (c == '-') {
-    sign = -1;
-    c = m_input->GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = m_input->GetC();
-  } else {
-    sign = 1;
-  }
-
-  while (isdigit(c)) {
-    f = f*10 + (c - '0');
-    c = m_input->GetC();
-  }
-
-  if (c == '.') {
-    double f_multiplicator = (double) 0.1;
-
-    c = m_input->GetC();
-
-    while (isdigit(c)) {
-      f += (c-'0')*f_multiplicator;
-      f_multiplicator /= 10;
-      c = m_input->GetC();
-    }
+    if(!m_input) return 0;
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtod(word.c_str(), 0);
+}

 
 

-    if (c == 'e') {
-      double f_multiplicator = 0.0;
-      int i, e;
+#if WXWIN_COMPATIBILITY_2_6

 
 

-      c = m_input->GetC();
+wxString wxTextInputStream::ReadString()
+{
+    return ReadLine();
+}

 
 

-      switch(c) {
-      case '-':
-        f_multiplicator = 0.1;
-        break;
-      case '+':
-        f_multiplicator = 10.0;
-        break;
-      }
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-      e = Read8();
+wxString wxTextInputStream::ReadLine()
+{
+    wxString line;

 
 

-      for (i=0;i<e;i++)
-        f *= f_multiplicator;
-    } else if (c != '\n' && c != '\r')
-      m_input->Ungetch(c);
- 
-  }
+    while ( !m_input.Eof() )
+    {
+        wxChar c = NextChar();
+        if(c == wxEOT)
+            break;

 
 

-  f *= sign;
+        if (EatEOL(c))
+            break;

 
 

-  return f;
+        line += c;
+    }
+
+    return line;

 }
 
 }
 

-wxString wxTextInputStream::ReadString()
+wxString wxTextInputStream::ReadWord()

 {
 {

-  char c, last_endl = 0;
-  bool end_line = FALSE;
-  wxString line;
+    wxString word;
+
+    if ( !m_input )
+        return word;
+
+    wxChar c = NextNonSeparators();
+    if ( !c )
+        return word;
+
+    word += c;

 
 

-  while (!end_line) {
-    c = m_input->GetC();
-    if (m_input->LastError() != wxStream_NOERROR)
-      break;
+    while ( !m_input.Eof() )
+    {
+        c = NextChar();
+        if(c == wxEOT)
+            break;

 
 

-    switch (c) {
-    case '\n':
-      end_line = TRUE;
-      break;
-    case '\r':
-      last_endl = '\r';
-      break;
-    default:
-      if (last_endl == '\r') {
-        end_line = TRUE;
-        m_input->Ungetch(c);
-        break;
-      }
-      line += c;
-      break;
-    } 
-  }
-  return line;
+        if (m_separators.Find(c) >= 0)
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        word += c;
+    }
+
+    return word;

 }
 }

-  
-wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
+
+wxTextInputStream& wxTextInputStream::operator>>(wxString& word)

 {
 {

-  line = ReadString();
-  return *this;
+    word = ReadWord();
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxInt8& c)
+wxTextInputStream& wxTextInputStream::operator>>(char& c)

 {
 {

-  c = (wxInt8)Read8();
-  return *this;
+    c = m_input.GetC();
+    if(m_input.LastRead() <= 0) c = 0;
+
+    if (EatEOL(c))
+        c = '\n';
+
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)

 {
 {

-  i = (wxInt16)Read16();
-  return *this;
+    wc = GetChar();
+
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)
+#endif // wxUSE_UNICODE
+
+wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)

 {
 {

-  i = (wxInt32)Read32();
-  return *this;
+    i = (wxInt16)Read16();
+    return *this;

 }
 
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxUint8& c)
+wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)

 {
 {

-  c = Read8();
-  return *this;
+    i = (wxInt32)Read32();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
 {

-  i = Read16();
-  return *this;
+    i = Read16();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
 {

-  i = Read32();
-  return *this;
+    i = Read32();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(double& i)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(double& i)
 {

-  i = ReadDouble();
-  return *this;
+    i = ReadDouble();
+    return *this;

 }
 
 wxTextInputStream& wxTextInputStream::operator>>(float& f)
 {
 }
 
 wxTextInputStream& wxTextInputStream::operator>>(float& f)
 {

-  f = (float)ReadDouble();
-  return *this;
+    f = (float)ReadDouble();
+    return *this;

 }
 
 }
 

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
-  : m_output(&s)
+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())
+#else
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
+  : m_output(s)
+#endif

 {
 {

+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }

 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+void wxTextOutputStream::SetMode(wxEOL mode)
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }

 }
 
 void wxTextOutputStream::Write32(wxUint32 i)
 {
 }
 
 void wxTextOutputStream::Write32(wxUint32 i)
 {

-  wxString str;
+    wxString str;
+    str.Printf(wxT("%u"), i);

 
 

-  str.Printf(_T("%u"), i);
-  WriteString(str);
+    WriteString(str);

 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {

-  wxString str;
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned)i);

 
 

-  str.Printf(_T("%u"), i);
-  WriteString(str);
+    WriteString(str);

 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {

-  wxString str;
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned)i);

 
 

-  str.Printf(_T("%u"), i);
-  WriteString(str);
+    WriteString(str);

 }
 
 void wxTextOutputStream::WriteDouble(double d)
 {
 }
 
 void wxTextOutputStream::WriteDouble(double d)
 {

-  wxString str;
+    wxString str;

 
 

-  str.Printf(_T("%f"), d);
-  WriteString(str);
+    str.Printf(wxT("%f"), d);
+    WriteString(str);

 }
 
 void wxTextOutputStream::WriteString(const wxString& string)
 }
 
 void wxTextOutputStream::WriteString(const wxString& string)

+{
+    size_t len = string.length();
+
+    wxString out;
+    out.reserve(len);
+
+    for ( size_t i = 0; i < len; i++ )
+    {
+        const wxChar c = string[i];
+        if ( c == wxT('\n') )
+        {
+            switch ( m_mode )
+            {
+                case wxEOL_DOS:
+                    out << wxT("\r\n");
+                    continue;
+
+                case wxEOL_MAC:
+                    out << wxT('\r');
+                    continue;
+
+                default:
+                    wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );
+                    // fall through
+
+                case wxEOL_UNIX:
+                    // don't treat '\n' specially
+                    ;
+            }
+        }
+
+        out << c;
+    }
+
+#if wxUSE_UNICODE
+    // FIXME-UTF8: use wxCharBufferWithLength if/when we have it
+    wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len);
+    m_output.Write(buffer, len);
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif
+}
+
+wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)

 {
 #if wxUSE_UNICODE
 {
 #if wxUSE_UNICODE

-  const wxWX2MBbuf buf = string.mb_str();
-  m_output->Write(buf, string.Len());
+    WriteString( wxString(&c, *m_conv, 1) );

 #else
 #else

-  m_output->Write(string, string.Len());
+    WriteString( wxString(&c, wxConvLocal, 1) );

 #endif
 #endif

+    return *this;

 }
 
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
+void wxTextOutputStream::Flush()

 {
 {

-  WriteString(wxString(string));
-  return *this;
+#if wxUSE_UNICODE
+    const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
+    if ( len > m_conv->GetMBNulLen() )
+    {
+        wxCharBuffer buf(len);
+        m_conv->FromWChar(buf.data(), len, L"", 1);
+        m_output.Write(buf, len - m_conv->GetMBNulLen());
+    }
+#endif // wxUSE_UNICODE

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {

-  WriteString(string);
-  return *this;
+    WriteString( string );
+    return *this;

 }
 
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxInt8 c)
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)

 {
 {

-  Write8((wxUint8)c);
-  return *this;
+    WriteString( wxString::FromAscii(c) );
+
+    return *this;

 }
 
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)

 {
 {

-  Write16((wxUint16)c);
-  return *this;
+    WriteString( wxString(&wc, *m_conv, 1) );
+
+    return *this;

 }
 
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
+#endif // wxUSE_UNICODE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)

 {
 {

-  Write32((wxUint32)c);
-  return *this;
+    wxString str;
+    str.Printf(wxT("%d"), (signed int)c);
+    WriteString(str);
+
+    return *this;

 }
 
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxUint8 c)
+wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)

 {
 {

-  Write8(c);
-  return *this;
+    wxString str;
+    str.Printf(wxT("%ld"), (signed long)c);
+    WriteString(str);
+
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {

-  Write16(c);
-  return *this;
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned int)c);
+    WriteString(str);
+
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {

-  Write32(c);
-  return *this;
+    wxString str;
+    str.Printf(wxT("%lu"), (unsigned long)c);
+    WriteString(str);
+
+    return *this;

 }
 
 wxTextOutputStream &wxTextOutputStream::operator<<(double f)
 {
 }
 
 wxTextOutputStream &wxTextOutputStream::operator<<(double f)
 {

-  WriteDouble(f);
-  return *this;
+    WriteDouble(f);
+    return *this;

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 {
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 {

-  WriteDouble((double)f);
-  return *this;
+    WriteDouble((double)f);
+    return *this;
+}
+
+wxTextOutputStream &endl( wxTextOutputStream &stream )
+{
+    return stream.PutChar(wxT('\n'));

 }
 
 #endif
 }
 
 #endif