X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cb9cfb22f6c0a67b0ee6dc7c29ab63397a4a8af..86171954ec23d82d4095b16cc4477509573152d6:/src/html/htmlwin.cpp?ds=inline diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 147e763613..212d556d99 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -30,7 +30,6 @@ #endif #include "wx/html/htmlwin.h" -#include "wx/html/forcelnk.h" #include "wx/html/htmlproc.h" #include "wx/list.h" @@ -73,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; @@ -87,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(); @@ -197,16 +207,19 @@ 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)) { @@ -249,15 +262,13 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } - - f = m_FS->OpenFile(location); + + f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); if (f == NULL) { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; - - SetCursor(*wxSTANDARD_CURSOR); return FALSE; } @@ -295,7 +306,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) { - wxYield(); ScrollToAnchor(f->GetAnchor()); } @@ -322,11 +332,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (m_OpenedPageTitle == wxEmptyString) OnSetTitle(wxFileNameFromPath(m_OpenedPage)); - SetCursor(*wxSTANDARD_CURSOR); if (needs_refresh) { - wxYield(); m_tmpCanDrawLocks--; Refresh(); } @@ -484,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(); @@ -515,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(); @@ -611,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); 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()); } @@ -658,15 +665,25 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) if (event.ButtonDown()) { - int sx, sy; - GetViewStart(&sx, &sy); - sx *= wxHTML_SCROLL_STEP; - sy *= wxHTML_SCROLL_STEP; - - wxPoint 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); + } } } @@ -690,24 +707,39 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) int x, y; wxGetMousePosition(&x, &y); ScreenToClient(&x, &y); + x += sx; + y += sy; - wxHtmlLinkInfo *lnk = m_Cell->GetLink(sx + x, sy + y); - - if (lnk != m_tmpLastLink) + wxHtmlCell *cell = m_Cell->FindCellByPos(x, y); + if ( cell != m_tmpLastCell ) { - if (lnk == NULL) - { - SetCursor(*s_cur_arrow); - if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar); - } - else + wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL; + + if (lnk != m_tmpLastLink) { - SetCursor(*s_cur_hand); - if (m_RelatedStatusBar != -1) - m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar); + 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; } } @@ -745,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