X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88293a4045cce459d50469d5cae27e8509570e1..4a64bee465c0dbf3d97fbf290cb2fef4ad41ca34:/src/html/htmlwin.cpp?ds=sidebyside diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index f58a25578d..e8f244474f 100644 --- 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/log.h" //----------------------------------------------------------------------------- @@ -41,10 +41,10 @@ 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_tmpLastLink = NULL; m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; @@ -69,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; } @@ -93,11 +90,11 @@ 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); + m_Parser -> SetFonts(normal_face, fixed_face, sizes); SetPage(wxT("")); // fonts changed => contents invalid if (!op.IsEmpty()) LoadPage(op); } @@ -130,9 +127,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxFSFile *f; bool rt_val; - + bool needs_refresh = FALSE; + SetCursor(*wxHOURGLASS_CURSOR); - wxYield(); + wxYield(); Refresh(FALSE); m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item @@ -141,27 +139,41 @@ bool wxHtmlWindow::LoadPage(const wxString& location) 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); + 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 { + needs_refresh = TRUE; // load&display it: if (m_RelatedStatusBar != -1) { m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar); - Refresh(); + Refresh(FALSE); } f = m_FS -> OpenFile(location); + 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--; - Refresh(); - wxMessageBox(err, "Error"); SetCursor(*wxSTANDARD_CURSOR); return FALSE; @@ -174,7 +186,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (m_RelatedStatusBar != -1) { wxString msg = _("Loading : ") + location; m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar); - Refresh(); + Refresh(FALSE); } node = m_Filters.GetFirst(); @@ -195,9 +207,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) rt_val = SetPage(src); m_OpenedPage = f -> GetLocation(); if (f -> GetAnchor() != wxEmptyString) { -// m_tmpCanDrawLocks--; + wxYield(); ScrollToAnchor(f -> GetAnchor()); -// m_tmpCanDrawLocks++; } delete f; @@ -215,11 +226,18 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); } + if (m_OpenedPageTitle == wxEmptyString) + OnSetTitle(wxFileNameFromPath(m_OpenedPage)); SetCursor(*wxSTANDARD_CURSOR); - wxYield(); - m_tmpCanDrawLocks--; - Refresh(); + if (needs_refresh) { + wxYield(); + m_tmpCanDrawLocks--; + Refresh(); + } + else + m_tmpCanDrawLocks--; + return rt_val; } @@ -228,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); - if (!c) return FALSE; + if (!c) + { + wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str()); + return FALSE; + } else { int y; @@ -261,27 +283,23 @@ 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); } else { GetClientSize(&ClientWidth, &ClientHeight); -#ifndef __WXMSW__ - // VS : this looks extremely ugly under windoze, better fix needed! - SetScrollbars(1, 1, 0, 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(1, 1, 0, 0); // disable... + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable... GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); // ...and relayout } @@ -296,7 +314,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 +323,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]); } - 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 +348,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]); @@ -359,7 +372,7 @@ bool wxHtmlWindow::HistoryBack() 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--; @@ -385,7 +398,7 @@ bool wxHtmlWindow::HistoryForward() 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--; @@ -406,6 +419,8 @@ void wxHtmlWindow::HistoryClear() wxList wxHtmlWindow::m_Filters; wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; +wxCursor *wxHtmlWindow::s_cur_hand = NULL; +wxCursor *wxHtmlWindow::s_cur_arrow = NULL; void wxHtmlWindow::CleanUpStatics() { @@ -413,7 +428,8 @@ void wxHtmlWindow::CleanUpStatics() 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; } @@ -426,9 +442,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) -void wxHtmlWindow::OnLinkClicked(const wxString& link) +void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { - LoadPage(link); + LoadPage(link.GetHref()); } @@ -440,9 +456,14 @@ void wxHtmlWindow::OnDraw(wxDC& dc) int v_y, v_h; if (m_tmpCanDrawLocks > 0) return; + 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); +#endif #endif dc.SetBackgroundMode(wxTRANSPARENT); ViewStart(&x, &y); @@ -465,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; @@ -514,7 +499,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); } } @@ -522,12 +507,16 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& 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; int x, y; - wxString lnk; + wxHtmlLinkInfo *lnk; ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; wxGetMousePosition(&x, &y); @@ -535,13 +524,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) lnk = m_Cell -> GetLink(sx + x, sy + y); if (lnk != m_tmpLastLink) { - if (lnk == wxEmptyString) { - SetCursor(cur_arrow); + if (lnk == NULL) { + SetCursor(*s_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); + SetCursor(*s_cur_hand); + if (m_RelatedStatusBar != -1) + m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar); } m_tmpLastLink = lnk; } @@ -559,7 +549,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent) EVT_MOTION(wxHtmlWindow::OnMouseEvent) EVT_IDLE(wxHtmlWindow::OnIdle) - EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown) END_EVENT_TABLE() @@ -595,6 +584,7 @@ FORCE_LINK(m_pre) FORCE_LINK(m_hline) FORCE_LINK(m_links) FORCE_LINK(m_tables) +FORCE_LINK(m_meta) #endif