Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / html / winpars.cpp

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 1769f56c264b6639e0fe9d150e910d30db1dcb51..916c43a989e9652b70b707ff60a69e24e583de86 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -47,11 +47,14 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindowInterface *wndIface)
     m_CharHeight = m_CharWidth = 0;
     m_UseLink = false;
 #if !wxUSE_UNICODE
     m_CharHeight = m_CharWidth = 0;
     m_UseLink = false;
 #if !wxUSE_UNICODE

+    m_nbsp = 0;

     m_EncConv = NULL;
     m_InputEnc = wxFONTENCODING_ISO8859_1;
     m_OutputEnc = wxFONTENCODING_DEFAULT;
 #endif
     m_EncConv = NULL;
     m_InputEnc = wxFONTENCODING_ISO8859_1;
     m_OutputEnc = wxFONTENCODING_DEFAULT;
 #endif

+    m_whitespaceMode = Whitespace_Normal;

     m_lastWordCell = NULL;
     m_lastWordCell = NULL;

+    m_posColumn = 0;

 
     {
         int i, j, k, l, m;
 
     {
         int i, j, k, l, m;


@@ -199,7 +202,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into

-    
+

     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;
     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;


@@ -342,97 +345,180 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
     return GetFS()->OpenFile(myurl, flags);
 }
 
     return GetFS()->OpenFile(myurl, flags);
 }
 

+#define NBSP_UNICODE_VALUE  (wxChar(160))
+#if !wxUSE_UNICODE
+    #define CUR_NBSP_VALUE m_nbsp
+#else
+    #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
+#endif
+

 void wxHtmlWinParser::AddText(const wxString& txt)
 {
 void wxHtmlWinParser::AddText(const wxString& txt)
 {

-    register wxChar d;
-    int templen = 0;
-    wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */);
+#if !wxUSE_UNICODE
+    if ( m_nbsp == 0 )
+        m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
+#endif

 
 

-    size_t lng = txt.length();
-    if (lng+1 > m_tmpStrBufSize)
+    if ( m_whitespaceMode == Whitespace_Normal )

     {
     {

-        delete[] m_tmpStrBuf;
-        m_tmpStrBuf = new wxChar[lng+1];
-        m_tmpStrBufSize = lng+1;
-    }
-    wxChar *temp = m_tmpStrBuf;
-
-    wxString::const_iterator i = txt.begin();
-    wxString::const_iterator end = txt.end();
+        int templen = 0;

 
 

-    if (m_tmpLastWasSpace)
-    {
-        while ( (i < end) &&
-                (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
-                 *i == wxT('\t')) )
+        size_t lng = txt.length();
+        if (lng+1 > m_tmpStrBufSize)

         {
         {

-            ++i;
+            delete[] m_tmpStrBuf;
+            m_tmpStrBuf = new wxChar[lng+1];
+            m_tmpStrBufSize = lng+1;

         }
         }

-    }
+        wxChar *temp = m_tmpStrBuf;

 
 

-    while (i < end)
-    {
-        size_t x = 0;
-        d = temp[templen++] = *i;
-        if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
+        wxString::const_iterator i = txt.begin();
+        const wxString::const_iterator end = txt.end();
+
+        if (m_tmpLastWasSpace)

         {
         {

-            ++i, ++x;

             while ( (i < end) &&
             while ( (i < end) &&

-                    (*i == wxT('\n') || *i == wxT('\r') ||
-                     *i == wxT(' ') || *i == wxT('\t')) )
+                    (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
+                     *i == wxT('\t')) )

             {
                 ++i;
             {
                 ++i;

-                ++x;

             }
         }
             }
         }

-        else
-            ++i;

 
 

-        if (x)
+        while (i < end)
+        {
+            size_t x = 0;
+            const wxChar d = temp[templen++] = *i;
+            if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
+            {
+                ++i, ++x;
+                while ( (i < end) &&
+                        (*i == wxT('\n') || *i == wxT('\r') ||
+                         *i == wxT(' ') || *i == wxT('\t')) )
+                {
+                    ++i;
+                    ++x;
+                }
+            }
+            else
+            {
+                ++i;
+            }
+
+            if (x)
+            {
+                temp[templen-1] = wxT(' ');
+                FlushWordBuf(temp, templen);
+                m_tmpLastWasSpace = true;
+            }
+        }
+
+        if (templen && (templen > 1 || temp[0] != wxT(' ')))

         {
         {

-            temp[templen-1] = wxT(' ');
-            DoAddText(temp, templen, nbsp);
-            m_tmpLastWasSpace = true;
+            FlushWordBuf(temp, templen);
+            m_tmpLastWasSpace = false;

         }
     }
         }
     }

-
-    if (templen && (templen > 1 || temp[0] != wxT(' ')))
+    else // m_whitespaceMode == Whitespace_Pre

     {
     {

-        DoAddText(temp, templen, nbsp);
+        if ( txt.find(CUR_NBSP_VALUE) != wxString::npos )
+        {
+            // we need to substitute spaces for &nbsp; here just like we
+            // did in the Whitespace_Normal branch above
+            wxString txt2(txt);
+            txt2.Replace(CUR_NBSP_VALUE, ' ');
+            AddPreBlock(txt2);
+        }
+        else
+        {
+            AddPreBlock(txt);
+        }
+
+        // don't eat any whitespace in <pre> block

         m_tmpLastWasSpace = false;
     }
 }
 
         m_tmpLastWasSpace = false;
     }
 }
 

