X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/518ba66331d4e63376448802ce23fb7f7da82250..5b05d3ee52cb31caa856c9982eaeb2fcf5b5f78e:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 00be22276a..042e4fbbf2 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmlwin.cpp +// Name: src/html/htmlwin.cpp // Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation) // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,40 +7,42 @@ // 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" -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP + #include "wx/list.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/dcclient.h" #include "wx/frame.h" + #include "wx/dcmemory.h" + #include "wx/timer.h" + #include "wx/settings.h" + #include "wx/dataobj.h" + #include "wx/statusbr.h" #endif #include "wx/html/htmlwin.h" #include "wx/html/htmlproc.h" -#include "wx/list.h" #include "wx/clipbrd.h" -#include "wx/dataobj.h" -#include "wx/timer.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" #include "wx/arrimpl.cpp" #include "wx/listimpl.cpp" +// HTML events: +IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_CLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_HOVER) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_LINK_CLICKED) + #if wxUSE_CLIPBOARD // ---------------------------------------------------------------------------- @@ -141,25 +143,157 @@ 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) + +//----------------------------------------------------------------------------- +// wxHtmlWindowMouseHelper +//----------------------------------------------------------------------------- + +wxHtmlWindowMouseHelper::wxHtmlWindowMouseHelper(wxHtmlWindowInterface *iface) + : m_tmpMouseMoved(false), + m_tmpLastLink(NULL), + m_tmpLastCell(NULL), + m_interface(iface) +{ +} + +void wxHtmlWindowMouseHelper::HandleMouseMoved() +{ + m_tmpMouseMoved = true; +} + +bool wxHtmlWindowMouseHelper::HandleMouseClick(wxHtmlCell *rootCell, + const wxPoint& pos, + const wxMouseEvent& event) +{ + if (!rootCell) + return false; + + wxHtmlCell *cell = rootCell->FindCellByPos(pos.x, pos.y); + // this check is needed because FindCellByPos returns terminal cell and + // containers may have empty borders -- in this case NULL will be + // returned + if (!cell) + return false; + + // adjust the coordinates to be relative to this cell: + wxPoint relpos = pos - cell->GetAbsPos(rootCell); + + return OnCellClicked(cell, relpos.x, relpos.y, event); +} + +void wxHtmlWindowMouseHelper::HandleIdle(wxHtmlCell *rootCell, + const wxPoint& pos) +{ + wxHtmlCell *cell = rootCell ? rootCell->FindCellByPos(pos.x, pos.y) : NULL; + + if (cell != m_tmpLastCell) + { + wxHtmlLinkInfo *lnk = NULL; + if (cell) + { + // adjust the coordinates to be relative to this cell: + wxPoint relpos = pos - cell->GetAbsPos(rootCell); + lnk = cell->GetLink(relpos.x, relpos.y); + } + + wxCursor cur; + if (cell) + cur = cell->GetMouseCursor(m_interface); + else + cur = m_interface->GetHTMLCursor( + wxHtmlWindowInterface::HTMLCursor_Default); + + m_interface->GetHTMLWindow()->SetCursor(cur); + + if (lnk != m_tmpLastLink) + { + if (lnk) + m_interface->SetHTMLStatusText(lnk->GetHref()); + else + m_interface->SetHTMLStatusText(wxEmptyString); + + m_tmpLastLink = lnk; + } + + m_tmpLastCell = cell; + } + else // mouse moved but stayed in the same cell + { + if ( cell ) + { + OnCellMouseHover(cell, pos.x, pos.y); + } + } + + m_tmpMouseMoved = false; +} + +bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell, + wxCoord x, wxCoord y, + const wxMouseEvent& event) +{ + wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_CLICKED, + m_interface->GetHTMLWindow()->GetId(), + cell, wxPoint(x,y), event); + + if (!m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev)) + { + // if the event wasn't handled, do the default processing here: + + wxASSERT_MSG( cell, _T("can't be called with NULL cell") ); + + cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent()); + } + + // true if a link was clicked, false otherwise + return ev.GetLinkClicked(); +} + +void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell, + wxCoord x, + wxCoord y) +{ + wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER, + m_interface->GetHTMLWindow()->GetId(), + cell, wxPoint(x,y), wxMouseEvent()); + m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev); +} + + + //----------------------------------------------------------------------------- // wxHtmlWindow //----------------------------------------------------------------------------- +wxList wxHtmlWindow::m_Filters; +wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; +wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL; +wxCursor *wxHtmlWindow::ms_cursorLink = NULL; +wxCursor *wxHtmlWindow::ms_cursorText = NULL; + +void wxHtmlWindow::CleanUpStatics() +{ + wxDELETE(m_DefaultFilter); + WX_CLEAR_LIST(wxList, m_Filters); + if (m_GlobalProcessors) + WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors); + wxDELETE(m_GlobalProcessors); + wxDELETE(ms_cursorLink); + wxDELETE(ms_cursorText); +} void wxHtmlWindow::Init() { - m_tmpMouseMoved = false; - m_tmpLastLink = NULL; - m_tmpLastCell = NULL; m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); #if wxUSE_STATUSBAR - m_RelatedStatusBar = -1; + m_RelatedStatusBar = NULL; + m_RelatedStatusBarIndex = -1; #endif // wxUSE_STATUSBAR m_RelatedFrame = NULL; m_TitleFormat = wxT("%s"); @@ -171,7 +305,6 @@ void wxHtmlWindow::Init() m_HistoryOn = true; m_History = new wxHtmlHistoryArray; m_Processors = NULL; - m_Style = 0; SetBorders(10); m_selection = NULL; m_makingSelection = false; @@ -181,6 +314,7 @@ void wxHtmlWindow::Init() #endif // wxUSE_CLIPBOARD m_backBuffer = NULL; m_eraseBgInOnPaint = false; + m_tmpSelFromCell = NULL; } bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, @@ -192,7 +326,6 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, name)) return false; - m_Style = style; SetPage(wxT("")); return true; } @@ -232,53 +365,64 @@ void wxHtmlWindow::SetRelatedFrame(wxFrame* frame, const wxString& format) #if wxUSE_STATUSBAR -void wxHtmlWindow::SetRelatedStatusBar(int bar) +void wxHtmlWindow::SetRelatedStatusBar(int index) { - m_RelatedStatusBar = bar; + m_RelatedStatusBarIndex = index; } + +void wxHtmlWindow::SetRelatedStatusBar(wxStatusBar* statusbar, int index) +{ + m_RelatedStatusBar = statusbar; + m_RelatedStatusBarIndex = index; +} + #endif // wxUSE_STATUSBAR -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 @@ -309,7 +453,7 @@ bool wxHtmlWindow::SetPage(const wxString& source) dc->SetMapMode(wxMM_TEXT); SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF)); SetBackgroundImage(wxNullBitmap); - m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString; + m_Parser->SetDC(dc); if (m_Cell) { @@ -328,14 +472,15 @@ bool wxHtmlWindow::SetPage(const wxString& source) bool wxHtmlWindow::AppendToPage(const wxString& source) { - return SetPage(*(GetParser()->GetSource()) + source); + return DoSetPage(*(GetParser()->GetSource()) + source); } bool wxHtmlWindow::LoadPage(const wxString& location) { + wxCHECK_MSG( !location.empty(), false, "location must be non-empty" ); + wxBusyCursor busyCursor; - wxFSFile *f; bool rt_val; bool needs_refresh = false; @@ -348,43 +493,40 @@ bool wxHtmlWindow::LoadPage(const wxString& location) (*m_History)[m_HistoryPos].SetPos(y); } - if (location[0] == wxT('#')) + // first check if we're moving to an anchor in the same page + size_t posLocalAnchor = location.Find('#'); + if ( posLocalAnchor != wxString::npos && posLocalAnchor != 0 ) { - // local anchor: - wxString anch = location.Mid(1) /*1 to end*/; - m_tmpCanDrawLocks--; - rt_val = ScrollToAnchor(anch); - m_tmpCanDrawLocks++; - } - else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage) - { - wxString anch = location.AfterFirst(wxT('#')); - m_tmpCanDrawLocks--; - rt_val = ScrollToAnchor(anch); - m_tmpCanDrawLocks++; + // check if the part before the anchor is the same as the (either + // relative or absolute) URI of the current page + const wxString beforeAnchor = location.substr(0, posLocalAnchor); + if ( beforeAnchor != m_OpenedPage && + m_FS->GetPath() + beforeAnchor != m_OpenedPage ) + { + // indicate that we're not moving to a local anchor + posLocalAnchor = wxString::npos; + } } - else if (location.Find(wxT('#')) != wxNOT_FOUND && - (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage) + + if ( posLocalAnchor != wxString::npos ) { - wxString anch = location.AfterFirst(wxT('#')); m_tmpCanDrawLocks--; - rt_val = ScrollToAnchor(anch); + rt_val = ScrollToAnchor(location.substr(posLocalAnchor + 1)); m_tmpCanDrawLocks++; } - - else + else // moving to another page { needs_refresh = true; #if wxUSE_STATUSBAR // load&display it: - if (m_RelatedStatusBar != -1) + if (m_RelatedStatusBarIndex != -1) { - m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); + SetHTMLStatusText(_("Connecting...")); Refresh(false); } #endif // wxUSE_STATUSBAR - f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); + wxFSFile *f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); // try to interpret 'location' as filename instead of URL: if (f == NULL) @@ -398,6 +540,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; + SetHTMLStatusText(wxEmptyString); return false; } @@ -407,10 +550,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location) wxString src = wxEmptyString; #if wxUSE_STATUSBAR - if (m_RelatedStatusBar != -1) + if (m_RelatedStatusBarIndex != -1) { wxString msg = _("Loading : ") + location; - m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar); + SetHTMLStatusText(msg); Refresh(false); } #endif // wxUSE_STATUSBAR @@ -443,8 +586,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location) delete f; #if wxUSE_STATUSBAR - if (m_RelatedStatusBar != -1) - m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar); + if (m_RelatedStatusBarIndex != -1) + { + SetHTMLStatusText(_("Done")); + } #endif // wxUSE_STATUSBAR } } @@ -527,14 +672,14 @@ void wxHtmlWindow::CreateLayout() if (!m_Cell) return; - if (m_Style & wxHW_SCROLLBAR_NEVER) + if ( HasFlag(wxHW_SCROLLBAR_NEVER) ) { - SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off + SetScrollbars(1, 1, 0, 0); // always off GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); } - - else { + else // !wxHW_SCROLLBAR_NEVER + { GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) @@ -722,21 +867,6 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) -wxList wxHtmlWindow::m_Filters; -wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; -wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL; - -void wxHtmlWindow::CleanUpStatics() -{ - wxDELETE(m_DefaultFilter); - WX_CLEAR_LIST(wxList, m_Filters); - if (m_GlobalProcessors) - WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors); - wxDELETE(m_GlobalProcessors); -} - - - void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) { m_Filters.Append(filter); @@ -746,7 +876,7 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) bool wxHtmlWindow::IsSelectionEnabled() const { #if wxUSE_CLIPBOARD - return !(m_Style & wxHW_NO_SELECTION); + return !HasFlag(wxHW_NO_SELECTION); #else return false; #endif @@ -760,21 +890,27 @@ wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel) return wxEmptyString; wxClientDC dc(this); - - const wxHtmlCell *end = sel->GetToCell(); wxString text; - wxHtmlTerminalCellsInterator i(sel->GetFromCell(), end); - if ( i ) - { - text << i->ConvertToText(sel); - ++i; - } - const wxHtmlCell *prev = *i; + + wxHtmlTerminalCellsInterator i(sel->GetFromCell(), sel->GetToCell()); + const wxHtmlCell *prev = NULL; + while ( i ) { - if ( prev->GetParent() != i->GetParent() ) - text << _T('\n'); - text << i->ConvertToText(*i == end ? sel : NULL); + // When converting HTML content to plain text, the entire paragraph + // (container in wxHTML) goes on single line. A new paragraph (that + // should go on its own line) has its own container. Therefore, the + // simplest way of detecting where to insert newlines in plain text + // is to check if the parent container changed -- if it did, we moved + // to a new paragraph. + if ( prev && prev->GetParent() != i->GetParent() ) + text << '\n'; + + // NB: we don't need to pass the selection to ConvertToText() in the + // middle of the selected text; it's only useful when only part of + // a cell is selected + text << i->ConvertToText(sel); + prev = *i; ++i; } @@ -800,7 +936,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 @@ -822,6 +958,8 @@ bool wxHtmlWindow::CopySelection(ClipboardType t) return true; } } +#else + wxUnusedVar(t); #endif // wxUSE_CLIPBOARD return false; @@ -830,24 +968,15 @@ bool wxHtmlWindow::CopySelection(ClipboardType t) void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { - const wxMouseEvent *e = link.GetEvent(); - if (e == NULL || e->LeftUp()) - 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 + wxHtmlLinkEvent event(GetId(), link); + event.SetEventObject(this); + if (!GetEventHandler()->ProcessEvent(event)) + { + // the default behaviour is to load the URL in this window + const wxMouseEvent *e = event.GetLinkInfo().GetEvent(); + if (e == NULL || e->LeftUp()) + LoadPage(event.GetLinkInfo().GetHref()); + } } void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) @@ -870,7 +999,7 @@ void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) // completely covered anyhow if ( m_bmpBg.GetMask() ) { - dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); + dc.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); dc.Clear(); } @@ -904,7 +1033,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( m_eraseBgInOnPaint ) { - dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); + dcm.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID)); dcm.Clear(); m_eraseBgInOnPaint = false; @@ -922,7 +1051,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) PrepareDC(dcm); dcm.SetMapMode(wxMM_TEXT); - dcm.SetBackgroundMode(wxTRANSPARENT); + dcm.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); wxHtmlRenderingInfo rinfo; wxDefaultHtmlRenderingStyle rstyle; @@ -993,7 +1122,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event)) { - m_tmpMouseMoved = true; + wxHtmlWindowMouseHelper::HandleMouseMoved(); } void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) @@ -1024,6 +1153,9 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) } } #endif // wxUSE_CLIPBOARD + + // in any case, let the default handler set focus to this window + event.Skip(); } void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) @@ -1034,9 +1166,13 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) ReleaseMouse(); m_makingSelection = false; - // did the user move the mouse far enough from starting point? - if ( CopySelection(Primary) ) + // if m_selection=NULL, the user didn't move the mouse far enough from + // starting point and the mouse up event is part of a click, the user + // is not selecting text: + if ( m_selection ) { + CopySelection(Primary); + // we don't want mouse up event that ended selecting to be // handled as mouse click and e.g. follow hyperlink: return; @@ -1044,27 +1180,30 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) } #endif // wxUSE_CLIPBOARD - SetFocus(); - if ( m_Cell ) - { - wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); - wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y); - - // check is needed because FindCellByPos returns terminal cell and - // containers may have empty borders -- in this case NULL will be - // returned - if ( cell ) - OnCellClicked(cell, pos.x, pos.y, event); - } + wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); + wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event); } +#if wxUSE_CLIPBOARD +void wxHtmlWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + if ( !m_makingSelection ) + return; + + // discard the selecting operation + m_makingSelection = false; + wxDELETE(m_selection); + m_tmpSelFromCell = NULL; + Refresh(); +} +#endif // wxUSE_CLIPBOARD void wxHtmlWindow::OnInternalIdle() { wxWindow::OnInternalIdle(); - if (m_tmpMouseMoved && (m_Cell != NULL)) + if (m_Cell != NULL && DidMouseMove()) { #ifdef DEBUG_HTML_SELECTION Refresh(); @@ -1168,7 +1307,8 @@ void wxHtmlWindow::OnInternalIdle() if ( m_tmpSelFromCell->IsBefore(selcell) ) { m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell, - wxPoint(x,y), selcell); } + wxPoint(x,y), selcell); + } else { m_selection->Set(wxPoint(x,y), selcell, @@ -1181,44 +1321,14 @@ void wxHtmlWindow::OnInternalIdle() } // handle cursor and status bar text changes: - if ( cell != m_tmpLastCell ) - { - wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL; - wxCursor cur; - if (cell) - cur = cell->GetCursor(); - else - cur = *wxSTANDARD_CURSOR; - SetCursor(cur); - - if (lnk != m_tmpLastLink) - { -#if wxUSE_STATUSBAR - if (lnk == NULL) - { - if (m_RelatedStatusBar != -1) - m_RelatedFrame->SetStatusText(wxEmptyString, - m_RelatedStatusBar); - } - else - { - if (m_RelatedStatusBar != -1) - m_RelatedFrame->SetStatusText(lnk->GetHref(), - m_RelatedStatusBar); - } -#endif // wxUSE_STATUSBAR - m_tmpLastLink = lnk; - } - - m_tmpLastCell = cell; - } - else // mouse moved but stayed in the same cell - { - if ( cell ) - OnCellMouseHover(cell, x, y); - } - m_tmpMouseMoved = false; + // NB: because we're passing in 'cell' and not 'm_Cell' (so that the + // leaf cell lookup isn't done twice), we need to adjust the + // position for the new root: + wxPoint posInCell(x, y); + if (cell) + posInCell -= cell->GetAbsPos(); + wxHtmlWindowMouseHelper::HandleIdle(cell, posInCell); } } @@ -1305,9 +1415,13 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event) void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) { if ( IsSelectionEnabled() && - event.GetKeyCode() == 'C' && event.ControlDown() ) + (event.GetKeyCode() == 'C' && event.CmdDown()) ) { - (void) CopySelection(); + wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId()); + + evt.SetEventObject(this); + + GetEventHandler()->ProcessEvent(evt); } } @@ -1316,6 +1430,11 @@ void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) (void) CopySelection(); } +void wxHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event)) +{ + (void) CopySelection(); +} + void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) { // select word under cursor: @@ -1453,14 +1572,109 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick) EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter) EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave) + EVT_MOUSE_CAPTURE_LOST(wxHtmlWindow::OnMouseCaptureLost) EVT_KEY_UP(wxHtmlWindow::OnKeyUp) EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy) + EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent) #endif // wxUSE_CLIPBOARD END_EVENT_TABLE() +//----------------------------------------------------------------------------- +// wxHtmlWindowInterface implementation in wxHtmlWindow +//----------------------------------------------------------------------------- + +void wxHtmlWindow::SetHTMLWindowTitle(const wxString& title) +{ + OnSetTitle(title); +} + +void wxHtmlWindow::OnHTMLLinkClicked(const wxHtmlLinkInfo& link) +{ + OnLinkClicked(link); +} +wxHtmlOpeningStatus wxHtmlWindow::OnHTMLOpeningURL(wxHtmlURLType type, + const wxString& url, + wxString *redirect) const +{ + return OnOpeningURL(type, url, redirect); +} +wxPoint wxHtmlWindow::HTMLCoordsToWindow(wxHtmlCell *WXUNUSED(cell), + const wxPoint& pos) const +{ + return CalcScrolledPosition(pos); +} +wxWindow* wxHtmlWindow::GetHTMLWindow() +{ + return this; +} + +wxColour wxHtmlWindow::GetHTMLBackgroundColour() const +{ + return GetBackgroundColour(); +} + +void wxHtmlWindow::SetHTMLBackgroundColour(const wxColour& clr) +{ + SetBackgroundColour(clr); +} + +void wxHtmlWindow::SetHTMLBackgroundImage(const wxBitmap& bmpBg) +{ + SetBackgroundImage(bmpBg); +} + +void wxHtmlWindow::SetHTMLStatusText(const wxString& text) +{ +#if wxUSE_STATUSBAR + if (m_RelatedStatusBarIndex != -1) + { + if (m_RelatedStatusBar) + { + m_RelatedStatusBar->SetStatusText(text, m_RelatedStatusBarIndex); + } + else if (m_RelatedFrame) + { + m_RelatedFrame->SetStatusText(text, m_RelatedStatusBarIndex); + } + } +#else + wxUnusedVar(text); +#endif // wxUSE_STATUSBAR +} + +/*static*/ +wxCursor wxHtmlWindow::GetDefaultHTMLCursor(HTMLCursor type) +{ + switch (type) + { + case HTMLCursor_Link: + if ( !ms_cursorLink ) + ms_cursorLink = new wxCursor(wxCURSOR_HAND); + return *ms_cursorLink; + + case HTMLCursor_Text: + if ( !ms_cursorText ) + ms_cursorText = new wxCursor(wxCURSOR_IBEAM); + return *ms_cursorText; + + case HTMLCursor_Default: + default: + return *wxSTANDARD_CURSOR; + } +} + +wxCursor wxHtmlWindow::GetHTMLCursor(HTMLCursor type) const +{ + return GetDefaultHTMLCursor(type); +} + + +//----------------------------------------------------------------------------- +// wxHtmlWinModule +//----------------------------------------------------------------------------- // A module to allow initialization/cleanup // without calling these functions from app.cpp or from @@ -1484,4 +1698,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) FORCE_WXHTML_MODULES() #endif // wxUSE_HTML -