incremented version number

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 447a322890e8bd73c8b62ba8a5c7347b9614fc59..e8f244474fd798afaacf2dec25c8fc23a672da83 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/forcelnk.h"

-
+#include "wx/log.h"

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -41,7 +41,7 @@ WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 
 wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 
 
 wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,

-                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
+                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL | wxHSCROLL, name)

 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;
 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;


@@ -127,9 +127,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 {
     wxFSFile *f;
     bool rt_val;
 {
     wxFSFile *f;
     bool rt_val;

-
+    bool needs_refresh = FALSE;
+    

     SetCursor(*wxHOURGLASS_CURSOR);
     SetCursor(*wxHOURGLASS_CURSOR);

-    wxYield();
+    wxYield(); Refresh(FALSE);

 
     m_tmpCanDrawLocks++;
     if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
 
     m_tmpCanDrawLocks++;
     if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item


@@ -138,27 +139,41 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         m_History[m_HistoryPos].SetPos(y);
     }
 
         m_History[m_HistoryPos].SetPos(y);
     }
 

-    if (location[0] == '#') { // local anchor
+    if (location[0] == wxT('#')) { // local anchor

         wxString anch = location.Mid(1) /*1 to end*/;
         m_tmpCanDrawLocks--;
         rt_val = ScrollToAnchor(anch);
         wxString anch = location.Mid(1) /*1 to end*/;
         m_tmpCanDrawLocks--;
         rt_val = ScrollToAnchor(anch);

+        m_tmpCanDrawLocks++;
+    }
+    else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage) {
+        wxString anch = location.AfterFirst(wxT('#'));
+        m_tmpCanDrawLocks--;
+        rt_val = ScrollToAnchor(anch);
+        m_tmpCanDrawLocks++;
+    }
+    else if (location.Find(wxT('#')) != wxNOT_FOUND && 
+             (m_FS -> GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage) {
+        wxString anch = location.AfterFirst(wxT('#'));
+        m_tmpCanDrawLocks--;
+        rt_val = ScrollToAnchor(anch);
+        m_tmpCanDrawLocks++;

     }
 
     else {
     }
 
     else {

+        needs_refresh = TRUE;

         // load&display it:
         if (m_RelatedStatusBar != -1) {
             m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar);
         // load&display it:
         if (m_RelatedStatusBar != -1) {
             m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar);

-            Refresh();
+            Refresh(FALSE);

         }
 
         f = m_FS -> OpenFile(location);
         }
 
         f = m_FS -> OpenFile(location);

+        

         if (f == NULL) {
             wxString err;
 
         if (f == NULL) {
             wxString err;
 

-            err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location);
+            wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str());

             m_tmpCanDrawLocks--;
             m_tmpCanDrawLocks--;

-            Refresh();
-            wxMessageBox(err, "Error");

 
             SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;
 
             SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;


@@ -171,7 +186,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             if (m_RelatedStatusBar != -1) {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar);
             if (m_RelatedStatusBar != -1) {
                 wxString msg = _("Loading : ") + location;
                 m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar);

-                Refresh();
+                Refresh(FALSE);

             }
 
             node = m_Filters.GetFirst();
             }
 
             node = m_Filters.GetFirst();


@@ -192,9 +207,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             rt_val = SetPage(src);
             m_OpenedPage = f -> GetLocation();
             if (f -> GetAnchor() != wxEmptyString) {
             rt_val = SetPage(src);
             m_OpenedPage = f -> GetLocation();
             if (f -> GetAnchor() != wxEmptyString) {

-//                m_tmpCanDrawLocks--;
+                wxYield();

                 ScrollToAnchor(f -> GetAnchor());
                 ScrollToAnchor(f -> GetAnchor());

-//                m_tmpCanDrawLocks++;

             }
 
             delete f;
             }
 
             delete f;


@@ -212,11 +226,18 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
     }
 
         m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
     }
 

+    if (m_OpenedPageTitle == wxEmptyString)
+        OnSetTitle(wxFileNameFromPath(m_OpenedPage));

     SetCursor(*wxSTANDARD_CURSOR);
 
     SetCursor(*wxSTANDARD_CURSOR);
 

-    wxYield();
-    m_tmpCanDrawLocks--;
-    Refresh();
+    if (needs_refresh) {    
+        wxYield();
+        m_tmpCanDrawLocks--;
+        Refresh();
+    }
+    else
+        m_tmpCanDrawLocks--;
+

     return rt_val;
 }
 
     return rt_val;
 }
 


@@ -225,7 +246,11 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
     const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
     const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);

-    if (!c) return FALSE;
+    if (!c)
+    {
+        wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str());
+        return FALSE;
+    }

     else {
         int y;
 
     else {
         int y;
 


@@ -265,17 +290,13 @@ void wxHtmlWindow::CreateLayout()
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);

-#ifndef __WXMSW__
-        // VS : this looks extremely ugly under windoze, better fix needed!
-        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, ClientHeight * 2); // always on
-#endif
-        GetClientSize(&ClientWidth, &ClientHeight);

         m_Cell -> Layout(ClientWidth);
         m_Cell -> Layout(ClientWidth);