-void wxHtmlWinParser::DoAddText(wxChar *temp, int& templen, wxChar nbsp)
+void wxHtmlWinParser::FlushWordBuf(wxChar *buf, int& len)

 {
 {

-    temp[templen] = 0;
-    templen = 0;
+    buf[len] = 0;
+
+    for ( int i = 0; i < len; i++ )
+    {
+        if ( buf[i] == CUR_NBSP_VALUE )
+            buf[i] = ' ';
+    }
+

 #if !wxUSE_UNICODE
     if (m_EncConv)
 #if !wxUSE_UNICODE
     if (m_EncConv)

-        m_EncConv->Convert(temp);
+        m_EncConv->Convert(buf);

 #endif
 #endif

-    size_t len = wxStrlen(temp);
-    for (size_t j = 0; j < len; j++)
-    {
-        if (temp[j] == nbsp)
-            temp[j] = wxT(' ');
-    }

 
 

-    wxHtmlCell *c = new wxHtmlWordCell(temp, *(GetDC()));
+    AddWord(wxString(buf, len));
+
+    len = 0;
+}

 
 

-    ApplyStateToCell(c);
+void wxHtmlWinParser::AddWord(wxHtmlWordCell *word)
+{
+    ApplyStateToCell(word);

 
 

-    m_Container->InsertCell(c);
-    ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
-    m_lastWordCell = (wxHtmlWordCell*)c;
+    m_Container->InsertCell(word);
+    word->SetPreviousWord(m_lastWordCell);
+    m_lastWordCell = word;

 }
 
 }
 

+void wxHtmlWinParser::AddPreBlock(const wxString& text)
+{
+    if ( text.find('\t') != wxString::npos )
+    {
+        wxString text2;
+        text2.reserve(text.length());
+
+        const wxString::const_iterator end = text.end();
+        wxString::const_iterator copyFrom = text.begin();
+        size_t pos = 0;
+        int posColumn = m_posColumn;
+        for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
+        {
+            if ( *i == '\t' )
+            {
+                if ( copyFrom != i )
+                    text2.append(copyFrom, i);
+
+                const unsigned SPACES_PER_TAB = 8;
+                const size_t expandTo = SPACES_PER_TAB - posColumn % SPACES_PER_TAB;
+                text2.append(expandTo, ' ');
+
+                posColumn += expandTo;
+                copyFrom = i + 1;
+            }
+            else
+            {
+                ++posColumn;
+            }
+        }
+        if ( copyFrom != text.end() )
+            text2.append(copyFrom, text.end());
+
+        AddWord(new wxHtmlWordWithTabsCell(text2, text, m_posColumn, *(GetDC())));
+
+        m_posColumn = posColumn;
+    }
+    else
+    {
+        // no special formatting needed
+        AddWord(text);
+        m_posColumn += text.length();
+    }
+}

 
 
 wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 {
     m_Container = new wxHtmlContainerCell(m_Container);
     m_Container->SetAlignHor(m_Align);
 
 
 wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 {
     m_Container = new wxHtmlContainerCell(m_Container);
     m_Container->SetAlignHor(m_Align);

+    m_posColumn = 0;

     m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container;
     m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container;


@@ -458,12 +544,46 @@ wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
 
 void wxHtmlWinParser::SetFontSize(int s)
 {
 
 void wxHtmlWinParser::SetFontSize(int s)
 {

-    if (s < 1) s = 1;
-    else if (s > 7) s = 7;
+    if (s < 1)
+        s = 1;
+    else if (s > 7)
+        s = 7;

     m_FontSize = s;
 }
 
 
     m_FontSize = s;
 }
 
 

+void wxHtmlWinParser::SetDC(wxDC *dc, double pixel_scale, double font_scale)
+{
+    m_DC = dc;
+    m_PixelScale = pixel_scale;
+    m_FontScale = font_scale;
+}
+
+void wxHtmlWinParser::SetFontPointSize(int pt)
+{
+    if (pt <= m_FontsSizes[0])
+        m_FontSize = 1;
+    else if (pt >= m_FontsSizes[6])
+        m_FontSize = 7;
+    else
+    {
+        // Find the font closest to the given value with a simple linear search
+        // (binary search is not worth it here for so small number of elements)
+        for ( int n = 0; n < 6; n++ )
+        {
+            if ( (pt > m_FontsSizes[n]) && (pt <= m_FontsSizes[n + 1]) )
+            {
+                // In this range, find out which entry it is closest to
+                if ( (pt - m_FontsSizes[n]) < (m_FontsSizes[n + 1] - pt) )
+                    m_FontSize = n;
+                else
+                    m_FontSize = n + 1;
+
+                break;
+            }
+        }
+    }
+}

 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {
 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {


@@ -486,15 +606,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
 #endif
                             ))
     {
 #endif
                             ))
     {

-        delete *fontptr;
-        *fontptr = NULL;
+        wxDELETE(*fontptr);

     }
 
     if (*fontptr == NULL)
     {
         *faceptr = face;
         *fontptr = new wxFont(
     }
 
     if (*fontptr == NULL)
     {
         *faceptr = face;
         *fontptr = new wxFont(

-                       (int) (m_FontsSizes[fs] * m_PixelScale),
+                       (int) (m_FontsSizes[fs] * m_FontScale),

                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,
                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,


@@ -520,8 +639,10 @@ void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
 
 void wxHtmlWinParser::SetFontFace(const wxString& face)
 {
 
 void wxHtmlWinParser::SetFontFace(const wxString& face)
 {

-    if (GetFontFixed()) m_FontFaceFixed = face;
-    else m_FontFaceNormal = face;
+    if (GetFontFixed())
+        m_FontFaceFixed = face;
+    else
+        m_FontFaceNormal = face;

 
 #if !wxUSE_UNICODE
     if (m_InputEnc != wxFONTENCODING_DEFAULT)
 
 #if !wxUSE_UNICODE
     if (m_InputEnc != wxFONTENCODING_DEFAULT)


@@ -543,36 +664,43 @@ void wxHtmlWinParser::ApplyStateToCell(wxHtmlCell *cell)
 #if !wxUSE_UNICODE
 void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 {
 #if !wxUSE_UNICODE
 void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 {

+    // the character used for non-breakable space may change:
+    m_nbsp = 0;
+

     m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
     m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;

-    if (m_EncConv)
-    {
-        delete m_EncConv;
-        m_EncConv = NULL;
-    }
+    wxDELETE(m_EncConv);

 
 

-    if (enc == wxFONTENCODING_DEFAULT) return;
+    if (enc == wxFONTENCODING_DEFAULT)
+        return;

 
     wxFontEncoding altfix, altnorm;
     bool availfix, availnorm;
 
 
     wxFontEncoding altfix, altnorm;
     bool availfix, availnorm;
 

-    // exact match?

     availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
     availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);
     availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
     availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);

+

     if (availnorm && availfix)
     if (availnorm && availfix)

+    {
+        // exact match?

         m_OutputEnc = enc;
         m_OutputEnc = enc;

+    }

 
 

-    // alternatives?

     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) &&
              wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) &&
              altnorm == altfix)
     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) &&
              wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) &&
              altnorm == altfix)

+    {
+        // alternatives?

         m_OutputEnc = altnorm;
         m_OutputEnc = altnorm;

-
-    // at least normal face?
+    }

     else if (availnorm)
     else if (availnorm)

+    {
+        // at least normal face?

         m_OutputEnc = enc;
         m_OutputEnc = enc;

+    }

     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false))
     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false))

+    {

         m_OutputEnc = altnorm;
         m_OutputEnc = altnorm;

-
+    }

     else
     {
 #ifndef __WXMAC__
     else
     {
 #ifndef __WXMAC__


@@ -585,11 +713,16 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 
     m_InputEnc = enc;
     if (m_OutputEnc == wxFONTENCODING_DEFAULT)
 
     m_InputEnc = enc;
     if (m_OutputEnc == wxFONTENCODING_DEFAULT)

+    {

         GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM);
         GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM);

+    }

     else
     else

+    {

         GetEntitiesParser()->SetEncoding(m_OutputEnc);
         GetEntitiesParser()->SetEncoding(m_OutputEnc);

+    }

 
 

-    if (m_InputEnc == m_OutputEnc) return;
+    if (m_InputEnc == m_OutputEnc)
+        return;

 
     m_EncConv = new wxEncodingConverter();
     if (!m_EncConv->Init(m_InputEnc,
 
     m_EncConv = new wxEncodingConverter();
     if (!m_EncConv->Init(m_InputEnc,


@@ -600,8 +733,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
         wxLogError(_("Failed to display HTML document in %s encoding"),
                    wxFontMapper::GetEncodingName(enc).c_str());
         m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
         wxLogError(_("Failed to display HTML document in %s encoding"),
                    wxFontMapper::GetEncodingName(enc).c_str());
         m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;

-        delete m_EncConv;
-        m_EncConv = NULL;
+        wxDELETE(m_EncConv);

     }
 }
 #endif
     }
 }
 #endif