X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10e5c7eaa0c916049981ed27d04257c1ab8dc043..e9531db94d220b8471165de39c50f1a8fc4032df:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index b140267e3c..7d71dd82d7 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -7,12 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmlwin.h" -#pragma implementation "htmlproc.h" -#endif - #include "wx/wxprec.h" #include "wx/defs.h" @@ -141,10 +135,10 @@ private: //----------------------------------------------------------------------------- WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray); -WX_DEFINE_OBJARRAY(wxHtmlHistoryArray); +WX_DEFINE_OBJARRAY(wxHtmlHistoryArray) WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList); -WX_DEFINE_LIST(wxHtmlProcessorList); +WX_DEFINE_LIST(wxHtmlProcessorList) //----------------------------------------------------------------------------- // wxHtmlWindow @@ -153,7 +147,7 @@ WX_DEFINE_LIST(wxHtmlProcessorList); void wxHtmlWindow::Init() { - m_tmpMouseMoved = FALSE; + m_tmpMouseMoved = false; m_tmpLastLink = NULL; m_tmpLastCell = NULL; m_tmpCanDrawLocks = 0; @@ -168,7 +162,7 @@ void wxHtmlWindow::Init() m_Parser = new wxHtmlWinParser(this); m_Parser->SetFS(m_FS); m_HistoryPos = -1; - m_HistoryOn = TRUE; + m_HistoryOn = true; m_History = new wxHtmlHistoryArray; m_Processors = NULL; m_Style = 0; @@ -180,6 +174,8 @@ void wxHtmlWindow::Init() m_lastDoubleClick = 0; #endif // wxUSE_CLIPBOARD m_backBuffer = NULL; + m_eraseBgInOnPaint = false; + m_tmpSelFromCell = NULL; } bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, @@ -189,11 +185,11 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, if (!wxScrolledWindow::Create(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)) - return FALSE; + return false; m_Style = style; SetPage(wxT("")); - return TRUE; + return true; } @@ -239,45 +235,49 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar) -void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) +void wxHtmlWindow::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes) { - wxString op = m_OpenedPage; - m_Parser->SetFonts(normal_face, fixed_face, sizes); - // fonts changed => contents invalid, so reload the page: - SetPage(wxT("")); - if (!op.empty()) - LoadPage(op); + + // re-layout the page after changing fonts: + DoSetPage(*(m_Parser->GetSource())); } void wxHtmlWindow::SetStandardFonts(int size, const wxString& normal_face, const wxString& fixed_face) { - wxString op = m_OpenedPage; - m_Parser->SetStandardFonts(size, normal_face, fixed_face); - // fonts changed => contents invalid, so reload the page: - SetPage(wxT("")); - if (!op.empty()) - LoadPage(op); -} + // re-layout the page after changing fonts: + DoSetPage(*(m_Parser->GetSource())); +} bool wxHtmlWindow::SetPage(const wxString& source) +{ + m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; + return DoSetPage(source); +} + +bool wxHtmlWindow::DoSetPage(const wxString& source) { wxString newsrc(source); wxDELETE(m_selection); + // we will soon delete all the cells, so clear pointers to them: + m_tmpSelFromCell = NULL; + // pass HTML through registered processors: if (m_Processors || m_GlobalProcessors) { wxHtmlProcessorList::compatibility_iterator nodeL, nodeG; int prL, prG; - nodeL = (m_Processors) ? m_Processors->GetFirst() : wxHtmlProcessorList::compatibility_iterator(); - nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : wxHtmlProcessorList::compatibility_iterator(); + if ( m_Processors ) + nodeL = m_Processors->GetFirst(); + if ( m_GlobalProcessors ) + nodeG = m_GlobalProcessors->GetFirst(); // VS: there are two lists, global and local, both of them sorted by // priority. Since we have to go through _both_ lists with @@ -307,7 +307,8 @@ bool wxHtmlWindow::SetPage(const wxString& source) wxClientDC *dc = new wxClientDC(this); dc->SetMapMode(wxMM_TEXT); SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF)); - m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; + SetBackgroundImage(wxNullBitmap); + m_Parser->SetDC(dc); if (m_Cell) { @@ -321,12 +322,12 @@ bool wxHtmlWindow::SetPage(const wxString& source) CreateLayout(); if (m_tmpCanDrawLocks == 0) Refresh(); - return TRUE; + return true; } bool wxHtmlWindow::AppendToPage(const wxString& source) { - return SetPage(*(GetParser()->GetSource()) + source); + return DoSetPage(*(GetParser()->GetSource()) + source); } bool wxHtmlWindow::LoadPage(const wxString& location) @@ -335,7 +336,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) wxFSFile *f; bool rt_val; - bool needs_refresh = FALSE; + bool needs_refresh = false; m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) @@ -441,7 +442,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) delete f; #if wxUSE_STATUSBAR - if (m_RelatedStatusBar != -1) + if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar); #endif // wxUSE_STATUSBAR } @@ -490,7 +491,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor) if (!c) { wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str()); - return FALSE; + return false; } else { @@ -499,7 +500,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor) for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY(); Scroll(-1, y / wxHTML_SCROLL_STEP); m_OpenedAnchor = anchor; - return TRUE; + return true; } } @@ -613,7 +614,7 @@ bool wxHtmlWindow::HistoryBack() { wxString a, l; - if (m_HistoryPos < 1) return FALSE; + if (m_HistoryPos < 1) return false; // store scroll position into history item: int x, y; @@ -625,21 +626,21 @@ bool wxHtmlWindow::HistoryBack() l = (*m_History)[m_HistoryPos].GetPage(); a = (*m_History)[m_HistoryPos].GetAnchor(); - m_HistoryOn = FALSE; + m_HistoryOn = false; m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); - m_HistoryOn = TRUE; + m_HistoryOn = true; m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); - return TRUE; + return true; } bool wxHtmlWindow::HistoryCanBack() { - if (m_HistoryPos < 1) return FALSE; - return TRUE ; + if (m_HistoryPos < 1) return false; + return true ; } @@ -647,30 +648,30 @@ bool wxHtmlWindow::HistoryForward() { wxString a, l; - if (m_HistoryPos == -1) return FALSE; - if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE; + if (m_HistoryPos == -1) return false; + if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false; m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage() m_HistoryPos++; l = (*m_History)[m_HistoryPos].GetPage(); a = (*m_History)[m_HistoryPos].GetAnchor(); - m_HistoryOn = FALSE; + m_HistoryOn = false; m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); - m_HistoryOn = TRUE; + m_HistoryOn = true; m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); - return TRUE; + return true; } bool wxHtmlWindow::HistoryCanForward() { - if (m_HistoryPos == -1) return FALSE; - if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE; - return TRUE ; + if (m_HistoryPos == -1) return false; + if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false; + return true ; } @@ -798,7 +799,7 @@ bool wxHtmlWindow::CopySelection(ClipboardType t) #if wxUSE_CLIPBOARD if ( m_selection ) { -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WXMAC__) wxTheClipboard->UsePrimarySelection(t == Primary); #else // !__UNIX__ // Primary selection exists only under X11, so don't do anything under @@ -820,6 +821,8 @@ bool wxHtmlWindow::CopySelection(ClipboardType t) return true; } } +#else + wxUnusedVar(t); #endif // wxUSE_CLIPBOARD return false; @@ -848,15 +851,47 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), // do nothing here } -void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) +void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) { + if ( !m_bmpBg.Ok() ) + { + // don't even skip the event, if we don't have a bg bitmap we're going + // to overwrite background in OnPaint() below anyhow, so letting the + // default handling take place would only result in flicker, just set a + // flag to erase the background below + m_eraseBgInOnPaint = true; + return; + } + + wxDC& dc = *event.GetDC(); + + // if the image is not fully opaque, we have to erase the background before + // drawing it, however avoid doing it for opaque images as this would just + // result in extra flicker without any other effect as background is + // completely covered anyhow + if ( m_bmpBg.GetMask() ) + { + dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); + dc.Clear(); + } + + const wxSize sizeWin(GetClientSize()); + const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight()); + for ( wxCoord x = 0; x < sizeWin.x; x += sizeBmp.x ) + { + for ( wxCoord y = 0; y < sizeWin.y; y += sizeBmp.y ) + { + dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */); + } + } } void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return; + if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) + return; int x, y; GetViewStart(&x, &y); @@ -867,8 +902,25 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( !m_backBuffer ) m_backBuffer = new wxBitmap(sz.x, sz.y); dcm.SelectObject(*m_backBuffer); - dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); - dcm.Clear(); + + if ( m_eraseBgInOnPaint ) + { + dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); + dcm.Clear(); + + m_eraseBgInOnPaint = false; + } + else // someone has already erased the background, keep it + { + // preserve the existing background, otherwise we'd erase anything the + // user code had drawn in its EVT_ERASE_BACKGROUND handler when we do + // the Blit back below + dcm.Blit(0, rect.GetTop(), + sz.x, rect.GetBottom() - rect.GetTop() + 1, + &dc, + 0, rect.GetTop()); + } + PrepareDC(dcm); dcm.SetMapMode(wxMM_TEXT); dcm.SetBackgroundMode(wxTRANSPARENT); @@ -881,8 +933,8 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) y * wxHTML_SCROLL_STEP + rect.GetTop(), y * wxHTML_SCROLL_STEP + rect.GetBottom(), rinfo); - -//#define DEBUG_HTML_SELECTION + +//#define DEBUG_HTML_SELECTION #ifdef DEBUG_HTML_SELECTION { int xc, yc, x, y; @@ -890,11 +942,11 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) ScreenToClient(&xc, &yc); CalcUnscrolledPosition(xc, yc, &x, &y); wxHtmlCell *at = m_Cell->FindCellByPos(x, y); - wxHtmlCell *before = + wxHtmlCell *before = m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE); - wxHtmlCell *after = + wxHtmlCell *after = m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER); - + dcm.SetBrush(*wxTRANSPARENT_BRUSH); dcm.SetPen(*wxBLACK_PEN); if (at) @@ -910,7 +962,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) after->GetWidth()-4,after->GetHeight()-4); } #endif - + dcm.SetDeviceOrigin(0,0); dc.Blit(0, rect.GetTop(), sz.x, rect.GetBottom() - rect.GetTop() + 1, @@ -972,6 +1024,8 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) CaptureMouse(); } } +#else + wxUnusedVar(event); #endif // wxUSE_CLIPBOARD } @@ -1012,7 +1066,7 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) void wxHtmlWindow::OnInternalIdle() { wxWindow::OnInternalIdle(); - + if (m_tmpMouseMoved && (m_Cell != NULL)) { #ifdef DEBUG_HTML_SELECTION @@ -1031,7 +1085,7 @@ void wxHtmlWindow::OnInternalIdle() if ( !m_tmpSelFromCell ) m_tmpSelFromCell = m_Cell->FindCellByPos( m_tmpSelFromPos.x,m_tmpSelFromPos.y); - + // NB: a trick - we adjust selFromPos to be upper left or bottom // right corner of the first cell of the selection depending // on whether the mouse is moving to the right or to the left. @@ -1053,7 +1107,7 @@ void wxHtmlWindow::OnInternalIdle() dirFromPos.y += m_tmpSelFromCell->GetHeight(); } } - bool goingDown = dirFromPos.y < y || + bool goingDown = dirFromPos.y < y || (dirFromPos.y == y && dirFromPos.x < x); // determine selection span: @@ -1167,7 +1221,7 @@ void wxHtmlWindow::OnInternalIdle() OnCellMouseHover(cell, x, y); } - m_tmpMouseMoved = FALSE; + m_tmpMouseMoved = false; } } @@ -1253,8 +1307,7 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event) void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) { - if ( IsSelectionEnabled() && - event.GetKeyCode() == 'C' && event.ControlDown() ) + if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() ) { (void) CopySelection(); } @@ -1374,18 +1427,18 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h") wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow) /* - TODO PROPERTIES - style , wxHW_SCROLLBAR_AUTO - borders , (dimension) - url , string - htmlcode , string + TODO PROPERTIES + style , wxHW_SCROLLBAR_AUTO + borders , (dimension) + url , string + htmlcode , string */ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxHtmlWindow) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow) #endif @@ -1420,7 +1473,7 @@ class wxHtmlWinModule: public wxModule DECLARE_DYNAMIC_CLASS(wxHtmlWinModule) public: wxHtmlWinModule() : wxModule() {} - bool OnInit() { return TRUE; } + bool OnInit() { return true; } void OnExit() { wxHtmlWindow::CleanUpStatics(); } };