X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/892aeafc2a0212b4c3bebcaddd96a42cdd307afd..90b959aee428b26304ee0056864af48775051496:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 1d84af92a4..9db304ff22 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -130,7 +130,7 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int m_Parser->SetFonts(normal_face, fixed_face, sizes); // fonts changed => contents invalid, so reload the page: - SetPage(wxT("")); + SetPage(wxT("")); if (!op.IsEmpty()) LoadPage(op); } @@ -141,27 +141,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(); } } } @@ -182,7 +189,7 @@ bool wxHtmlWindow::SetPage(const wxString& source) m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER); CreateLayout(); - if (m_tmpCanDrawLocks == 0) + if (m_tmpCanDrawLocks == 0) Refresh(); return TRUE; } @@ -198,15 +205,17 @@ bool wxHtmlWindow::LoadPage(const wxString& location) 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 +230,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,7 +242,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); } @@ -241,9 +250,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--; @@ -252,12 +259,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); @@ -265,17 +272,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,7 +291,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) rt_val = SetPage(src); m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) - { + { wxYield(); ScrollToAnchor(f->GetAnchor()); } @@ -375,7 +382,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 +390,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 @@ -409,7 +416,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) m_Borders = cfg->Read(wxT("wxHtmlWindow/Borders"), m_Borders); p_fff = cfg->Read(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed); p_ffn = cfg->Read(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal); - for (int i = 0; i < 7; i++) + 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]); @@ -436,7 +443,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path) cfg->Write(wxT("wxHtmlWindow/Borders"), (long) m_Borders); cfg->Write(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed); cfg->Write(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal); - for (int i = 0; i < 7; i++) + for (int i = 0; i < 7; i++) { tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); cfg->Write(tmp, (long) m_Parser->m_FontsSizes[i]); @@ -456,7 +463,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: @@ -529,34 +536,36 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) m_Processors->DeleteContents(TRUE); } wxHtmlProcessorList::Node *node; - + for (node = m_Processors->GetFirst(); node; node = node->GetNext()) { - if (processor->GetPriority() > node->GetData()->GetPriority()) + 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()) + if (processor->GetPriority() > node->GetData()->GetPriority()) { - m_SharedProcessors->Insert(node, processor); - break; + m_GlobalProcessors->Insert(node, processor); + return; } } + m_GlobalProcessors->Append(processor); } @@ -565,7 +574,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 +582,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; } @@ -615,7 +622,7 @@ void wxHtmlWindow::OnDraw(wxDC& dc) #endif #endif dc.SetBackgroundMode(wxTRANSPARENT); - ViewStart(&x, &y); + GetViewStart(&x, &y); while (upd) { @@ -647,7 +654,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) wxPoint pos; wxString lnk; - ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; + GetViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; pos = event.GetPosition(); if (m_Cell) @@ -671,20 +678,20 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) int x, y; wxHtmlLinkInfo *lnk; - ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; + GetViewStart(&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 != 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); @@ -696,7 +703,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) } - +IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject) IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)