X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10e5c7eaa0c916049981ed27d04257c1ab8dc043..cc9a39576ab6edb139c9bb77d01f4118853e04d2:/src/html/winpars.cpp

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 087c236a07..0dbab9d1f9 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -32,6 +32,7 @@
 #include "wx/fontmap.h"
 #include "wx/log.h"
 #include "wx/settings.h"
+#include "wx/uri.h"
 
 
 //-----------------------------------------------------------------------------
@@ -50,7 +51,7 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser()
     m_Container = NULL;
     m_DC = NULL;
     m_CharHeight = m_CharWidth = 0;
-    m_UseLink = FALSE;
+    m_UseLink = false;
 #if !wxUSE_UNICODE
     m_EncConv = NULL;
     m_InputEnc = wxFONTENCODING_ISO8859_1;
@@ -121,14 +122,14 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face,
     static int default_sizes[7] =
         {
             wxHTML_FONT_SIZE_1,
-			wxHTML_FONT_SIZE_2,
-			wxHTML_FONT_SIZE_3,
-			wxHTML_FONT_SIZE_4,
-			wxHTML_FONT_SIZE_5,
-			wxHTML_FONT_SIZE_6,
-			wxHTML_FONT_SIZE_7
+            wxHTML_FONT_SIZE_2,
+            wxHTML_FONT_SIZE_3,
+            wxHTML_FONT_SIZE_4,
+            wxHTML_FONT_SIZE_5,
+            wxHTML_FONT_SIZE_6,
+            wxHTML_FONT_SIZE_7
         };
-    
+
     if (sizes == NULL) sizes = default_sizes;
 
     int i, j, k, l, m;
@@ -159,7 +160,7 @@ void wxHtmlWinParser::SetStandardFonts(int size,
                                        const wxString& fixed_face)
 {
     wxFont defaultFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    
+
     int f_sizes[7];
     if (size == -1)
         size = defaultFont.GetPointSize();
@@ -172,9 +173,9 @@ void wxHtmlWinParser::SetStandardFonts(int size,
     f_sizes[5] = int(size * 1.6);
     f_sizes[6] = int(size * 1.8);
 
-    wxString normal = normal_face.empty() ? 
+    wxString normal = normal_face.empty() ?
                       defaultFont.GetFaceName() : normal_face;
-    
+
     SetFonts(normal, fixed_face, f_sizes);
 }
 
@@ -191,12 +192,12 @@ void wxHtmlWinParser::InitParser(const wxString& source)
                    of differences under X and win
                  */
 
-    m_UseLink = FALSE;
-    m_Link = wxHtmlLinkInfo( wxT(""), wxT("") );
+    m_UseLink = false;
+    m_Link = wxHtmlLinkInfo( wxEmptyString );
     m_LinkColor.Set(0, 0, 0xFF);
     m_ActualColor.Set(0, 0, 0);
     m_Align = wxHTML_ALIGN_LEFT;
-    m_tmpLastWasSpace = FALSE;
+    m_tmpLastWasSpace = false;
     m_lastWordCell = NULL;
 
     OpenContainer();
@@ -248,16 +249,45 @@ wxObject* wxHtmlWinParser::GetProduct()
 wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
                                    const wxString& url) const
 {
-    // FIXME - normalize the URL to full path before passing to
-    //         OnOpeningURL!!
     if ( m_Window )
     {
         wxString myurl(url);
         wxHtmlOpeningStatus status;
         for (;;)
         {
+            wxString myfullurl(myurl);
+
+            // consider url as absolute path first
+            wxURI current(myurl);
+            myfullurl = current.BuildUnescapedURI();
+
+            // if not absolute then ...
+            if( current.IsReference() )
+            {
+                wxString basepath = GetFS()->GetPath();
+                wxURI base(basepath);
+
+                // ... try to apply base path if valid ...
+                if( !base.IsReference() )
+                {
+                    wxURI path(myfullurl);
+                    path.Resolve( base );
+                    myfullurl = path.BuildUnescapedURI();
+                }
+                else
+                {
+                    // ... or force such addition if not included already
+                    if( !current.GetPath().Contains(base.GetPath()) )
+                    {
+                        basepath += myurl;
+                        wxURI connected( basepath );
+                        myfullurl = connected.BuildUnescapedURI();
+                    }
+                }
+            }
+
             wxString redirect;
-            status = m_Window->OnOpeningURL(type, myurl, &redirect);
+            status = m_Window->OnOpeningURL(type, myfullurl, &redirect);
             if ( status != wxHTML_REDIRECT )
                 break;
 
@@ -329,7 +359,7 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
             m_Container->InsertCell(c);
             ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
             m_lastWordCell = (wxHtmlWordCell*)c;
-            m_tmpLastWasSpace = TRUE;
+            m_tmpLastWasSpace = true;
         }
     }
 
@@ -350,7 +380,7 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
         m_Container->InsertCell(c);
         ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
         m_lastWordCell = (wxHtmlWordCell*)c;
-        m_tmpLastWasSpace = FALSE;
+        m_tmpLastWasSpace = false;
     }
 }
 
@@ -360,7 +390,7 @@ wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 {
     m_Container = new wxHtmlContainerCell(m_Container);
     m_Container->SetAlignHor(m_Align);
-    m_tmpLastWasSpace = TRUE;
+    m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container;
 }
@@ -369,7 +399,7 @@ wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 
 wxHtmlContainerCell* wxHtmlWinParser::SetContainer(wxHtmlContainerCell *c)
 {
-    m_tmpLastWasSpace = TRUE;
+    m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container = c;
 }
@@ -425,7 +455,7 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,
-                       fu ? TRUE : FALSE, face
+                       fu ? true : false, face
 #if wxUSE_UNICODE
                        );
 #else
@@ -481,15 +511,15 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
         m_OutputEnc = enc;
 
     // alternatives?
-    else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
-             wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&
+    else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) &&
+             wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) &&
              altnorm == altfix)
         m_OutputEnc = altnorm;
 
     // at least normal face?
     else if (availnorm)
         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;
 
     else
@@ -550,7 +580,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
 bool wxHtmlTagsModule::OnInit()
 {
     wxHtmlWinParser::AddModule(this);
-    return TRUE;
+    return true;
 }
 
 void wxHtmlTagsModule::OnExit()