X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5db80c26999bab5ad0ee610aeaa59ffb0e9c1c6..6aef9caf82c3afbf4f42f16fd470b80c2b95e0db:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 86885419ac..af8f4639f9 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -26,7 +26,6 @@ #endif #include "wx/html/htmlwin.h" - #include "wx/html/forcelnk.h" @@ -42,11 +41,11 @@ WX_DEFINE_OBJARRAY(HtmlHistoryArray) 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 = wxEmptyString; - m_tmpCanDraw = TRUE; + m_tmpLastLink = NULL; + m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; m_RelatedFrame = NULL; @@ -70,9 +69,6 @@ wxHtmlWindow::~wxHtmlWindow() if (m_Cell) delete m_Cell; - wxList *parser_data = m_Parser -> GetTempData(); - if (parser_data) delete parser_data; - delete m_Parser; delete m_FS; } @@ -94,12 +90,12 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar) -void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes) +void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) { wxString op = m_OpenedPage; - m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes); - SetPage(wxT("")); // fonts changed => contents invalid + m_Parser -> SetFonts(normal_face, fixed_face, sizes); + SetPage(wxT("")); // fonts changed => contents invalid if (!op.IsEmpty()) LoadPage(op); } @@ -114,15 +110,15 @@ bool wxHtmlWindow::SetPage(const wxString& source) m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; m_Parser -> SetDC(dc); if (m_Cell) { - delete m_Cell; - m_Cell = NULL; + delete m_Cell; + m_Cell = NULL; } m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source); delete dc; m_Cell -> SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); m_Cell -> SetAlignHor(wxHTML_ALIGN_CENTER); CreateLayout(); - Refresh(); + if (m_tmpCanDrawLocks == 0) Refresh(); return TRUE; } @@ -135,7 +131,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) SetCursor(*wxHOURGLASS_CURSOR); wxYield(); - m_tmpCanDraw = FALSE; + m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item int x, y; ViewStart(&x, &y); @@ -144,7 +140,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (location[0] == '#') { // local anchor wxString anch = location.Mid(1) /*1 to end*/; - m_tmpCanDraw = TRUE; + m_tmpCanDrawLocks--; rt_val = ScrollToAnchor(anch); } @@ -159,8 +155,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (f == NULL) { wxString err; - err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location); - m_tmpCanDraw = TRUE; + err.Printf(_("Unable to open requested location :\n\n%s"), WXSTRINGCAST location); + m_tmpCanDrawLocks--; Refresh(); wxMessageBox(err, "Error"); @@ -188,17 +184,17 @@ bool wxHtmlWindow::LoadPage(const wxString& location) node = node -> GetNext(); } if (src == wxEmptyString) { - if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter(); - src = m_DefaultFilter -> ReadFile(*f); - } + if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter(); + src = m_DefaultFilter -> ReadFile(*f); + } m_FS -> ChangePathTo(f -> GetLocation()); rt_val = SetPage(src); m_OpenedPage = f -> GetLocation(); if (f -> GetAnchor() != wxEmptyString) { - m_tmpCanDraw = TRUE; +// m_tmpCanDrawLocks--; ScrollToAnchor(f -> GetAnchor()); - m_tmpCanDraw = FALSE; +// m_tmpCanDrawLocks++; } delete f; @@ -218,7 +214,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) SetCursor(*wxSTANDARD_CURSOR); - m_tmpCanDraw = TRUE; + wxYield(); + m_tmpCanDrawLocks--; Refresh(); return rt_val; } @@ -261,7 +258,7 @@ void wxHtmlWindow::CreateLayout() if (!m_Cell) return; if (m_Style == wxHW_SCROLLBAR_NEVER) { - SetScrollbars(1, 1, 0, 0); // always off + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); } @@ -270,21 +267,22 @@ void wxHtmlWindow::CreateLayout() GetClientSize(&ClientWidth, &ClientHeight); #ifndef __WXMSW__ // VS : this looks extremely ugly under windoze, better fix needed! - SetScrollbars(1, 1, 0, ClientHeight * 2); // always on + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, ClientHeight * 2); // always on #endif GetClientSize(&ClientWidth, &ClientHeight); 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... + GetClientSize(&ClientWidth, &ClientHeight); + m_Cell -> Layout(ClientWidth); // ...and relayout } - else { /* we fit into window, no need for scrollbars */ - SetScrollbars(1, 1, 0, 0); // disable... - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell -> Layout(ClientWidth); // ...and relayout - } } } @@ -296,7 +294,6 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) wxString tmp; int p_fontsizes[7]; wxString p_fff, p_ffn; - int p_imf, p_imn; if (path != wxEmptyString) { oldpath = cfg -> GetPath(); @@ -306,13 +303,11 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) m_Borders = cfg -> Read("wxHtmlWindow/Borders", m_Borders); p_fff = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); p_ffn = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); - p_imf = cfg -> Read("wxHtmlWindow/ItalicModeFixed", m_Parser -> m_ItalicModeFixed); - p_imn = cfg -> Read("wxHtmlWindow/ItalicModeNormal", m_Parser -> m_ItalicModeNormal); for (int i = 0; i < 7; i++) { tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]); } - m_Parser -> SetFonts(p_ffn, p_imn, p_fff, p_imf, p_fontsizes); + SetFonts(p_ffn, p_fff, p_fontsizes); if (path != wxEmptyString) cfg -> SetPath(oldpath); @@ -333,8 +328,6 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path) cfg -> Write("wxHtmlWindow/Borders", (long) m_Borders); cfg -> Write("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); cfg -> Write("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); - cfg -> Write("wxHtmlWindow/ItalicModeFixed", (long) m_Parser -> m_ItalicModeFixed); - cfg -> Write("wxHtmlWindow/ItalicModeNormal", (long) m_Parser -> m_ItalicModeNormal); for (int i = 0; i < 7; i++) { tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]); @@ -357,9 +350,12 @@ bool wxHtmlWindow::HistoryBack() l = m_History[m_HistoryPos].GetPage(); a = m_History[m_HistoryPos].GetAnchor(); m_HistoryOn = FALSE; + m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); else LoadPage(l + "#" + a); m_HistoryOn = TRUE; + wxYield(); + m_tmpCanDrawLocks--; Scroll(0, m_History[m_HistoryPos].GetPos()); Refresh(); return TRUE; @@ -380,9 +376,12 @@ bool wxHtmlWindow::HistoryForward() l = m_History[m_HistoryPos].GetPage(); a = m_History[m_HistoryPos].GetAnchor(); m_HistoryOn = FALSE; + m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); else LoadPage(l + "#" + a); m_HistoryOn = TRUE; + wxYield(); + m_tmpCanDrawLocks--; Scroll(0, m_History[m_HistoryPos].GetPos()); Refresh(); return TRUE; @@ -420,9 +419,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) -void wxHtmlWindow::OnLinkClicked(const wxString& link) +void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { - LoadPage(link); + LoadPage(link.GetHref()); } @@ -433,7 +432,7 @@ void wxHtmlWindow::OnDraw(wxDC& dc) wxRegionIterator upd(GetUpdateRegion()); // get the update rect list int v_y, v_h; - if (!m_tmpCanDraw) return; + if (m_tmpCanDrawLocks > 0) return; dc.SetMapMode(wxMM_TEXT); #if defined(_MSC_VER) && (_MSC_VER == 1200) ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT); @@ -471,12 +470,12 @@ void wxHtmlWindow::OnKeyDown(wxKeyEvent& event) switch (event.KeyCode()) { case WXK_PAGEUP : - case WXK_PRIOR : - Scroll(-1, sty - cliy); + case WXK_PRIOR : + Scroll(-1, sty - (2 * cliy / 3)); break; case WXK_PAGEDOWN : - case WXK_NEXT : - Scroll(-1, sty + cliy); + case WXK_NEXT : + Scroll(-1, sty + (2 * cliy / 3)); break; case WXK_HOME : Scroll(-1, 0); @@ -508,7 +507,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) pos = event.GetPosition(); if (m_Cell) - m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event.ButtonDown(1), event.ButtonDown(2), event.ButtonDown(3)); + m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event); } } @@ -521,7 +520,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) if (m_tmpMouseMoved && (m_Cell != NULL)) { int sx, sy; int x, y; - wxString lnk; + wxHtmlLinkInfo *lnk; ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; wxGetMousePosition(&x, &y); @@ -529,13 +528,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) lnk = m_Cell -> GetLink(sx + x, sy + y); if (lnk != m_tmpLastLink) { - if (lnk == wxEmptyString) { + if (lnk == NULL) { SetCursor(cur_arrow); if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar); } else { SetCursor(cur_hand); - if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk, m_RelatedStatusBar); + if (m_RelatedStatusBar != -1) + m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar); } m_tmpLastLink = lnk; } @@ -580,14 +580,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) ///// default mod handlers are forced there: -FORCE_LINK(mod_layout) -FORCE_LINK(mod_fonts) -FORCE_LINK(mod_image) -FORCE_LINK(mod_list) -FORCE_LINK(mod_pre) -FORCE_LINK(mod_hline) -FORCE_LINK(mod_links) -FORCE_LINK(mod_tables) +FORCE_LINK(m_layout) +FORCE_LINK(m_fonts) +FORCE_LINK(m_image) +FORCE_LINK(m_list) +FORCE_LINK(m_dflist) +FORCE_LINK(m_pre) +FORCE_LINK(m_hline) +FORCE_LINK(m_links) +FORCE_LINK(m_tables) +FORCE_LINK(m_meta) #endif