X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/483ff5a5af3703dbdf86e95d3709f6ffce5abaf5..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 493d0c35d6..447a322890 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -2,6 +2,7 @@ // Name: htmlwin.cpp // Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation) // Author: Vaclav Slavik +// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -11,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -21,32 +22,11 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif -#include - -#include - -///// This is my own wxBusyCursor. It works only with one window. - -#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100) -class wxLocalBusyCursor -#else -class wxLocalBusyCursor : public wxBusyCursor -#endif -{ - private: - wxWindow *m_Wnd; - public: -#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100) - wxLocalBusyCursor(wxWindow *w) {m_Wnd = w; m_Wnd -> SetCursor(*wxHOURGLASS_CURSOR);} - ~wxLocalBusyCursor() {m_Wnd -> SetCursor(*wxSTANDARD_CURSOR);} -#else - wxLocalBusyCursor(wxWindow *w) : wxBusyCursor() {} -#endif -}; - +#include "wx/html/htmlwin.h" +#include "wx/html/forcelnk.h" @@ -56,27 +36,28 @@ class wxLocalBusyCursor : public wxBusyCursor -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(HtmlHistoryArray) -wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - const wxString& name, bool scrollable) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) +wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, + long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) { m_tmpMouseMoved = FALSE; - m_tmpCanDraw = TRUE; + m_tmpLastLink = NULL; + m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; m_RelatedFrame = NULL; m_TitleFormat = "%s"; - m_OpenedPage = m_OpenedAnchor = wxEmptyString; + m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; m_Cell = NULL; m_Parser = new wxHtmlWinParser(this); m_Parser -> SetFS(m_FS); SetBorders(10); m_HistoryPos = -1; m_HistoryOn = TRUE; - m_Scrollable = scrollable; + m_Style = style; SetPage(""); } @@ -88,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; } @@ -109,13 +87,16 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar) { m_RelatedStatusBar = bar; } - - - -void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes) + + + +void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) { - m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes); - if (!m_OpenedPage.IsEmpty()) LoadPage(m_OpenedPage); + wxString op = m_OpenedPage; + + m_Parser -> SetFonts(normal_face, fixed_face, sizes); + SetPage(wxT("")); // fonts changed => contents invalid + if (!op.IsEmpty()) LoadPage(op); } @@ -126,15 +107,18 @@ bool wxHtmlWindow::SetPage(const wxString& source) dc -> SetMapMode(wxMM_TEXT); SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF)); - m_OpenedPage = m_OpenedAnchor = wxEmptyString; + m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; m_Parser -> SetDC(dc); - if (m_Cell) delete m_Cell; + if (m_Cell) { + delete m_Cell; + m_Cell = NULL; + } m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source); delete dc; - m_Cell -> SetIndent(m_Borders, HTML_INDENT_ALL, HTML_UNITS_PIXELS); - m_Cell -> SetAlignHor(HTML_ALIGN_CENTER); + 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; } @@ -143,9 +127,11 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxFSFile *f; bool rt_val; - wxLocalBusyCursor b(this); - m_tmpCanDraw = FALSE; + SetCursor(*wxHOURGLASS_CURSOR); + wxYield(); + + m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item int x, y; ViewStart(&x, &y); @@ -154,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); } @@ -170,9 +156,11 @@ bool wxHtmlWindow::LoadPage(const wxString& location) wxString err; err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location); - m_tmpCanDraw = TRUE; + m_tmpCanDrawLocks--; Refresh(); wxMessageBox(err, "Error"); + + SetCursor(*wxSTANDARD_CURSOR); return FALSE; } @@ -195,15 +183,18 @@ bool wxHtmlWindow::LoadPage(const wxString& location) } node = node -> GetNext(); } - if (src == wxEmptyString) src = m_DefaultFilter.ReadFile(*f); + if (src == wxEmptyString) { + 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; @@ -221,7 +212,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); } - m_tmpCanDraw = TRUE; + SetCursor(*wxSTANDARD_CURSOR); + + wxYield(); + m_tmpCanDrawLocks--; Refresh(); return rt_val; } @@ -230,26 +224,27 @@ bool wxHtmlWindow::LoadPage(const wxString& location) bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor) { - const wxHtmlCell *c = m_Cell -> Find(HTML_COND_ISANCHOR, &anchor); + const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor); if (!c) return FALSE; else { int y; - + for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY(); - Scroll(-1, y / HTML_SCROLL_STEP); + Scroll(-1, y / wxHTML_SCROLL_STEP); m_OpenedAnchor = anchor; return TRUE; } } -void wxHtmlWindow::SetTitle(const wxString& title) +void wxHtmlWindow::OnSetTitle(const wxString& title) { if (m_RelatedFrame) { wxString tit; tit.Printf(m_TitleFormat, title.c_str()); m_RelatedFrame -> SetTitle(tit); } + m_OpenedPageTitle = title; } @@ -261,21 +256,43 @@ void wxHtmlWindow::CreateLayout() int ClientWidth, ClientHeight; if (!m_Cell) return; - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell -> Layout(ClientWidth); - if (m_Scrollable) - SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP, - m_Cell -> GetWidth() / HTML_SCROLL_STEP, - m_Cell -> GetHeight() / HTML_SCROLL_STEP - /*cheat: top-level frag is always container*/ ); + + if (m_Style == wxHW_SCROLLBAR_NEVER) { + 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(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*/); + } + 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 + } + } } - + void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) { wxString oldpath; wxString tmp; + int p_fontsizes[7]; + wxString p_fff, p_ffn; if (path != wxEmptyString) { oldpath = cfg -> GetPath(); @@ -283,14 +300,13 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) } m_Borders = cfg -> Read("wxHtmlWindow/Borders", m_Borders); - m_Parser -> m_FontFaceFixed = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); - m_Parser -> m_FontFaceNormal = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); - m_Parser -> m_ItalicModeFixed = cfg -> Read("wxHtmlWindow/ItalicModeFixed", m_Parser -> m_ItalicModeFixed); - m_Parser -> m_ItalicModeNormal = cfg -> Read("wxHtmlWindow/ItalicModeNormal", m_Parser -> m_ItalicModeNormal); + p_fff = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); + p_ffn = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); for (int i = 0; i < 7; i++) { - tmp.Printf("wxHtmlWindow/FontsSize%i", i); - m_Parser -> m_FontsSizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]); + tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); + p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]); } + SetFonts(p_ffn, p_fff, p_fontsizes); if (path != wxEmptyString) cfg -> SetPath(oldpath); @@ -311,10 +327,8 @@ 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("wxHtmlWindow/FontsSize%i", i); + tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]); } @@ -335,9 +349,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; @@ -358,9 +375,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; @@ -377,20 +397,30 @@ void wxHtmlWindow::HistoryClear() wxList wxHtmlWindow::m_Filters; -wxHtmlFilterPlainText wxHtmlWindow::m_DefaultFilter; +wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; -void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) +void wxHtmlWindow::CleanUpStatics() { + if (m_DefaultFilter) delete m_DefaultFilter; + m_DefaultFilter = NULL; m_Filters.DeleteContents(TRUE); + m_Filters.Clear(); + +} + + + +void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) +{ m_Filters.Append(filter); } -void wxHtmlWindow::OnLinkClicked(const wxString& link) +void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { - LoadPage(link); + LoadPage(link.GetHref()); } @@ -401,7 +431,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); @@ -412,7 +442,7 @@ void wxHtmlWindow::OnDraw(wxDC& dc) while (upd) { v_y = upd.GetY(); v_h = upd.GetH(); - if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * HTML_SCROLL_STEP + v_y, y * HTML_SCROLL_STEP + v_h + v_y); + if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y); upd++; } } @@ -434,8 +464,8 @@ void wxHtmlWindow::OnKeyDown(wxKeyEvent& event) int sty, szy, cliy; ViewStart(&dummy, &sty); - GetClientSize(&dummy, &cliy); cliy /= HTML_SCROLL_STEP; - GetVirtualSize(&dummy, &szy); szy /= HTML_SCROLL_STEP; + GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP; + GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP; switch (event.KeyCode()) { case WXK_PAGEUP : @@ -472,11 +502,11 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) wxPoint pos; wxString lnk; - ViewStart(&sx, &sy); sx *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP; + ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; 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); } } @@ -489,20 +519,24 @@ 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 *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP; + ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; wxGetMousePosition(&x, &y); ScreenToClient(&x, &y); lnk = m_Cell -> GetLink(sx + x, sy + y); - if (lnk == wxEmptyString) { - 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 (lnk != m_tmpLastLink) { + 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 -> GetHref(), m_RelatedStatusBar); + } + m_tmpLastLink = lnk; } m_tmpMouseMoved = FALSE; } @@ -525,19 +559,35 @@ END_EVENT_TABLE() +// A module to allow initialization/cleanup +// without calling these functions from app.cpp or from +// the user's application. + +class wxHtmlWinModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxHtmlWinModule) +public: + wxHtmlWinModule() : wxModule() {} + bool OnInit() { return TRUE; } + void OnExit() { wxHtmlWindow::CleanUpStatics(); } +}; + +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) #endif