-        if (ClientHeight < m_Cell -> GetHeight()) {
-            SetScrollbars(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
-                          m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
-                          m_Cell -> GetHeight() / wxHTML_SCROLL_STEP
-                          /*cheat: top-level frag is always container*/);
+        if (ClientHeight < m_Cell -> GetHeight() + GetCharHeight()) {
+            SetScrollbars(
+                  wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
+                  m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
+                  (m_Cell -> GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP
+                  /*cheat: top-level frag is always container*/);

         }
         else { /* we fit into window, no need for scrollbars */
             SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...
         }
         else { /* we fit into window, no need for scrollbars */
             SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...


@@ -351,7 +372,7 @@ bool wxHtmlWindow::HistoryBack()
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);

-    else LoadPage(l + "#" + a);
+    else LoadPage(l + wxT("#") + a);

     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;
     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;


@@ -377,7 +398,7 @@ bool wxHtmlWindow::HistoryForward()
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);
     m_HistoryOn = FALSE;
     m_tmpCanDrawLocks++;
     if (a == wxEmptyString) LoadPage(l);

-    else LoadPage(l + "#" + a);
+    else LoadPage(l + wxT("#") + a);

     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;
     m_HistoryOn = TRUE;
     wxYield();
     m_tmpCanDrawLocks--;


@@ -398,6 +419,8 @@ void wxHtmlWindow::HistoryClear()
 
 wxList wxHtmlWindow::m_Filters;
 wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
 
 wxList wxHtmlWindow::m_Filters;
 wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;

+wxCursor *wxHtmlWindow::s_cur_hand = NULL;
+wxCursor *wxHtmlWindow::s_cur_arrow = NULL;

 
 void wxHtmlWindow::CleanUpStatics()
 {
 
 void wxHtmlWindow::CleanUpStatics()
 {


@@ -405,7 +428,8 @@ void wxHtmlWindow::CleanUpStatics()
     m_DefaultFilter = NULL;
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();
     m_DefaultFilter = NULL;
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();

-
+    if (s_cur_hand) delete s_cur_hand;
+    if (s_cur_arrow) delete s_cur_arrow;

 }
 
 
 }
 
 


@@ -432,9 +456,14 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     int v_y, v_h;
 
     if (m_tmpCanDrawLocks > 0) return;
     int v_y, v_h;
 
     if (m_tmpCanDrawLocks > 0) return;

+    

     dc.SetMapMode(wxMM_TEXT);
     dc.SetMapMode(wxMM_TEXT);

+#if 0
+/* VS - I don't think this is neccessary any longer 
+        MSC_VER 1200 means MSVC 6.0 and it works fine */

 #if defined(_MSC_VER) && (_MSC_VER == 1200)
     ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
     ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);

+#endif

 #endif
     dc.SetBackgroundMode(wxTRANSPARENT);
     ViewStart(&x, &y);
 #endif
     dc.SetBackgroundMode(wxTRANSPARENT);
     ViewStart(&x, &y);


@@ -457,42 +486,6 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
 }
 
 
 }
 
 

-
-void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
-{
-    int dummy;
-    int sty, szy, cliy;
-
-    ViewStart(&dummy, &sty);
-    GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP;
-    GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP;
-
-    switch (event.KeyCode()) {
-        case WXK_PAGEUP :
-    case WXK_PRIOR :
-                Scroll(-1, sty - cliy);
-                break;
-        case WXK_PAGEDOWN :
-    case WXK_NEXT :
-                Scroll(-1, sty + cliy);
-                break;
-        case WXK_HOME :
-                Scroll(-1, 0);
-                break;
-        case WXK_END :
-                Scroll(-1, szy - cliy);
-                break;
-        case WXK_UP :
-                Scroll(-1, sty - 1);
-                break;
-        case WXK_DOWN :
-                Scroll(-1, sty + 1);
-                break;
-    }
-}
-
-
-

 void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 {
     m_tmpMouseMoved = TRUE;
 void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 {
     m_tmpMouseMoved = TRUE;


@@ -514,7 +507,11 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 
 void wxHtmlWindow::OnIdle(wxIdleEvent& event)
 {
 
 void wxHtmlWindow::OnIdle(wxIdleEvent& event)
 {

-    static wxCursor cur_hand(wxCURSOR_HAND), cur_arrow(wxCURSOR_ARROW);
+    if (s_cur_hand == NULL) 
+    {
+        s_cur_hand = new wxCursor(wxCURSOR_HAND);
+        s_cur_arrow = new wxCursor(wxCURSOR_ARROW);
+    }

 
     if (m_tmpMouseMoved && (m_Cell != NULL)) {
         int sx, sy;
 
     if (m_tmpMouseMoved && (m_Cell != NULL)) {
         int sx, sy;


@@ -528,11 +525,11 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
 
         if (lnk != m_tmpLastLink) {
             if (lnk == NULL) {
 
         if (lnk != m_tmpLastLink) {
             if (lnk == NULL) {

-                SetCursor(cur_arrow);
+                SetCursor(*s_cur_arrow);

                 if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
             }
             else {
                 if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
             }
             else {

-                SetCursor(cur_hand);
+                SetCursor(*s_cur_hand);

                 if (m_RelatedStatusBar != -1) 
                     m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);
             }
                 if (m_RelatedStatusBar != -1) 
                     m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);
             }


@@ -552,7 +549,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
     EVT_MOTION(wxHtmlWindow::OnMouseEvent)
     EVT_IDLE(wxHtmlWindow::OnIdle)
     EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
     EVT_MOTION(wxHtmlWindow::OnMouseEvent)
     EVT_IDLE(wxHtmlWindow::OnIdle)

-    EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -588,6 +584,7 @@ FORCE_LINK(m_pre)
 FORCE_LINK(m_hline)
 FORCE_LINK(m_links)
 FORCE_LINK(m_tables)
 FORCE_LINK(m_hline)
 FORCE_LINK(m_links)
 FORCE_LINK(m_tables)

+FORCE_LINK(m_meta)

 
 
 #endif
 
 
 #endif