#if wxUSE_HTML && wxUSE_STREAMS
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/log.h"
#include "wx/intl.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/arrimpl.cpp"
#include "wx/listimpl.cpp"
+// HTML events:
+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 )
+
#if wxUSE_CLIPBOARD
// ----------------------------------------------------------------------------
wxCoord x, wxCoord y,
const wxMouseEvent& event)
{
- wxCHECK_MSG( cell, false, _T("can't be called with NULL cell") );
+ 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:
- return cell->ProcessMouseClick(m_interface, wxPoint(x, y), event);
+ 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 * WXUNUSED(cell),
- wxCoord WXUNUSED(x),
- wxCoord WXUNUSED(y))
+void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell,
+ wxCoord x,
+ wxCoord y)
{
- // do nothing here
+ wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER,
+ m_interface->GetHTMLWindow()->GetId(),
+ cell, wxPoint(x,y), wxMouseEvent());
+ m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev);
}
+
+
+
//-----------------------------------------------------------------------------
// wxHtmlWindow
//-----------------------------------------------------------------------------
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");
#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
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;
(*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)
{
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--;
+ SetHTMLStatusText(wxEmptyString);
return false;
}
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
delete f;
#if wxUSE_STATUSBAR
- if (m_RelatedStatusBar != -1)
- m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+ if (m_RelatedStatusBarIndex != -1)
+ {
+ SetHTMLStatusText(_("Done"));
+ }
#endif // wxUSE_STATUSBAR
}
}
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;
}
void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
- const wxMouseEvent *e = link.GetEvent();
- if (e == NULL || e->LeftUp())
- LoadPage(link.GetHref());
+ 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)
// completely covered anyhow
if ( m_bmpBg.GetMask() )
{
- dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+ dc.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
dc.Clear();
}
if ( m_eraseBgInOnPaint )
{
- dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+ dcm.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
dcm.Clear();
m_eraseBgInOnPaint = false;
PrepareDC(dcm);
dcm.SetMapMode(wxMM_TEXT);
- dcm.SetBackgroundMode(wxTRANSPARENT);
+ dcm.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
wxHtmlRenderingInfo rinfo;
wxDefaultHtmlRenderingStyle rstyle;
CaptureMouse();
}
}
-#else
- wxUnusedVar(event);
#endif // wxUSE_CLIPBOARD
+
+ // in any case, let the default handler set focus to this window
+ event.Skip();
}
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;
}
#endif // wxUSE_CLIPBOARD
- SetFocus();
-
wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event);
}
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,
void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
{
- if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() )
+ if ( IsSelectionEnabled() &&
+ (event.GetKeyCode() == 'C' && event.CmdDown()) )
{
- (void) CopySelection();
+ wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());
+
+ evt.SetEventObject(this);
+
+ GetEventHandler()->ProcessEvent(evt);
}
}
(void) CopySelection();
}
+void wxHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
+{
+ (void) CopySelection();
+}
+
void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
{
// select word under cursor:
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()
void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
{
#if wxUSE_STATUSBAR
- if (m_RelatedStatusBar != -1)
- m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar);
+ 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
projects / wxWidgets.git / blobdiff