X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73348d099791cd9cc5c4616c1f2122610725cba1..0a0fc5b527437ddb5d41057d60506bfb22ea2bd3:/src/html/htmlwin.cpp?ds=sidebyside diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index d6b79d5cbd..0f5fc11366 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -23,15 +23,17 @@ #endif #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/dcclient.h" + #include "wx/frame.h" #endif #include "wx/html/htmlwin.h" -#include "wx/html/forcelnk.h" #include "wx/html/htmlproc.h" -#include "wx/log.h" -#include "wx/arrimpl.cpp" #include "wx/list.h" + +#include "wx/arrimpl.cpp" #include "wx/listimpl.cpp" //----------------------------------------------------------------------------- @@ -75,6 +77,7 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, { m_tmpMouseMoved = FALSE; m_tmpLastLink = NULL; + m_tmpLastCell = NULL; m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; @@ -150,7 +153,7 @@ bool wxHtmlWindow::SetPage(const wxString& source) nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL; // VS: there are two lists, global and local, both of them sorted by - // priority. Since we have to go through _both_ lists with + // priority. Since we have to go through _both_ lists with // decreasing priority, we "merge-sort" the lists on-line by // processing that one of the two heads that has higher priority // in every iteration @@ -194,6 +197,10 @@ bool wxHtmlWindow::SetPage(const wxString& source) return TRUE; } +bool wxHtmlWindow::AppendToPage(const wxString& source) +{ + return SetPage(*(GetParser()->GetSource()) + source); +} bool wxHtmlWindow::LoadPage(const wxString& location) { @@ -205,15 +212,15 @@ bool wxHtmlWindow::LoadPage(const wxString& location) wxYield(); Refresh(FALSE); m_tmpCanDrawLocks++; - if (m_HistoryOn && (m_HistoryPos != -1)) + if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item: int x, y; - ViewStart(&x, &y); + GetViewStart(&x, &y); (*m_History)[m_HistoryPos].SetPos(y); } - if (location[0] == wxT('#')) + if (location[0] == wxT('#')) { // local anchor: wxString anch = location.Mid(1) /*1 to end*/; @@ -230,7 +237,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) } 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); @@ -242,7 +249,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) needs_refresh = TRUE; // load&display it: if (m_RelatedStatusBar != -1) - { + { m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } @@ -250,9 +257,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) f = m_FS->OpenFile(location); if (f == NULL) - { - wxString err; - + { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; @@ -261,12 +266,12 @@ bool wxHtmlWindow::LoadPage(const wxString& location) } else - { + { wxNode *node; wxString src = wxEmptyString; if (m_RelatedStatusBar != -1) - { + { wxString msg = _("Loading : ") + location; m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar); Refresh(FALSE); @@ -274,17 +279,17 @@ bool wxHtmlWindow::LoadPage(const wxString& location) node = m_Filters.GetFirst(); while (node) - { + { wxHtmlFilter *h = (wxHtmlFilter*) node->GetData(); if (h->CanRead(*f)) - { + { src = h->ReadFile(*f); break; } node = node->GetNext(); } if (src == wxEmptyString) - { + { if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter(); src = m_DefaultFilter->ReadFile(*f); } @@ -293,7 +298,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) rt_val = SetPage(src); m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) - { + { wxYield(); ScrollToAnchor(f->GetAnchor()); } @@ -308,10 +313,15 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { int c = m_History->GetCount() - (m_HistoryPos + 1); - m_HistoryPos++; - for (int i = 0; i < c; i++) - m_History->Remove(m_HistoryPos); - m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); + if (m_HistoryPos < 0 || + (*m_History)[m_HistoryPos].GetPage() != m_OpenedPage || + (*m_History)[m_HistoryPos].GetAnchor() != m_OpenedAnchor) + { + m_HistoryPos++; + for (int i = 0; i < c; i++) + m_History->RemoveAt(m_HistoryPos); + m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); + } } if (m_OpenedPageTitle == wxEmptyString) @@ -384,7 +394,7 @@ void wxHtmlWindow::CreateLayout() GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) - { + { SetScrollbars( wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, @@ -392,7 +402,7 @@ void wxHtmlWindow::CreateLayout() /*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 @@ -465,7 +475,7 @@ bool wxHtmlWindow::HistoryBack() // store scroll position into history item: int x, y; - ViewStart(&x, &y); + GetViewStart(&x, &y); (*m_History)[m_HistoryPos].SetPos(y); // go to previous position: @@ -558,7 +568,7 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) m_GlobalProcessors->DeleteContents(TRUE); } wxHtmlProcessorList::Node *node; - + for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext()) { if (processor->GetPriority() > node->GetData()->GetPriority()) @@ -605,7 +615,20 @@ void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) LoadPage(link.GetHref()); } +void wxHtmlWindow::OnCellClicked(wxHtmlCell *cell, + wxCoord x, wxCoord y, + const wxMouseEvent& event) +{ + wxCHECK_RET( cell, _T("can't be called with NULL cell") ); + + cell->OnMouseClick(this, x, y, event); +} +void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), + wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) +{ + // do nothing here +} void wxHtmlWindow::OnDraw(wxDC& dc) { @@ -616,15 +639,8 @@ void wxHtmlWindow::OnDraw(wxDC& dc) 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); + GetViewStart(&x, &y); while (upd) { @@ -652,15 +668,25 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) if (event.ButtonDown()) { - int sx, sy; - wxPoint pos; - wxString lnk; - - 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); + if ( m_Cell ) + { + int sx, sy; + GetViewStart(&sx, &sy); + sx *= wxHTML_SCROLL_STEP; + sy *= wxHTML_SCROLL_STEP; + + wxPoint pos = event.GetPosition(); + pos.x += sx; + pos.y += sy; + + wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y); + + // VZ: is it possible that we don't find anything at all? + // VS: yes. FindCellByPos returns terminal cell and + // containers may have empty borders + if ( cell ) + OnCellClicked(cell, pos.x, pos.y, event); + } } } @@ -677,29 +703,46 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) if (m_tmpMouseMoved && (m_Cell != NULL)) { int sx, sy; - int x, y; - wxHtmlLinkInfo *lnk; + GetViewStart(&sx, &sy); + sx *= wxHTML_SCROLL_STEP; + sy *= wxHTML_SCROLL_STEP; - ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; + int x, y; wxGetMousePosition(&x, &y); ScreenToClient(&x, &y); - lnk = m_Cell->GetLink(sx + x, sy + y); - - if (lnk != m_tmpLastLink) - { - if (lnk == NULL) - { - SetCursor(*s_cur_arrow); - if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar); - } - else - { - SetCursor(*s_cur_hand); - if (m_RelatedStatusBar != -1) - m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar); + x += sx; + y += sy; + + wxHtmlCell *cell = m_Cell->FindCellByPos(x, y); + if ( cell != m_tmpLastCell ) + { + wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL; + + if (lnk != m_tmpLastLink) + { + if (lnk == NULL) + { + SetCursor(*s_cur_arrow); + if (m_RelatedStatusBar != -1) + m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar); + } + else + { + SetCursor(*s_cur_hand); + if (m_RelatedStatusBar != -1) + m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar); + } + m_tmpLastLink = lnk; } - m_tmpLastLink = lnk; + + m_tmpLastCell = cell; } + else // mouse moved but stayed in the same cell + { + if ( cell ) + OnCellMouseHover(cell, x, y); + } + m_tmpMouseMoved = FALSE; } } @@ -712,6 +755,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow) BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_SIZE(wxHtmlWindow::OnSize) EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent) + EVT_RIGHT_DOWN(wxHtmlWindow::OnMouseEvent) EVT_MOTION(wxHtmlWindow::OnMouseEvent) EVT_IDLE(wxHtmlWindow::OnIdle) END_EVENT_TABLE() @@ -736,20 +780,9 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) +// This hack forces the linker to always link in m_* files +// (wxHTML doesn't work without handlers from these files) +#include "wx/html/forcelnk.h" +FORCE_WXHTML_MODULES() - -///// default mod handlers are forced there: - -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 +#endif \ No newline at end of file