X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b2309a466271ecf9175fd3e85d8d498f89a1fa5..6992d326eb1246d9d03f04245d0cd87eab65f6f7:/src/html/htmlwin.cpp?ds=sidebyside diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 1b67f52cf5..8afb3a1fba 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -110,7 +110,8 @@ void wxHtmlWinAutoScrollTimer::Notify() } } } -#endif + +#endif // wxUSE_CLIPBOARD @@ -119,7 +120,7 @@ void wxHtmlWinAutoScrollTimer::Notify() //----------------------------------------------------------------------------- // item of history list -class WXDLLEXPORT wxHtmlHistoryItem +class WXDLLIMPEXP_HTML wxHtmlHistoryItem { public: wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;} @@ -174,7 +175,8 @@ void wxHtmlWindow::Init() m_makingSelection = false; #if wxUSE_CLIPBOARD m_timerAutoScroll = NULL; -#endif + m_lastDoubleClick = 0; +#endif // wxUSE_CLIPBOARD m_backBuffer = NULL; } @@ -196,7 +198,7 @@ wxHtmlWindow::~wxHtmlWindow() { #if wxUSE_CLIPBOARD StopAutoScrolling(); -#endif +#endif // wxUSE_CLIPBOARD HistoryClear(); if (m_Cell) delete m_Cell; @@ -690,8 +692,6 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) wxList wxHtmlWindow::m_Filters; wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; -wxCursor *wxHtmlWindow::s_cur_hand = NULL; -wxCursor *wxHtmlWindow::s_cur_arrow = NULL; wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL; void wxHtmlWindow::CleanUpStatics() @@ -700,8 +700,6 @@ void wxHtmlWindow::CleanUpStatics() m_Filters.DeleteContents(TRUE); m_Filters.Clear(); wxDELETE(m_GlobalProcessors); - wxDELETE(s_cur_hand); - wxDELETE(s_cur_arrow); } @@ -720,7 +718,7 @@ bool wxHtmlWindow::IsSelectionEnabled() const return false; #endif } - + #if wxUSE_CLIPBOARD wxString wxHtmlWindow::SelectionToText() @@ -750,22 +748,35 @@ wxString wxHtmlWindow::SelectionToText() return text; } +#endif // wxUSE_CLIPBOARD + void wxHtmlWindow::CopySelection(ClipboardType t) { +#if wxUSE_CLIPBOARD if ( m_selection ) { +#ifdef __UNIX__ wxTheClipboard->UsePrimarySelection(t == Primary); - wxString txt(SelectionToText()); +#else // !__UNIX__ + // Primary selection exists only under X11, so don't do anything under + // the other platforms when we try to access it + // + // TODO: this should be abstracted at wxClipboard level! + if ( t == Primary ) + return; +#endif // __UNIX__/!__UNIX__ + if ( wxTheClipboard->Open() ) { + const wxString txt(SelectionToText()); wxTheClipboard->SetData(new wxTextDataObject(txt)); wxTheClipboard->Close(); wxLogTrace(_T("wxhtmlselection"), _("Copied to clipboard:\"%s\""), txt.c_str()); } } +#endif // wxUSE_CLIPBOARD } -#endif void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) @@ -808,13 +819,13 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) wxMemoryDC dcm; if ( !m_backBuffer ) m_backBuffer = new wxBitmap(sz.x, sz.y); - dcm.SelectObject(*m_backBuffer); + dcm.SelectObject(*m_backBuffer); dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); dcm.Clear(); PrepareDC(dcm); dcm.SetMapMode(wxMM_TEXT); dcm.SetBackgroundMode(wxTRANSPARENT); - + wxHtmlRenderingInfo rinfo; wxDefaultHtmlRenderingStyle rstyle; rinfo.SetSelection(m_selection); @@ -823,7 +834,36 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) y * wxHTML_SCROLL_STEP + rect.GetTop(), y * wxHTML_SCROLL_STEP + rect.GetBottom(), rinfo); - + +//#define DEBUG_HTML_SELECTION +#ifdef DEBUG_HTML_SELECTION + { + int xc, yc, x, y; + wxGetMousePosition(&xc, &yc); + ScreenToClient(&xc, &yc); + CalcUnscrolledPosition(xc, yc, &x, &y); + wxHtmlCell *at = m_Cell->FindCellByPos(x, y); + wxHtmlCell *before = + m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE); + wxHtmlCell *after = + m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER); + + dcm.SetBrush(*wxTRANSPARENT_BRUSH); + dcm.SetPen(*wxBLACK_PEN); + if (at) + dcm.DrawRectangle(at->GetAbsPos(), + wxSize(at->GetWidth(),at->GetHeight())); + dcm.SetPen(*wxGREEN_PEN); + if (before) + dcm.DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1, + before->GetWidth()-2,before->GetHeight()-2); + dcm.SetPen(*wxRED_PEN); + if (after) + dcm.DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2, + after->GetWidth()-4,after->GetHeight()-4); + } +#endif + dcm.SetDeviceOrigin(0,0); dc.Blit(0, rect.GetTop(), sz.x, rect.GetBottom() - rect.GetTop() + 1, @@ -848,7 +888,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) m_selection->GetToCell()); m_selection->ClearPrivPos(); } - + Refresh(); } @@ -860,20 +900,32 @@ void wxHtmlWindow::OnMouseMove(wxMouseEvent& event) void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) { +#if wxUSE_CLIPBOARD if ( event.LeftDown() && IsSelectionEnabled() ) { - m_makingSelection = true; - - if ( m_selection ) + const long TRIPLECLICK_LEN = 200; // 0.2 sec after doubleclick + if ( wxGetLocalTimeMillis() - m_lastDoubleClick <= TRIPLECLICK_LEN ) { - wxDELETE(m_selection); - Refresh(); + SelectLine(CalcUnscrolledPosition(event.GetPosition())); + + CopySelection(); } - m_tmpSelFromPos = CalcUnscrolledPosition(event.GetPosition()); - m_tmpSelFromCell = NULL; + else + { + m_makingSelection = true; + + if ( m_selection ) + { + wxDELETE(m_selection); + Refresh(); + } + m_tmpSelFromPos = CalcUnscrolledPosition(event.GetPosition()); + m_tmpSelFromCell = NULL; - CaptureMouse(); + CaptureMouse(); + } } +#endif // wxUSE_CLIPBOARD } void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) @@ -887,25 +939,24 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) // did the user move the mouse far enough from starting point? if ( m_selection ) { -#ifdef __UNIX__ CopySelection(Primary); -#endif + // we don't want mouse up event that ended selecting to be // handled as mouse click and e.g. follow hyperlink: return; } } -#endif - +#endif // wxUSE_CLIPBOARD + SetFocus(); if ( m_Cell ) { wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); 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 + // 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); } @@ -913,16 +964,15 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) -void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) +void wxHtmlWindow::OnInternalIdle() { - if (s_cur_hand == NULL) - { - s_cur_hand = new wxCursor(wxCURSOR_HAND); - s_cur_arrow = new wxCursor(wxCURSOR_ARROW); - } - + wxWindow::OnInternalIdle(); + if (m_tmpMouseMoved && (m_Cell != NULL)) { +#ifdef DEBUG_HTML_SELECTION + Refresh(); +#endif int xc, yc, x, y; wxGetMousePosition(&xc, &yc); ScreenToClient(&xc, &yc); @@ -933,10 +983,36 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) // handle selection update: if ( m_makingSelection ) { - bool goingDown = m_tmpSelFromPos.y < y || - m_tmpSelFromPos.y == y && m_tmpSelFromPos.x < x; - 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. + // This gives us more "natural" behaviour when selecting + // a line (specifically, first cell of the next line is not + // included if you drag selection from left to right over + // entire line): + wxPoint dirFromPos; + if ( !m_tmpSelFromCell ) + { + dirFromPos = m_tmpSelFromPos; + } + else + { + dirFromPos = m_tmpSelFromCell->GetAbsPos(); + if ( x < m_tmpSelFromPos.x ) + { + dirFromPos.x += m_tmpSelFromCell->GetWidth(); + dirFromPos.y += m_tmpSelFromCell->GetHeight(); + } + } + bool goingDown = dirFromPos.y < y || + (dirFromPos.y == y && dirFromPos.x < x); + + // determine selection span: + if ( /*still*/ !m_tmpSelFromCell ) { if (goingDown) { @@ -962,14 +1038,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) if (goingDown) { selcell = m_Cell->FindCellByPos(x, y, - wxHTML_FIND_NEAREST_AFTER); + wxHTML_FIND_NEAREST_BEFORE); if (!selcell) selcell = m_Cell->GetLastTerminal(); } else { selcell = m_Cell->FindCellByPos(x, y, - wxHTML_FIND_NEAREST_BEFORE); + wxHTML_FIND_NEAREST_AFTER); if (!selcell) selcell = m_Cell->GetFirstTerminal(); } @@ -977,9 +1053,9 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) // NB: it may *rarely* happen that the code above didn't find one // of the cells, e.g. if wxHtmlWindow doesn't contain any - // visible cells. + // visible cells. if ( selcell && m_tmpSelFromCell ) - { + { if ( !m_selection ) { // start selecting only if mouse movement was big enough @@ -1007,24 +1083,28 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) } } } - + // 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 (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); @@ -1139,27 +1219,88 @@ void wxHtmlWindow::OnCopy(wxCommandEvent& event) if ( m_selection ) CopySelection(); } - + void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) { // select word under cursor: if ( IsSelectionEnabled() ) { - wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); - wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y); - if ( cell ) - { - delete m_selection; - m_selection = new wxHtmlSelection(); - m_selection->Set(cell, cell); - RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()), - wxSize(cell->GetWidth(), cell->GetHeight()))); - } + SelectWord(CalcUnscrolledPosition(event.GetPosition())); + + CopySelection(Primary); + + m_lastDoubleClick = wxGetLocalTimeMillis(); } else event.Skip(); } -#endif + +void wxHtmlWindow::SelectWord(const wxPoint& pos) +{ + wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y); + if ( cell ) + { + delete m_selection; + m_selection = new wxHtmlSelection(); + m_selection->Set(cell, cell); + RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()), + wxSize(cell->GetWidth(), cell->GetHeight()))); + } +} + +void wxHtmlWindow::SelectLine(const wxPoint& pos) +{ + wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y); + if ( cell ) + { + // 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 + // (i.e. are likely to be words positioned on same line of text). + + int y1 = cell->GetAbsPos().y; + int y2 = y1 + cell->GetHeight(); + int y; + const wxHtmlCell *c; + const wxHtmlCell *before = NULL; + const wxHtmlCell *after = NULL; + + // find last cell of line: + for ( c = cell->GetNext(); c; c = c->GetNext()) + { + y = c->GetAbsPos().y; + if ( y + c->GetHeight() > y1 && y < y2 ) + after = c; + else + break; + } + if ( !after ) + after = cell; + + // find first cell of line: + for ( c = cell->GetParent()->GetFirstChild(); + c && c != cell; c = c->GetNext()) + { + y = c->GetAbsPos().y; + if ( y + c->GetHeight() > y1 && y < y2 ) + { + if ( ! before ) + before = c; + } + else + before = NULL; + } + if ( !before ) + before = cell; + + delete m_selection; + m_selection = new wxHtmlSelection(); + m_selection->Set(before, after); + + Refresh(); + } +} +#endif // wxUSE_CLIPBOARD @@ -1173,7 +1314,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_UP(wxHtmlWindow::OnMouseUp) EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp) EVT_MOTION(wxHtmlWindow::OnMouseMove) - EVT_IDLE(wxHtmlWindow::OnIdle) EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground) EVT_PAINT(wxHtmlWindow::OnPaint) #if wxUSE_CLIPBOARD @@ -1182,7 +1322,7 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave) EVT_KEY_UP(wxHtmlWindow::OnKeyUp) EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy) -#endif +#endif // wxUSE_CLIPBOARD END_EVENT_TABLE() @@ -1210,4 +1350,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) #include "wx/html/forcelnk.h" FORCE_WXHTML_MODULES() -#endif +#endif // wxUSE_HTML +