X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e6c2840b4149e356350cac7449a96323b4466ec..76b0f8384ed211c5f6b48597a62da743b604e666:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 636a07610f..4410fa73c3 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -2,7 +2,6 @@ // Name: src/html/htmlwin.cpp // Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation) // Author: Vaclav Slavik -// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,6 +30,7 @@ #include "wx/html/htmlwin.h" #include "wx/html/htmlproc.h" #include "wx/clipbrd.h" +#include "wx/recguard.h" #include "wx/arrimpl.cpp" #include "wx/listimpl.cpp" @@ -42,9 +42,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent) -wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_CLICKED, wxHtmlCellEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_HOVER, wxHtmlCellEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEvent ); +wxDEFINE_EVENT( wxEVT_HTML_CELL_CLICKED, wxHtmlCellEvent ); +wxDEFINE_EVENT( wxEVT_HTML_CELL_HOVER, wxHtmlCellEvent ); +wxDEFINE_EVENT( wxEVT_HTML_LINK_CLICKED, wxHtmlLinkEvent ); #if wxUSE_CLIPBOARD @@ -205,7 +205,7 @@ void wxHtmlWindowMouseHelper::HandleIdle(wxHtmlCell *rootCell, wxCursor cur; if (cell) - cur = cell->GetMouseCursor(m_interface); + cur = cell->GetMouseCursorAt(m_interface, pos); else cur = m_interface->GetHTMLCursor( wxHtmlWindowInterface::HTMLCursor_Default); @@ -228,6 +228,11 @@ void wxHtmlWindowMouseHelper::HandleIdle(wxHtmlCell *rootCell, { if ( cell ) { + // A single cell can have different cursors for different positions, + // so update cursor for this case as well. + wxCursor cur = cell->GetMouseCursorAt(m_interface, pos); + m_interface->GetHTMLWindow()->SetCursor(cur); + OnCellMouseHover(cell, pos.x, pos.y); } } @@ -239,7 +244,7 @@ bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) { - wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_CLICKED, + wxHtmlCellEvent ev(wxEVT_HTML_CELL_CLICKED, m_interface->GetHTMLWindow()->GetId(), cell, wxPoint(x,y), event); @@ -260,7 +265,7 @@ void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell, wxCoord x, wxCoord y) { - wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER, + wxHtmlCellEvent ev(wxEVT_HTML_CELL_HOVER, m_interface->GetHTMLWindow()->GetId(), cell, wxPoint(x,y), wxMouseEvent()); m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev); @@ -468,14 +473,13 @@ bool wxHtmlWindow::DoSetPage(const wxString& source) SetBackgroundImage(wxNullBitmap); m_Parser->SetDC(dc); - if (m_Cell) - { - delete m_Cell; - // notice that it's important to set m_Cell to NULL here before calling - // Parse() below, even if it will be overwritten by its return value: - // without this we may crash if it's used from inside Parse() - m_Cell = NULL; - } + + // notice that it's important to set m_Cell to NULL here before calling + // Parse() below, even if it will be overwritten by its return value as + // without this we may crash if it's used from inside Parse(), so use + // wxDELETE() and not just delete here + wxDELETE(m_Cell); + m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc); delete dc; m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); @@ -689,44 +693,116 @@ void wxHtmlWindow::OnSetTitle(const wxString& title) } - +// return scroll steps such that a) scrollbars aren't shown needlessly +// and b) entire content is viewable (i.e. round up) +static int ScrollSteps(int size, int available) +{ + if ( size <= available ) + return 0; + else + return (size + wxHTML_SCROLL_STEP - 1) / wxHTML_SCROLL_STEP; +} void wxHtmlWindow::CreateLayout() { - int ClientWidth, ClientHeight; + // SetScrollbars() results in size change events -- and thus a nested + // CreateLayout() call -- on some platforms. Ignore nested calls, toplevel + // CreateLayout() will do the right thing eventually. + static wxRecursionGuardFlag s_flagReentrancy; + wxRecursionGuard guard(s_flagReentrancy); + if ( guard.IsInside() ) + return; - if (!m_Cell) return; + if (!m_Cell) + return; + + int clientWidth, clientHeight; + GetClientSize(&clientWidth, &clientHeight); + + const int vscrollbar = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + const int hscrollbar = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); + + if ( HasScrollbar(wxHORIZONTAL) ) + clientHeight += hscrollbar; + + if ( HasScrollbar(wxVERTICAL) ) + clientWidth += vscrollbar; if ( HasFlag(wxHW_SCROLLBAR_NEVER) ) { SetScrollbars(1, 1, 0, 0); // always off - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell->Layout(ClientWidth); + m_Cell->Layout(clientWidth); } else // !wxHW_SCROLLBAR_NEVER { - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell->Layout(ClientWidth); - if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) + // Lay the content out with the assumption that it's too large to fit + // in the window (this is likely to be the case): + m_Cell->Layout(clientWidth - vscrollbar); + + // If the layout is wider than the window, horizontal scrollbar will + // certainly be shown. Account for it here for subsequent computations. + if ( m_Cell->GetWidth() > clientWidth ) + clientHeight -= hscrollbar; + + if ( m_Cell->GetHeight() <= clientHeight ) { - SetScrollbars( - wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP, - m_Cell->GetWidth() / wxHTML_SCROLL_STEP, - (m_Cell->GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP - /*cheat: top-level frag is always container*/); + // we fit into the window, hide vertical scrollbar: + SetScrollbars + ( + wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP, + ScrollSteps(m_Cell->GetWidth(), clientWidth - vscrollbar), + 0 + ); + // ...and redo the layout to use the extra space + m_Cell->Layout(clientWidth); } - else /* we fit into window, no need for scrollbars */ + else { - SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // disable... - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell->Layout(ClientWidth); // ...and relayout + // If the content doesn't fit into the window by only a small + // margin, chances are that it may fit fully with scrollbar turned + // off. It's something worth trying but on the other hand, we don't + // want to waste too much time redoing the layout (twice!) for + // long -- and thus expensive to layout -- pages. The cut-off value + // is an arbitrary heuristics. + static const int SMALL_OVERLAP = 60; + if ( m_Cell->GetHeight() <= clientHeight + SMALL_OVERLAP ) + { + m_Cell->Layout(clientWidth); + + if ( m_Cell->GetHeight() <= clientHeight ) + { + // Great, we fit in. Hide the scrollbar. + SetScrollbars + ( + wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP, + ScrollSteps(m_Cell->GetWidth(), clientWidth), + 0 + ); + return; + } + else + { + // That didn't work out, go back to previous layout. Note + // that redoing the layout once again here isn't as bad as + // it looks -- thanks to the small cut-off value, it's a + // reasonably small page. + m_Cell->Layout(clientWidth - vscrollbar); + } + } + // else: the page is very long, it will certainly need scrollbar + + SetScrollbars + ( + wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP, + ScrollSteps(m_Cell->GetWidth(), clientWidth - vscrollbar), + ScrollSteps(m_Cell->GetHeight(), clientHeight) + ); } } } - - +#if wxUSE_CONFIG void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) { wxString oldpath; @@ -779,8 +855,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path) if (path != wxEmptyString) cfg->SetPath(oldpath); } - - +#endif // wxUSE_CONFIG bool wxHtmlWindow::HistoryBack() { @@ -1019,7 +1094,7 @@ void wxHtmlWindow::DoEraseBackground(wxDC& dc) if ( m_bmpBg.IsOk() ) { // draw the background bitmap tiling it over the entire window area - const wxSize sz = GetClientSize(); + const wxSize sz = GetVirtualSize(); const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight()); for ( wxCoord x = 0; x < sz.x; x += sizeBmp.x ) { @@ -1031,6 +1106,19 @@ void wxHtmlWindow::DoEraseBackground(wxDC& dc) } } +void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) +{ + // We never get real erase background events as we changed our background + // style to wxBG_STYLE_PAINT in our ctor so the only time when we get here + // is when an artificial wxEraseEvent is generated by our own OnPaint() + // below. This handler only exists to stop the event from propagating + // downwards to wxWindow which may erase the background itself when it gets + // it in some ports (currently this happens in wxUniv), so we simply stop + // processing here and set a special flag allowing OnPaint() to see that + // the event hadn't been really processed. + m_isBgReallyErased = false; +} + void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dcPaint(this); @@ -1063,11 +1151,17 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) PrepareDC(*dc); - // erase the background: for compatibility, we must generate the event to - // allow the user-defined handlers to do it + // Erase the background: for compatibility, we must generate the event to + // allow the user-defined handlers to do it, hence this hack with sending + // an artificial wxEraseEvent to trigger the execution of such handlers. wxEraseEvent eraseEvent(GetId(), dc); eraseEvent.SetEventObject(this); - if ( !ProcessWindowEvent(eraseEvent) ) + + // Hack inside a hack: the background wasn't really erased if our own + // OnEraseBackground() was executed, so we need to check for the flag set + // by it whenever it's called. + m_isBgReallyErased = true; // Initially assume it wasn't. + if ( !ProcessWindowEvent(eraseEvent) || !m_isBgReallyErased ) { // erase background ourselves DoEraseBackground(*dc); @@ -1077,7 +1171,8 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) // draw the HTML window contents dc->SetMapMode(wxMM_TEXT); - dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + dc->SetBackgroundMode(wxTRANSPARENT); + dc->SetLayoutDirection(GetLayoutDirection()); wxHtmlRenderingInfo rinfo; wxDefaultHtmlRenderingStyle rstyle; @@ -1142,7 +1237,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) { m_selection->Set(m_selection->GetFromCell(), m_selection->GetToCell()); - m_selection->ClearPrivPos(); + m_selection->ClearFromToCharacterPos(); } Refresh(); @@ -1210,7 +1305,8 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) #endif // wxUSE_CLIPBOARD wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); - wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event); + if ( !wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event) ) + event.Skip(); } #if wxUSE_CLIPBOARD @@ -1343,7 +1439,7 @@ void wxHtmlWindow::OnInternalIdle() m_selection->Set(wxPoint(x,y), selcell, m_tmpSelFromPos, m_tmpSelFromCell); } - m_selection->ClearPrivPos(); + m_selection->ClearFromToCharacterPos(); Refresh(); } } @@ -1446,12 +1542,16 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) if ( IsSelectionEnabled() && (event.GetKeyCode() == 'C' && event.CmdDown()) ) { - wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId()); + wxClipboardTextEvent evt(wxEVT_TEXT_COPY, GetId()); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); } + else + { + event.Skip(); + } } void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) @@ -1504,7 +1604,7 @@ void wxHtmlWindow::SelectLine(const wxPoint& pos) { // We use following heuristic to find a "line": let the line be all // cells in same container as the cell under mouse cursor that are - // neither completely above nor completely bellow the clicked cell + // neither completely above nor completely below the clicked cell // (i.e. are likely to be words positioned on same line of text). int y1 = cell->GetAbsPos().y; @@ -1568,9 +1668,6 @@ void wxHtmlWindow::SelectAll() IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject) -#if wxUSE_EXTENDED_RTTI -IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h") - wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow) /* TODO PROPERTIES @@ -1585,9 +1682,8 @@ wxBEGIN_HANDLERS_TABLE(wxHtmlWindow) wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow) -#endif + +wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h") BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_SIZE(wxHtmlWindow::OnSize) @@ -1596,6 +1692,7 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp) EVT_MOTION(wxHtmlWindow::OnMouseMove) EVT_PAINT(wxHtmlWindow::OnPaint) + EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground) #if wxUSE_CLIPBOARD EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick) EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter)