X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfb9ee966d5d1f29e49f38e340812ade4b3cc956..7a944d2fd2324ca7886d36fd3f4d7a174afdff3a:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 7f5fe924d2..835b1d48ba 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" //----------------------------------------------------------------------------- @@ -39,7 +41,7 @@ //----------------------------------------------------------------------------- // item of history list -class WXDLLEXPORT wxHtmlHistoryItem : public wxObject +class WXDLLEXPORT wxHtmlHistoryItem { public: wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;} @@ -70,11 +72,11 @@ WX_DEFINE_LIST(wxHtmlProcessorList); //----------------------------------------------------------------------------- -wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name) +void wxHtmlWindow::Init() { m_tmpMouseMoved = FALSE; m_tmpLastLink = NULL; + m_tmpLastCell = NULL; m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; @@ -84,17 +86,28 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, m_Cell = NULL; m_Parser = new wxHtmlWinParser(this); m_Parser->SetFS(m_FS); - SetBorders(10); m_HistoryPos = -1; m_HistoryOn = TRUE; m_History = new wxHtmlHistoryArray; m_Processors = NULL; + m_Style = 0; + SetBorders(10); +} + +bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + long style, const wxString& name) +{ + if (!wxScrolledWindow::Create(parent, id, pos, size, + style | wxVSCROLL | wxHSCROLL, name)) + return FALSE; + m_Style = style; SetPage(wxT("")); + return TRUE; } - wxHtmlWindow::~wxHtmlWindow() { HistoryClear(); @@ -141,27 +154,34 @@ bool wxHtmlWindow::SetPage(const wxString& source) wxString newsrc(source); // pass HTML through registered processors: - if (m_Processors || m_SharedProcessors) + if (m_Processors || m_GlobalProcessors) { - wxHtmlProcessorList::Node *nodeL, *nodeS; - int prL, prS; + wxHtmlProcessorList::Node *nodeL, *nodeG; + int prL, prG; nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL; - nodeS = (m_SharedProcessors) ? m_SharedProcessors->GetFirst() : NULL; - - while (nodeL || nodeS) + 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 + // decreasing priority, we "merge-sort" the lists on-line by + // processing that one of the two heads that has higher priority + // in every iteration + while (nodeL || nodeG) { prL = (nodeL) ? nodeL->GetData()->GetPriority() : -1; - prS = (nodeS) ? nodeS->GetData()->GetPriority() : -1; - if (prL > prS) + prG = (nodeG) ? nodeG->GetData()->GetPriority() : -1; + if (prL > prG) { - newsrc = nodeL->GetData()->Process(newsrc); + if (nodeL->GetData()->IsEnabled()) + newsrc = nodeL->GetData()->Process(newsrc); nodeL = nodeL->GetNext(); } - else // prL <= prS + else // prL <= prG { - newsrc = nodeS->GetData()->Process(newsrc); - nodeS = nodeS->GetNext(); + if (nodeG->GetData()->IsEnabled()) + newsrc = nodeG->GetData()->Process(newsrc); + nodeG = nodeG->GetNext(); } } } @@ -187,26 +207,31 @@ 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) { + wxBusyCursor busyCursor; + wxFSFile *f; bool rt_val; bool needs_refresh = FALSE; - SetCursor(*wxHOURGLASS_CURSOR); - wxYield(); Refresh(FALSE); - m_tmpCanDrawLocks++; - if (m_HistoryOn && (m_HistoryPos != -1)) // store scroll position into history item + 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('#')) // local anchor + if (location[0] == wxT('#')) { + // local anchor: wxString anch = location.Mid(1) /*1 to end*/; m_tmpCanDrawLocks--; rt_val = ScrollToAnchor(anch); @@ -221,7 +246,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); @@ -233,31 +258,27 @@ bool wxHtmlWindow::LoadPage(const wxString& location) needs_refresh = TRUE; // load&display it: if (m_RelatedStatusBar != -1) - { + { m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } - - f = m_FS->OpenFile(location); + + f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); if (f == NULL) - { - wxString err; - + { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; - - SetCursor(*wxSTANDARD_CURSOR); return FALSE; } else - { + { wxNode *node; wxString src = wxEmptyString; if (m_RelatedStatusBar != -1) - { + { wxString msg = _("Loading : ") + location; m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar); Refresh(FALSE); @@ -265,17 +286,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); } @@ -284,8 +305,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) rt_val = SetPage(src); m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) - { - wxYield(); + { ScrollToAnchor(f->GetAnchor()); } @@ -299,19 +319,22 @@ 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) OnSetTitle(wxFileNameFromPath(m_OpenedPage)); - SetCursor(*wxSTANDARD_CURSOR); if (needs_refresh) { - wxYield(); m_tmpCanDrawLocks--; Refresh(); } @@ -375,7 +398,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, @@ -383,7 +406,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 @@ -456,7 +479,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: @@ -469,7 +492,6 @@ bool wxHtmlWindow::HistoryBack() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); @@ -500,7 +522,6 @@ bool wxHtmlWindow::HistoryForward() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); @@ -535,28 +556,30 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) if (processor->GetPriority() > node->GetData()->GetPriority()) { m_Processors->Insert(node, processor); - break; + return; } } + m_Processors->Append(processor); } -/*static */ void wxHtmlWindow::AddSharedProcessor(wxHtmlProcessor *processor) +/*static */ void wxHtmlWindow::AddGlobalProcessor(wxHtmlProcessor *processor) { - if (!m_SharedProcessors) + if (!m_GlobalProcessors) { - m_SharedProcessors = new wxHtmlProcessorList; - m_SharedProcessors->DeleteContents(TRUE); + m_GlobalProcessors = new wxHtmlProcessorList; + m_GlobalProcessors->DeleteContents(TRUE); } wxHtmlProcessorList::Node *node; - for (node = m_SharedProcessors->GetFirst(); node; node = node->GetNext()) + for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext()) { if (processor->GetPriority() > node->GetData()->GetPriority()) { - m_SharedProcessors->Insert(node, processor); - break; + m_GlobalProcessors->Insert(node, processor); + return; } } + m_GlobalProcessors->Append(processor); } @@ -565,7 +588,7 @@ wxList wxHtmlWindow::m_Filters; wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; wxCursor *wxHtmlWindow::s_cur_hand = NULL; wxCursor *wxHtmlWindow::s_cur_arrow = NULL; -wxHtmlProcessorList *wxHtmlWindow::m_SharedProcessors = NULL; +wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL; void wxHtmlWindow::CleanUpStatics() { @@ -573,10 +596,8 @@ void wxHtmlWindow::CleanUpStatics() m_DefaultFilter = NULL; m_Filters.DeleteContents(TRUE); m_Filters.Clear(); - - delete m_SharedProcessors; - m_SharedProcessors = NULL; - + delete m_GlobalProcessors; + m_GlobalProcessors = NULL; delete s_cur_hand; delete s_cur_arrow; } @@ -596,34 +617,35 @@ 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) { - int x, y; - wxRegionIterator upd(GetUpdateRegion()); // get the update rect list - int v_y, v_h; + if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return; - if (m_tmpCanDrawLocks > 0) return; + int x, y; + wxRect rect = GetUpdateRegion().GetBox(); 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) - { - v_y = upd.GetY(); - v_h = upd.GetH(); - if (m_Cell) m_Cell->Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y); - upd++; - } + m_Cell->Draw(dc, 0, 0, + y * wxHTML_SCROLL_STEP + rect.GetTop(), + y * wxHTML_SCROLL_STEP + rect.GetBottom()); } @@ -643,15 +665,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); + } } } @@ -668,29 +700,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; } } @@ -703,6 +752,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() @@ -727,20 +777,9 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) - - -///// 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) - +// 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() #endif