X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0994d9683eb1c49793605e54f5d54e0454ec3a90..a328684392b1a97623ff02cb4bb174d25f376900:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 509dc190c8..21db98eba5 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "htmlwin.h" #pragma implementation "htmlproc.h" #endif @@ -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,9 +175,9 @@ void wxHtmlWindow::Init() m_makingSelection = false; #if wxUSE_CLIPBOARD m_timerAutoScroll = NULL; -#endif - m_backBuffer = NULL; m_lastDoubleClick = 0; +#endif // wxUSE_CLIPBOARD + m_backBuffer = NULL; } bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, @@ -197,11 +198,16 @@ wxHtmlWindow::~wxHtmlWindow() { #if wxUSE_CLIPBOARD StopAutoScrolling(); -#endif +#endif // wxUSE_CLIPBOARD HistoryClear(); if (m_Cell) delete m_Cell; + if ( m_Processors ) + { + WX_CLEAR_LIST(wxHtmlProcessorList, *m_Processors); + } + delete m_Parser; delete m_FS; delete m_History; @@ -247,11 +253,11 @@ bool wxHtmlWindow::SetPage(const wxString& source) // pass HTML through registered processors: if (m_Processors || m_GlobalProcessors) { - wxHtmlProcessorList::Node *nodeL, *nodeG; + wxHtmlProcessorList::compatibility_iterator nodeL, nodeG; int prL, prG; - nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL; - nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL; + nodeL = (m_Processors) ? m_Processors->GetFirst() : wxHtmlProcessorList::compatibility_iterator(); + nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : wxHtmlProcessorList::compatibility_iterator(); // VS: there are two lists, global and local, both of them sorted by // priority. Since we have to go through _both_ lists with @@ -373,7 +379,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) else { - wxNode *node; + wxList::compatibility_iterator node; wxString src = wxEmptyString; if (m_RelatedStatusBar != -1) @@ -652,9 +658,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) if (!m_Processors) { m_Processors = new wxHtmlProcessorList; - m_Processors->DeleteContents(TRUE); } - wxHtmlProcessorList::Node *node; + wxHtmlProcessorList::compatibility_iterator node; for (node = m_Processors->GetFirst(); node; node = node->GetNext()) { @@ -672,9 +677,8 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor) if (!m_GlobalProcessors) { m_GlobalProcessors = new wxHtmlProcessorList; - m_GlobalProcessors->DeleteContents(TRUE); } - wxHtmlProcessorList::Node *node; + wxHtmlProcessorList::compatibility_iterator node; for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext()) { @@ -691,18 +695,15 @@ 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() { wxDELETE(m_DefaultFilter); - m_Filters.DeleteContents(TRUE); - m_Filters.Clear(); + WX_CLEAR_LIST(wxList, m_Filters); + if (m_GlobalProcessors) + WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors); wxDELETE(m_GlobalProcessors); - wxDELETE(s_cur_hand); - wxDELETE(s_cur_arrow); } @@ -721,7 +722,7 @@ bool wxHtmlWindow::IsSelectionEnabled() const return false; #endif } - + #if wxUSE_CLIPBOARD wxString wxHtmlWindow::SelectionToText() @@ -751,22 +752,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) @@ -791,7 +805,7 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), // do nothing here } -void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) +void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { } @@ -809,13 +823,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); @@ -824,7 +838,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, @@ -849,12 +892,12 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) m_selection->GetToCell()); m_selection->ClearPrivPos(); } - + Refresh(); } -void wxHtmlWindow::OnMouseMove(wxMouseEvent& event) +void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event)) { m_tmpMouseMoved = true; } @@ -868,11 +911,13 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) if ( wxGetLocalTimeMillis() - m_lastDoubleClick <= TRIPLECLICK_LEN ) { SelectLine(CalcUnscrolledPosition(event.GetPosition())); + + CopySelection(); } else - { + { m_makingSelection = true; - + if ( m_selection ) { wxDELETE(m_selection); @@ -884,7 +929,7 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) CaptureMouse(); } } -#endif +#endif // wxUSE_CLIPBOARD } void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) @@ -898,25 +943,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); } @@ -924,16 +968,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); @@ -944,10 +987,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) { @@ -973,14 +1042,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(); } @@ -988,9 +1057,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 @@ -1018,24 +1087,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); @@ -1145,18 +1218,21 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) } } -void wxHtmlWindow::OnCopy(wxCommandEvent& event) +void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) { if ( m_selection ) CopySelection(); } - + void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) { // select word under cursor: if ( IsSelectionEnabled() ) { SelectWord(CalcUnscrolledPosition(event.GetPosition())); + + CopySelection(Primary); + m_lastDoubleClick = wxGetLocalTimeMillis(); } else @@ -1185,7 +1261,7 @@ void wxHtmlWindow::SelectLine(const wxPoint& pos) // 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; @@ -1220,21 +1296,40 @@ void wxHtmlWindow::SelectLine(const wxPoint& pos) } if ( !before ) before = cell; - + delete m_selection; m_selection = new wxHtmlSelection(); m_selection->Set(before, after); - + Refresh(); } } -#endif +#endif // wxUSE_CLIPBOARD 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 + 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 ) +#else IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow) +#endif BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_SIZE(wxHtmlWindow::OnSize) @@ -1242,7 +1337,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 @@ -1251,7 +1345,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() @@ -1279,4 +1373,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) #include "wx/html/forcelnk.h" FORCE_WXHTML_MODULES() -#endif +#endif // wxUSE_HTML +