X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d7836c47de679f03b1b7e738c77164c11bd3689..8a07956565ddccd1720abf4e510945593128d774:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index e376c262f8..34face1aa8 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richeditctrl.cpp +// Name: src/richtext/richtextctrl.cpp // Purpose: A rich edit control // Author: Julian Smart -// Modified by: +// Modified by: // Created: 2005-09-30 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,49 +13,139 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif +#if wxUSE_RICHTEXT -#include "wx/image.h" +#include "wx/richtext/richtextctrl.h" +#include "wx/richtext/richtextstyles.h" -#if wxUSE_RICHTEXT +#ifndef WX_PRECOMP + #include "wx/wx.h" + #include "wx/settings.h" +#endif +#include "wx/timer.h" #include "wx/textfile.h" #include "wx/ffile.h" -#include "wx/settings.h" #include "wx/filename.h" #include "wx/dcbuffer.h" - -#include "wx/richtext/richtextctrl.h" #include "wx/arrimpl.cpp" +#include "wx/fontenum.h" +#include "wx/accel.h" + +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl") + +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent ); + +#if wxRICHTEXT_USE_OWN_CARET -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RETURN) +/*! + * wxRichTextCaret + * + * This implements a non-flashing cursor in case there + * are platform-specific problems with the generic caret. + * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h. + */ -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE -IMPLEMENT_CLASS( wxRichTextCtrl, wxControl ) -#else -IMPLEMENT_CLASS( wxRichTextCtrl, wxScrolledWindow ) +class wxRichTextCaret; +class wxRichTextCaretTimer: public wxTimer +{ + public: + wxRichTextCaretTimer(wxRichTextCaret* caret) + { + m_caret = caret; + } + virtual void Notify(); + wxRichTextCaret* m_caret; +}; + +class wxRichTextCaret: public wxCaret +{ +public: + // ctors + // ----- + // default - use Create() + wxRichTextCaret(): m_timer(this) { Init(); } + // creates a block caret associated with the given window + wxRichTextCaret(wxRichTextCtrl *window, int width, int height) + : wxCaret(window, width, height), m_timer(this) { Init(); m_richTextCtrl = window; } + wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size) + : wxCaret(window, size), m_timer(this) { Init(); m_richTextCtrl = window; } + + virtual ~wxRichTextCaret(); + + // implementation + // -------------- + + // called by wxWindow (not using the event tables) + virtual void OnSetFocus(); + virtual void OnKillFocus(); + + // draw the caret on the given DC + void DoDraw(wxDC *dc); + + // get the visible count + int GetVisibleCount() const { return m_countVisible; } + + // delay repositioning + bool GetNeedsUpdate() const { return m_needsUpdate; } + void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; } + + void Notify(); + +protected: + virtual void DoShow(); + virtual void DoHide(); + virtual void DoMove(); + virtual void DoSize(); + + // refresh the caret + void Refresh(); + +private: + void Init(); + + int m_xOld, + m_yOld; + bool m_hasFocus; // true => our window has focus + bool m_needsUpdate; // must be repositioned + bool m_flashOn; + wxRichTextCaretTimer m_timer; + wxRichTextCtrl* m_richTextCtrl; +}; #endif -IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxRichTextCtrl, wxControl ) + +IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent ) -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl ) -#else -BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow ) -#endif EVT_PAINT(wxRichTextCtrl::OnPaint) EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground) + EVT_IDLE(wxRichTextCtrl::OnIdle) + EVT_SCROLLWIN(wxRichTextCtrl::OnScroll) EVT_LEFT_DOWN(wxRichTextCtrl::OnLeftClick) EVT_MOTION(wxRichTextCtrl::OnMoveMouse) EVT_LEFT_UP(wxRichTextCtrl::OnLeftUp) @@ -63,10 +153,13 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow ) EVT_MIDDLE_DOWN(wxRichTextCtrl::OnMiddleClick) EVT_LEFT_DCLICK(wxRichTextCtrl::OnLeftDClick) EVT_CHAR(wxRichTextCtrl::OnChar) + EVT_KEY_DOWN(wxRichTextCtrl::OnChar) EVT_SIZE(wxRichTextCtrl::OnSize) EVT_SET_FOCUS(wxRichTextCtrl::OnSetFocus) EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus) + EVT_MOUSE_CAPTURE_LOST(wxRichTextCtrl::OnCaptureLost) EVT_CONTEXT_MENU(wxRichTextCtrl::OnContextMenu) + EVT_SYS_COLOUR_CHANGED(wxRichTextCtrl::OnSysColourChanged) EVT_MENU(wxID_UNDO, wxRichTextCtrl::OnUndo) EVT_UPDATE_UI(wxID_UNDO, wxRichTextCtrl::OnUpdateUndo) @@ -88,159 +181,282 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow ) EVT_MENU(wxID_SELECTALL, wxRichTextCtrl::OnSelectAll) EVT_UPDATE_UI(wxID_SELECTALL, wxRichTextCtrl::OnUpdateSelectAll) + + EVT_MENU(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnProperties) + EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnUpdateProperties) + + EVT_MENU(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnProperties) + EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnUpdateProperties) + + EVT_MENU(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnProperties) + EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnUpdateProperties) + END_EVENT_TABLE() /*! * wxRichTextCtrl */ +wxArrayString wxRichTextCtrl::sm_availableFontNames; + wxRichTextCtrl::wxRichTextCtrl() -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - : wxScrollHelper(this) -#endif + : wxScrollHelper(this) { Init(); } -wxRichTextCtrl::wxRichTextCtrl( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - : wxScrollHelper(this) -#endif +wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) + : wxScrollHelper(this) { Init(); - Create(parent, id, pos, size, style); + Create(parent, id, value, pos, size, style, validator, name); } /// Creation -bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) +bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, + const wxValidator& validator, const wxString& name) { -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE - )) - return false; -#else - if (!wxScrolledWindow::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE - )) + style |= wxVSCROLL; + + if (!wxControl::Create(parent, id, pos, size, + style|wxFULL_REPAINT_ON_RESIZE, + validator, name)) return false; -#endif - if (!GetFont().Ok()) + if (!GetFont().IsOk()) { SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } - - GetBuffer().SetRichTextCtrl(this); - wxTextAttrEx attributes; + // No physical scrolling, so we can preserve margins + EnableScrolling(false, false); + + if (style & wxTE_READONLY) + SetEditable(false); + + // The base attributes must all have default values + wxRichTextAttr attributes; attributes.SetFont(GetFont()); - attributes.SetTextColour(*wxBLACK); - attributes.SetBackgroundColour(*wxWHITE); + attributes.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT); - attributes.SetFlags(wxTEXT_ATTR_ALL); + attributes.SetLineSpacing(10); + attributes.SetParagraphSpacingAfter(10); + attributes.SetParagraphSpacingBefore(0); - SetDefaultStyle(attributes); SetBasicStyle(attributes); - SetBackgroundColour(*wxWHITE); + int margin = 5; + SetMargins(margin, margin); + + // The default attributes will be merged with base attributes, so + // can be empty to begin with + wxRichTextAttr defaultAttributes; + SetDefaultStyle(defaultAttributes); + + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); SetBackgroundStyle(wxBG_STYLE_CUSTOM); - // Tell the sizers to use the given or best size - SetBestFittingSize(size); - + GetBuffer().Reset(); + GetBuffer().SetRichTextCtrl(this); + +#if wxRICHTEXT_USE_OWN_CARET + SetCaret(new wxRichTextCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16)); +#else + SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16)); +#endif + + // Tell the sizers to use the given or best size + SetInitialSize(size); + +#if wxRICHTEXT_BUFFERED_PAINTING // Create a buffer RecreateBuffer(size); +#endif - wxCaret* caret = new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16); - SetCaret(caret); - caret->Show(); - PositionCaret(); + m_textCursor = wxCursor(wxCURSOR_IBEAM); + m_urlCursor = wxCursor(wxCURSOR_HAND); + + SetCursor(m_textCursor); + + if (!value.IsEmpty()) + SetValue(value); + + GetBuffer().AddEventHandler(this); + + // Accelerators + wxAcceleratorEntry entries[6]; + + entries[0].Set(wxACCEL_CMD, (int) 'C', wxID_COPY); + entries[1].Set(wxACCEL_CMD, (int) 'X', wxID_CUT); + entries[2].Set(wxACCEL_CMD, (int) 'V', wxID_PASTE); + entries[3].Set(wxACCEL_CMD, (int) 'A', wxID_SELECTALL); + entries[4].Set(wxACCEL_CMD, (int) 'Z', wxID_UNDO); + entries[5].Set(wxACCEL_CMD, (int) 'Y', wxID_REDO); + + wxAcceleratorTable accel(6, entries); + SetAcceleratorTable(accel); + + m_contextMenu = new wxMenu; + m_contextMenu->Append(wxID_UNDO, _("&Undo")); + m_contextMenu->Append(wxID_REDO, _("&Redo")); + m_contextMenu->AppendSeparator(); + m_contextMenu->Append(wxID_CUT, _("Cu&t")); + m_contextMenu->Append(wxID_COPY, _("&Copy")); + m_contextMenu->Append(wxID_PASTE, _("&Paste")); + m_contextMenu->Append(wxID_CLEAR, _("&Delete")); + m_contextMenu->AppendSeparator(); + m_contextMenu->Append(wxID_SELECTALL, _("Select &All")); + m_contextMenu->AppendSeparator(); + m_contextMenu->Append(wxID_RICHTEXT_PROPERTIES1, _("&Properties")); - SetCursor(wxCursor(wxCURSOR_IBEAM)); - return true; } wxRichTextCtrl::~wxRichTextCtrl() { + SetFocusObject(& GetBuffer(), false); + GetBuffer().RemoveEventHandler(this); + delete m_contextMenu; } /// Member initialisation void wxRichTextCtrl::Init() { - m_freezeCount = 0; m_contextMenu = NULL; m_caret = NULL; m_caretPosition = -1; - m_selectionRange.SetRange(-2, -2); m_selectionAnchor = -2; + m_selectionAnchorObject = NULL; + m_selectionState = wxRichTextCtrlSelectionState_Normal; m_editable = true; m_caretAtLineStart = false; m_dragging = false; + m_fullLayoutRequired = false; + m_fullLayoutTime = 0; + m_fullLayoutSavedPosition = 0; + m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD; + m_caretPositionForDefaultStyle = -2; + m_focusObject = & m_buffer; } -/// Call Freeze to prevent refresh -void wxRichTextCtrl::Freeze() -{ - m_freezeCount ++; -} - -/// Call Thaw to refresh -void wxRichTextCtrl::Thaw(bool refresh) +void wxRichTextCtrl::DoThaw() { - m_freezeCount --; - - if (m_freezeCount == 0 && refresh) - { + if (GetBuffer().IsDirty()) + LayoutContent(); + else SetupScrollbars(); - Refresh(); - } + + wxWindow::DoThaw(); } /// Clear all text void wxRichTextCtrl::Clear() { - m_buffer.Reset(); - m_buffer.SetDirty(true); + if (GetFocusObject() == & GetBuffer()) + { + m_buffer.ResetAndClearCommands(); + m_buffer.Invalidate(wxRICHTEXT_ALL); + } + else + { + GetFocusObject()->Reset(); + } + m_caretPosition = -1; + m_caretPositionForDefaultStyle = -2; m_caretAtLineStart = false; - m_selectionRange.SetRange(-2, -2); + m_selection.Reset(); + m_selectionState = wxRichTextCtrlSelectionState_Normal; + + Scroll(0,0); - if (m_freezeCount == 0) + if (!IsFrozen()) { - SetupScrollbars(); - Refresh(); + LayoutContent(); + Refresh(false); } - SendUpdateEvent(); + + wxTextCtrl::SendTextUpdatedEvent(this); } /// Painting void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxBufferedPaintDC dc(this, m_bufferBitmap); +#if !wxRICHTEXT_USE_OWN_CARET + if (GetCaret() && !IsFrozen()) + GetCaret()->Hide(); +#endif - PrepareDC(dc); + { +#if wxRICHTEXT_BUFFERED_PAINTING + wxBufferedPaintDC dc(this, m_bufferBitmap); +#else + wxPaintDC dc(this); +#endif - if (m_freezeCount > 0) - return; + if (IsFrozen()) + return; - dc.SetFont(GetFont()); - - // Paint the background - PaintBackground(dc); + PrepareDC(dc); - wxRegion dirtyRegion = GetUpdateRegion(); + dc.SetFont(GetFont()); - wxRect availableSpace(wxPoint(0, 0), GetClientSize()); - if (GetBuffer().GetDirty()) - { - GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); - GetBuffer().SetDirty(false); - SetupScrollbars(); - PositionCaret(); + // Paint the background + PaintBackground(dc); + + // wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize()); + + wxRect drawingArea(GetUpdateRegion().GetBox()); + drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition())); + + wxRect availableSpace(GetClientSize()); + if (GetBuffer().IsDirty()) + { + GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); + GetBuffer().Invalidate(wxRICHTEXT_NONE); + SetupScrollbars(); + } + + wxRect clipRect(availableSpace); + clipRect.x += GetBuffer().GetLeftMargin(); + clipRect.y += GetBuffer().GetTopMargin(); + clipRect.width -= (GetBuffer().GetLeftMargin() + GetBuffer().GetRightMargin()); + clipRect.height -= (GetBuffer().GetTopMargin() + GetBuffer().GetBottomMargin()); + clipRect.SetPosition(GetLogicalPoint(clipRect.GetPosition())); + dc.SetClippingRegion(clipRect); + + int flags = 0; + if ((GetExtraStyle() & wxRICHTEXT_EX_NO_GUIDELINES) == 0) + flags |= wxRICHTEXT_DRAW_GUIDELINES; + + GetBuffer().Draw(dc, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags); + + dc.DestroyClippingRegion(); + + // Other user defined painting after everything else (i.e. all text) is painted + PaintAboveContent(dc); + +#if wxRICHTEXT_USE_OWN_CARET + if (GetCaret()->IsVisible()) + { + ((wxRichTextCaret*) GetCaret())->DoDraw(& dc); + } +#endif } - GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), availableSpace, 0 /* descent */, 0 /* flags */); +#if !wxRICHTEXT_USE_OWN_CARET + if (GetCaret()) + GetCaret()->Show(); + PositionCaret(); +#endif } // Empty implementation, to prevent flicker @@ -250,14 +466,67 @@ void wxRichTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) { + if (GetCaret()) + { +#if !wxRICHTEXT_USE_OWN_CARET + PositionCaret(); +#endif + GetCaret()->Show(); + } + +#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET + // Work around dropouts when control is focused if (!IsFrozen()) - Refresh(); + { + Refresh(false); + } +#endif } void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event)) { + if (GetCaret()) + GetCaret()->Hide(); + +#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET + // Work around dropouts when control is focused if (!IsFrozen()) - Refresh(); + { + Refresh(false); + } +#endif +} + +void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + m_dragging = false; +} + +// Set up the caret for the given position and container, after a mouse click +bool wxRichTextCtrl::SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection) +{ + bool caretAtLineStart = false; + + if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE) + { + // If we're at the start of a line (but not first in para) + // then we should keep the caret showing at the start of the line + // by showing the m_caretAtLineStart flag. + wxRichTextParagraph* para = container->GetParagraphAtPosition(position); + wxRichTextLine* line = container->GetLineAtPosition(position); + + if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position) + caretAtLineStart = true; + position --; + } + + if (extendSelection && (m_caretPosition != position)) + ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN); + + MoveCaret(position, caretAtLineStart); + SetDefaultStyleToCursorStyle(); + + return true; } /// Left-click @@ -268,250 +537,697 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); - + + // TODO: detect change of focus object long position = 0; - int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position); + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position, & hitObj, & contextObj); - if (hit != wxRICHTEXT_HITTEST_NONE) + if (hit != wxRICHTEXT_HITTEST_NONE && hitObj) { + wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject(); + wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + if (container && container != GetFocusObject() && container->AcceptsFocus()) + { + SetFocusObject(container, false /* don't set caret position yet */); + } + m_dragStart = event.GetLogicalPosition(dc); m_dragging = true; CaptureMouse(); - SelectNone(); - - bool caretAtLineStart = false; - - if (hit & wxRICHTEXT_HITTEST_BEFORE) - { - // If we're at the start of a line (but not first in para) - // then we should keep the caret showing at the start of the line - // by showing the m_caretAtLineStart flag. - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position); - wxRichTextLine* line = GetBuffer().GetLineAtPosition(position); - - if (line && para && line->GetRange().GetStart() == position && para->GetRange().GetStart() != position) - caretAtLineStart = true; - position --; - } - - MoveCaret(position, caretAtLineStart); - SetDefaultStyleToCursorStyle(); + long oldCaretPos = m_caretPosition; -#if 0 - wxWindow* p = GetParent(); - while (p && !p->IsKindOf(CLASSINFO(wxFrame))) - p = p->GetParent(); + SetCaretPositionAfterClick(container, position, hit); - wxFrame* frame = wxDynamicCast(p, wxFrame); - if (frame) + // For now, don't handle shift-click when we're selecting multiple objects. + if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal) { - wxString msg = wxString::Format(wxT("Found position %ld"), position); - frame->SetStatusText(msg, 1); + if (!m_selection.IsValid()) + ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); + else + ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); } -#endif + else + SelectNone(); } event.Skip(); } /// Left-up -void wxRichTextCtrl::OnLeftUp(wxMouseEvent& WXUNUSED(event)) +void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) { if (m_dragging) { m_dragging = false; if (GetCapture() == this) ReleaseMouse(); + + // See if we clicked on a URL + wxClientDC dc(this); + PrepareDC(dc); + dc.SetFont(GetFont()); + + long position = 0; + wxPoint logicalPt = event.GetLogicalPosition(dc); + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + // Only get objects at this level, not nested, because otherwise we couldn't swipe text at a single level. + int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS); + + if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE)) + { + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetPosition(position); + if (hitObj) + cmdEvent.SetContainer(hitObj->GetContainer()); + + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + { + wxRichTextAttr attr; + if (GetStyle(position, attr)) + { + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + wxString urlTarget = attr.GetURL(); + if (!urlTarget.IsEmpty()) + { + wxMouseEvent mouseEvent(event); + + long startPos = 0, endPos = 0; + wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(position); + if (obj) + { + startPos = obj->GetRange().GetStart(); + endPos = obj->GetRange().GetEnd(); + } + + wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos); + InitCommandEvent(urlEvent); + + urlEvent.SetString(urlTarget); + + GetEventHandler()->ProcessEvent(urlEvent); + } + } + } + } + } } } /// Left-click void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) { - if (!event.Dragging()) - { - event.Skip(); - return; - } - wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); - + long position = 0; wxPoint logicalPt = event.GetLogicalPosition(dc); - int hit = GetBuffer().HitTest(dc, logicalPt, position); + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; - if (m_dragging && hit != wxRICHTEXT_HITTEST_NONE) + int flags = 0; + + // If we're dragging, let's only consider positions at this level; otherwise + // selecting a range is not going to work. + wxRichTextParagraphLayoutBox* container = & GetBuffer(); + if (m_dragging) { - // TODO: test closeness + flags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS; + container = GetFocusObject(); + } + int hit = container->HitTest(dc, logicalPt, position, & hitObj, & contextObj, flags); - bool caretAtLineStart = false; + // See if we need to change the cursor - if (hit & wxRICHTEXT_HITTEST_BEFORE) + { + if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj) { - // If we're at the start of a line (but not first in para) - // then we should keep the caret showing at the start of the line - // by showing the m_caretAtLineStart flag. - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position); - wxRichTextLine* line = GetBuffer().GetLineAtPosition(position); - - if (line && para && line->GetRange().GetStart() == position && para->GetRange().GetStart() != position) - caretAtLineStart = true; - position --; + wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + wxRichTextAttr attr; + if (actualContainer && GetStyle(position, attr, actualContainer)) + { + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_urlCursor); + } + else if (!attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_textCursor); + } + } } + else + SetCursor(m_textCursor); + } + + if (!event.Dragging()) + { + event.Skip(); + return; + } - if (m_caretPosition != position) + if (m_dragging) + { + wxRichTextParagraphLayoutBox* commonAncestor = NULL; + wxRichTextParagraphLayoutBox* otherContainer = NULL; + wxRichTextParagraphLayoutBox* firstContainer = NULL; + + // Check for dragging across multiple containers + long position2 = 0; + wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL; + int hit2 = GetBuffer().HitTest(dc, logicalPt, position2, & hitObj2, & contextObj2, 0); + if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2) { - bool extendSel = ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN); - - MoveCaret(position, caretAtLineStart); - SetDefaultStyleToCursorStyle(); - - if (extendSel) + // See if we can find a common ancestor + if (m_selectionState == wxRichTextCtrlSelectionState_Normal) + { + firstContainer = GetFocusObject(); + commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox); + } + else + { + firstContainer = wxDynamicCast(m_selectionAnchorObject, wxRichTextParagraphLayoutBox); + //commonAncestor = GetFocusObject(); // when the selection state is not normal, the focus object (e.g. table) + // is the common ancestor. + commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox); + } + + if (commonAncestor && commonAncestor->HandlesChildSelections()) + { + wxRichTextObject* p = hitObj2; + while (p) + { + if (p->GetParent() == commonAncestor) + { + otherContainer = wxDynamicCast(p, wxRichTextParagraphLayoutBox); + break; + } + p = p->GetParent(); + } + } + + if (commonAncestor && firstContainer && otherContainer) + { + // We have now got a second container that shares a parent with the current or anchor object. + if (m_selectionState == wxRichTextCtrlSelectionState_Normal) + { + // Don't go into common-ancestor selection mode if we still have the same + // container. + if (otherContainer != firstContainer) + { + m_selectionState = wxRichTextCtrlSelectionState_CommonAncestor; + m_selectionAnchorObject = firstContainer; + m_selectionAnchor = firstContainer->GetRange().GetStart(); + + // The common ancestor, such as a table, returns the cell selection + // between the anchor and current position. + m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart()); + } + } + else + { + m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart()); + } + Refresh(); + + if (otherContainer->AcceptsFocus()) + SetFocusObject(otherContainer, false /* don't set caret and clear selection */); + MoveCaret(-1, false); + SetDefaultStyleToCursorStyle(); + } } } + + if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal) + { + // TODO: test closeness + SetCaretPositionAfterClick(container, position, hit, true /* extend selection */); + } } /// Right-click void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) { SetFocus(); - event.Skip(); + + wxClientDC dc(this); + PrepareDC(dc); + dc.SetFont(GetFont()); + + long position = 0; + wxPoint logicalPt = event.GetLogicalPosition(dc); + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj); + + if (hitObj && hitObj->GetContainer() != GetFocusObject()) + { + wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + if (actualContainer && actualContainer->AcceptsFocus()) + { + SetFocusObject(actualContainer, false /* don't set caret position yet */); + SetCaretPositionAfterClick(actualContainer, position, hit); + } + } + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetPosition(position); + if (hitObj) + cmdEvent.SetContainer(hitObj->GetContainer()); + + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + event.Skip(); } /// Left-double-click -void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& event) +void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event)) { - event.Skip(); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + { + SelectWord(GetCaretPosition()+1); + } } /// Middle-click void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event) { - event.Skip(); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + event.Skip(); } /// Key press void wxRichTextCtrl::OnChar(wxKeyEvent& event) { int flags = 0; - if (event.ControlDown()) + if (event.CmdDown()) flags |= wxRICHTEXT_CTRL_DOWN; if (event.ShiftDown()) flags |= wxRICHTEXT_SHIFT_DOWN; if (event.AltDown()) flags |= wxRICHTEXT_ALT_DOWN; - if (event.GetKeyCode() == WXK_LEFT || - event.GetKeyCode() == WXK_RIGHT || - event.GetKeyCode() == WXK_UP || - event.GetKeyCode() == WXK_DOWN || - event.GetKeyCode() == WXK_HOME || - event.GetKeyCode() == WXK_PAGEUP || - event.GetKeyCode() == WXK_PAGEDOWN || - event.GetKeyCode() == WXK_PRIOR || - event.GetKeyCode() == WXK_NEXT || - event.GetKeyCode() == WXK_END) - { - Navigate(event.GetKeyCode(), flags); - } - else if (event.GetKeyCode() == WXK_RETURN) + if (event.GetEventType() == wxEVT_KEY_DOWN) { - BeginBatchUndo(_("Insert Text")); - - long newPos = m_caretPosition; + if (event.IsKeyInCategory(WXK_CATEGORY_NAVIGATION)) + { + KeyboardNavigate(event.GetKeyCode(), flags); + return; + } - DeleteSelectedContent(& newPos); + long keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_ESCAPE: + case WXK_START: + case WXK_LBUTTON: + case WXK_RBUTTON: + case WXK_CANCEL: + case WXK_MBUTTON: + case WXK_CLEAR: + case WXK_SHIFT: + case WXK_ALT: + case WXK_CONTROL: + case WXK_MENU: + case WXK_PAUSE: + case WXK_CAPITAL: + case WXK_END: + case WXK_HOME: + case WXK_LEFT: + case WXK_UP: + case WXK_RIGHT: + case WXK_DOWN: + case WXK_SELECT: + case WXK_PRINT: + case WXK_EXECUTE: + case WXK_SNAPSHOT: + case WXK_INSERT: + case WXK_HELP: + case WXK_F1: + case WXK_F2: + case WXK_F3: + case WXK_F4: + case WXK_F5: + case WXK_F6: + case WXK_F7: + case WXK_F8: + case WXK_F9: + case WXK_F10: + case WXK_F11: + case WXK_F12: + case WXK_F13: + case WXK_F14: + case WXK_F15: + case WXK_F16: + case WXK_F17: + case WXK_F18: + case WXK_F19: + case WXK_F20: + case WXK_F21: + case WXK_F22: + case WXK_F23: + case WXK_F24: + case WXK_NUMLOCK: + case WXK_SCROLL: + case WXK_PAGEUP: + case WXK_PAGEDOWN: + case WXK_NUMPAD_F1: + case WXK_NUMPAD_F2: + case WXK_NUMPAD_F3: + case WXK_NUMPAD_F4: + case WXK_NUMPAD_HOME: + case WXK_NUMPAD_LEFT: + case WXK_NUMPAD_UP: + case WXK_NUMPAD_RIGHT: + case WXK_NUMPAD_DOWN: + case WXK_NUMPAD_PAGEUP: + case WXK_NUMPAD_PAGEDOWN: + case WXK_NUMPAD_END: + case WXK_NUMPAD_BEGIN: + case WXK_NUMPAD_INSERT: + case WXK_WINDOWS_LEFT: + { + return; + } + default: + { + } + } - GetBuffer().InsertNewlineWithUndo(newPos+1, this); + // Must process this before translation, otherwise it's translated into a WXK_DELETE event. + if (event.CmdDown() && event.GetKeyCode() == WXK_BACK) + { + BeginBatchUndo(_("Delete Text")); - wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_RETURN, - GetId()); - cmdEvent.SetEventObject(this); - cmdEvent.SetFlags(flags); - GetEventHandler()->ProcessEvent(cmdEvent); + long newPos = m_caretPosition; - EndBatchUndo(); - SetDefaultStyleToCursorStyle(); - } - else if (event.GetKeyCode() == WXK_BACK) - { - BeginBatchUndo(_("Delete Text")); + bool processed = DeleteSelectedContent(& newPos); - // Submit range in character positions, which are greater than caret positions, - // so subtract 1 for deleted character and add 1 for conversion to character position. - if (m_caretPosition > -1 && !HasSelection()) + // Submit range in character positions, which are greater than caret positions, + // so subtract 1 for deleted character and add 1 for conversion to character position. + if (newPos > -1) + { + if (event.CmdDown()) + { + long pos = wxRichTextCtrl::FindNextWordPosition(-1); + if (pos < newPos) + { + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this, & GetBuffer()); + processed = true; + } + } + + if (!processed) + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this, & GetBuffer()); + } + + EndBatchUndo(); + + if (GetLastPosition() == -1) + { + GetFocusObject()->Reset(); + + m_caretPosition = -1; + PositionCaret(); + SetDefaultStyleToCursorStyle(); + } + + ScrollIntoView(m_caretPosition, WXK_LEFT); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + + Update(); + } + else + event.Skip(); + + return; + } + + // all the other keys modify the controls contents which shouldn't be + // possible if we're read-only + if ( !IsEditable() ) + { + event.Skip(); + return; + } + + if (event.GetKeyCode() == WXK_RETURN) + { + BeginBatchUndo(_("Insert Text")); + + long newPos = m_caretPosition; + + DeleteSelectedContent(& newPos); + + if (event.ShiftDown()) { - GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition, m_caretPosition), - m_caretPosition, // Current caret position - m_caretPosition-1, // New caret position - this); + wxString text; + text = wxRichTextLineBreakChar; + GetFocusObject()->InsertTextWithUndo(newPos+1, text, this, & GetBuffer()); + m_caretAtLineStart = true; + PositionCaret(); } else - DeleteSelectedContent(); + GetFocusObject()->InsertNewlineWithUndo(newPos+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE); + + EndBatchUndo(); + SetDefaultStyleToCursorStyle(); + + ScrollIntoView(m_caretPosition, WXK_RIGHT); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_RETURN, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(newPos+1); + cmdEvent.SetContainer(GetFocusObject()); + + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + { + // Generate conventional event + wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId()); + InitCommandEvent(textEvent); + + GetEventHandler()->ProcessEvent(textEvent); + } + Update(); + } + else if (event.GetKeyCode() == WXK_BACK) + { + BeginBatchUndo(_("Delete Text")); + + long newPos = m_caretPosition; + + bool processed = DeleteSelectedContent(& newPos); + + // Submit range in character positions, which are greater than caret positions, + // so subtract 1 for deleted character and add 1 for conversion to character position. + if (newPos > -1) + { + if (event.CmdDown()) + { + long pos = wxRichTextCtrl::FindNextWordPosition(-1); + if (pos < newPos) + { + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this, & GetBuffer()); + processed = true; + } + } + + if (!processed) + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this, & GetBuffer()); + } EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { - GetBuffer().Reset(); + GetFocusObject()->Reset(); m_caretPosition = -1; PositionCaret(); SetDefaultStyleToCursorStyle(); } + ScrollIntoView(m_caretPosition, WXK_LEFT); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + + Update(); } else if (event.GetKeyCode() == WXK_DELETE) { BeginBatchUndo(_("Delete Text")); + long newPos = m_caretPosition; + + bool processed = DeleteSelectedContent(& newPos); + // Submit range in character positions, which are greater than caret positions, - if (m_caretPosition < GetBuffer().GetRange().GetEnd()+1 && !HasSelection()) + if (newPos < GetFocusObject()->GetOwnRange().GetEnd()+1) { - GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition+1, m_caretPosition+1), - m_caretPosition, // Current caret position - m_caretPosition+1, // New caret position - this); + if (event.CmdDown()) + { + long pos = wxRichTextCtrl::FindNextWordPosition(1); + if (pos != -1 && (pos > newPos)) + { + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, pos), this, & GetBuffer()); + processed = true; + } + } + + if (!processed && newPos < (GetLastPosition()-1)) + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, newPos+1), this, & GetBuffer()); } - else - DeleteSelectedContent(); EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { - GetBuffer().Reset(); + GetFocusObject()->Reset(); m_caretPosition = -1; PositionCaret(); SetDefaultStyleToCursorStyle(); } + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + + Update(); } else { - BeginBatchUndo(_("Insert Text")); + long keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_ESCAPE: + { + event.Skip(); + return; + } - long newPos = m_caretPosition; - DeleteSelectedContent(& newPos); + default: + { +#ifdef __WXMAC__ + if (event.CmdDown()) +#else + // Fixes AltGr+key with European input languages on Windows + if ((event.CmdDown() && !event.AltDown()) || (event.AltDown() && !event.CmdDown())) +#endif + { + event.Skip(); + return; + } + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CHARACTER, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); +#if wxUSE_UNICODE + cmdEvent.SetCharacter(event.GetUnicodeKey()); +#else + cmdEvent.SetCharacter((wxChar) keycode); +#endif + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); - wxString str = (wxChar) event.GetKeyCode(); - GetBuffer().InsertTextWithUndo(newPos+1, str, this); + if (keycode == wxT('\t')) + { + // See if we need to promote or demote the selection or paragraph at the cursor + // position, instead of inserting a tab. + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos); + if (para && para->GetRange().GetStart() == pos && para->GetAttributes().HasListStyleName()) + { + wxRichTextRange range; + if (HasSelection()) + range = GetSelectionRange(); + else + range = para->GetRange().FromInternal(); + + int promoteBy = event.ShiftDown() ? 1 : -1; + + PromoteList(promoteBy, range, NULL); + + GetEventHandler()->ProcessEvent(cmdEvent); + + return; + } + } - EndBatchUndo(); + BeginBatchUndo(_("Insert Text")); - SetDefaultStyleToCursorStyle(); - } -#if 0 - else - event.Skip(); + long newPos = m_caretPosition; + DeleteSelectedContent(& newPos); + +#if wxUSE_UNICODE + wxString str = event.GetUnicodeKey(); +#else + wxString str = (wxChar) event.GetKeyCode(); #endif + GetFocusObject()->InsertTextWithUndo(newPos+1, str, this, & GetBuffer(), 0); + + EndBatchUndo(); + + SetDefaultStyleToCursorStyle(); + ScrollIntoView(m_caretPosition, WXK_RIGHT); + + cmdEvent.SetPosition(m_caretPosition); + GetEventHandler()->ProcessEvent(cmdEvent); + + Update(); + } + } + } } /// Delete content if there is a selection, e.g. when pressing a key. @@ -519,12 +1235,18 @@ bool wxRichTextCtrl::DeleteSelectedContent(long* newPos) { if (HasSelection()) { - long pos = m_selectionRange.GetStart(); - GetBuffer().DeleteRangeWithUndo(m_selectionRange, - m_caretPosition, // Current caret position - pos, // New caret position - this); - m_selectionRange.SetRange(-2, -2); + long pos = m_selection.GetRange().GetStart(); + wxRichTextRange range = m_selection.GetRange(); + + // SelectAll causes more to be selected than doing it interactively, + // and causes a new paragraph to be inserted. So for multiline buffers, + // don't delete the final position. + if (range.GetEnd() == GetLastPosition() && GetNumberOfLines() > 0) + range.SetEnd(range.GetEnd()-1); + + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + m_selection.Reset(); + m_selectionState = wxRichTextCtrlSelectionState_Normal; if (newPos) *newPos = pos-1; @@ -565,55 +1287,54 @@ Adding Shift does the above but starts/extends selection. */ -bool wxRichTextCtrl::Navigate(int keyCode, int flags) +bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags) { bool success = false; - Freeze(); - if (keyCode == WXK_RIGHT) + if (keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT) { if (flags & wxRICHTEXT_CTRL_DOWN) success = WordRight(1, flags); else success = MoveRight(1, flags); } - else if (keyCode == WXK_LEFT) + else if (keyCode == WXK_LEFT || keyCode == WXK_NUMPAD_LEFT) { if (flags & wxRICHTEXT_CTRL_DOWN) success = WordLeft(1, flags); else success = MoveLeft(1, flags); } - else if (keyCode == WXK_UP) + else if (keyCode == WXK_UP || keyCode == WXK_NUMPAD_UP) { if (flags & wxRICHTEXT_CTRL_DOWN) success = MoveToParagraphStart(flags); else success = MoveUp(1, flags); } - else if (keyCode == WXK_DOWN) + else if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN) { if (flags & wxRICHTEXT_CTRL_DOWN) success = MoveToParagraphEnd(flags); else success = MoveDown(1, flags); } - else if (keyCode == WXK_PAGEUP || keyCode == WXK_PRIOR) + else if (keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP) { success = PageUp(1, flags); } - else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NEXT) + else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN) { success = PageDown(1, flags); } - else if (keyCode == WXK_HOME) + else if (keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME) { if (flags & wxRICHTEXT_CTRL_DOWN) success = MoveHome(flags); else success = MoveToLineStart(flags); } - else if (keyCode == WXK_END) + else if (keyCode == WXK_END || keyCode == WXK_NUMPAD_END) { if (flags & wxRICHTEXT_CTRL_DOWN) success = MoveEnd(flags); @@ -627,9 +1348,6 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags) SetDefaultStyleToCursorStyle(); } - // Only refresh if something changed - Thaw(success); - return success; } @@ -638,31 +1356,51 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags) { if (flags & wxRICHTEXT_SHIFT_DOWN) { + if (oldPos == newPos) + return false; + + wxRichTextSelection oldSelection = m_selection; + + m_selection.SetContainer(GetFocusObject()); + + wxRichTextRange oldRange; + if (m_selection.IsValid()) + oldRange = m_selection.GetRange(); + else + oldRange = wxRICHTEXT_NO_SELECTION; + wxRichTextRange newRange; + // If not currently selecting, start selecting - if (m_selectionRange.GetStart() == -2) + if (oldRange.GetStart() == -2) { m_selectionAnchor = oldPos; if (oldPos > newPos) - m_selectionRange.SetRange(newPos+1, oldPos); + newRange.SetRange(newPos+1, oldPos); else - m_selectionRange.SetRange(oldPos+1, newPos); + newRange.SetRange(oldPos+1, newPos); } else { // Always ensure that the selection range start is greater than // the end. if (newPos > m_selectionAnchor) - m_selectionRange.SetRange(m_selectionAnchor+1, newPos); + newRange.SetRange(m_selectionAnchor+1, newPos); + else if (newPos == m_selectionAnchor) + newRange = wxRichTextRange(-2, -2); else - m_selectionRange.SetRange(newPos+1, m_selectionAnchor); + newRange.SetRange(newPos+1, m_selectionAnchor); } - if (m_selectionRange.GetStart() > m_selectionRange.GetEnd()) + m_selection.SetRange(newRange); + + RefreshForSelectionChange(oldSelection, m_selection); + + if (newRange.GetStart() > newRange.GetEnd()) { wxLogDebug(wxT("Strange selection range")); } - + return true; } else @@ -681,16 +1419,16 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) int ppuX, ppuY; GetScrollPixelsPerUnit(& ppuX, & ppuY); - int startX, startY; - GetViewStart(& startX, & startY); - startX = 0; - startY = startY * ppuY; + int startXUnits, startYUnits; + GetViewStart(& startXUnits, & startYUnits); + int startY = startYUnits * ppuY; - int sx, sy; + int sx = 0, sy = 0; GetVirtualSize(& sx, & sy); - sx = 0; + int sxUnits = 0; + int syUnits = 0; if (ppuY != 0) - sy = sy/ppuY; + syUnits = sy/ppuY; wxRect rect = line->GetRect(); @@ -698,45 +1436,115 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) wxSize clientSize = GetClientSize(); + int leftMargin, rightMargin, topMargin, bottomMargin; + + { + wxClientDC dc(this); + wxRichTextObject::GetTotalMargin(dc, & GetBuffer(), GetBuffer().GetAttributes(), leftMargin, rightMargin, + topMargin, bottomMargin); + } +// clientSize.y -= GetBuffer().GetBottomMargin(); + clientSize.y -= bottomMargin; + + if (GetWindowStyle() & wxRE_CENTRE_CARET) + { + int y = rect.y - GetClientSize().y/2; + int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); + if (y >= 0 && (y + clientSize.y) < GetBuffer().GetCachedSize().y) + { + if (startYUnits != yUnits) + { + SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits); + scrolled = true; + } +#if !wxRICHTEXT_USE_OWN_CARET + if (scrolled) +#endif + PositionCaret(); + + return scrolled; + } + } + // Going down - if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_NEXT || keyCode == WXK_PAGEDOWN) + if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN || + keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT || + keyCode == WXK_END || keyCode == WXK_NUMPAD_END || + keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN) { if ((rect.y + rect.height) > (clientSize.y + startY)) { // Make it scroll so this item is at the bottom // of the window int y = rect.y - (clientSize.y - rect.height); - SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY)); + int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); + + // If we're still off the screen, scroll another line down + if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY))) + yUnits ++; + + if (startYUnits != yUnits) + { + SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits); + scrolled = true; + } } - else if (rect.y < startY) + else if (rect.y < (startY + GetBuffer().GetTopMargin())) { // Make it scroll so this item is at the top // of the window - int y = rect.y ; - SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY)); + int y = rect.y - GetBuffer().GetTopMargin(); + int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); + + if (startYUnits != yUnits) + { + SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits); + scrolled = true; + } } - scrolled = true; } // Going up - else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP) + else if (keyCode == WXK_UP || keyCode == WXK_NUMPAD_UP || + keyCode == WXK_LEFT || keyCode == WXK_NUMPAD_LEFT || + keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME || + keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP ) { - if (rect.y < startY) + if (rect.y < (startY + GetBuffer().GetBottomMargin())) { // Make it scroll so this item is at the top // of the window - int y = rect.y ; - SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY)); + int y = rect.y - GetBuffer().GetTopMargin(); + int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); + + if (startYUnits != yUnits) + { + SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits); + scrolled = true; + } } else if ((rect.y + rect.height) > (clientSize.y + startY)) { // Make it scroll so this item is at the bottom // of the window int y = rect.y - (clientSize.y - rect.height); - SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY)); + int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); + + // If we're still off the screen, scroll another line down + if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY))) + yUnits ++; + + if (startYUnits != yUnits) + { + SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits); + scrolled = true; + } } - scrolled = true; } - PositionCaret(); + +#if !wxRICHTEXT_USE_OWN_CARET + if (scrolled) +#endif + PositionCaret(); return scrolled; } @@ -757,17 +1565,11 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const startX = 0; startY = startY * ppuY; - int sx, sy; - GetVirtualSize(& sx, & sy); - sx = 0; - if (ppuY != 0) - sy = sy/ppuY; - wxRect rect = line->GetRect(); - wxSize clientSize = GetClientSize(); + clientSize.y -= GetBuffer().GetBottomMargin(); - return !(((rect.y + rect.height) > (clientSize.y + startY)) || rect.y < startY); + return (rect.GetTop() >= (startY + GetBuffer().GetTopMargin())) && (rect.GetBottom() <= (startY + clientSize.y)); } void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) @@ -781,20 +1583,22 @@ void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) /// to the start of the next, which may be the exact same caret position. void wxRichTextCtrl::MoveCaretForward(long oldPosition) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition); // Only do the check if we're not at the end of the paragraph (where things work OK // anyway) if (para && (oldPosition != para->GetRange().GetEnd() - 1)) { - wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition); if (line) { + wxRichTextRange lineRange = line->GetAbsoluteRange(); + // We're at the end of a line. See whether we need to // stay at the same actual caret position but change visual // position, or not. - if (oldPosition == line->GetRange().GetEnd()) + if (oldPosition == lineRange.GetEnd()) { if (m_caretAtLineStart) { @@ -808,7 +1612,7 @@ void wxRichTextCtrl::MoveCaretForward(long oldPosition) // the same position but indicate that we're to show // at the start of the next line. m_caretPosition = oldPosition; - m_caretAtLineStart = true; + m_caretAtLineStart = true; } SetDefaultStyleToCursorStyle(); return; @@ -824,26 +1628,28 @@ void wxRichTextCtrl::MoveCaretForward(long oldPosition) /// to the start of the next, which may be the exact same caret position. void wxRichTextCtrl::MoveCaretBack(long oldPosition) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition); // Only do the check if we're not at the start of the paragraph (where things work OK // anyway) if (para && (oldPosition != para->GetRange().GetStart())) { - wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition); if (line) { + wxRichTextRange lineRange = line->GetAbsoluteRange(); + // We're at the start of a line. See whether we need to // stay at the same actual caret position but change visual // position, or not. - if (oldPosition == line->GetRange().GetStart()) + if (oldPosition == lineRange.GetStart()) { m_caretPosition = oldPosition-1; m_caretAtLineStart = true; return; } - else if (oldPosition == line->GetRange().GetEnd()) + else if (oldPosition == lineRange.GetEnd()) { if (m_caretAtLineStart) { @@ -870,7 +1676,7 @@ void wxRichTextCtrl::MoveCaretBack(long oldPosition) /// Move right bool wxRichTextCtrl::MoveRight(int noPositions, int flags) { - long endPos = GetBuffer().GetRange().GetEnd(); + long endPos = GetFocusObject()->GetOwnRange().GetEnd(); if (m_caretPosition + noPositions < endPos) { @@ -894,12 +1700,10 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags) PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); // TODO: optimize so that if we didn't change the selection, we don't refresh return true; } else - return false; + return false; } /// Move left @@ -923,12 +1727,44 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags) PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } else - return false; + return false; +} + +// Find the caret position for the combination of hit-test flags and character position. +// Returns the caret position and also an indication of where to place the caret (caretLineStart) +// since this is ambiguous (same position used for end of line and start of next). +long wxRichTextCtrl::FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container, + bool& caretLineStart) +{ + // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE, + // we want to be at the end of the last line but with m_caretAtLineStart set to true, + // so we view the caret at the start of the line. + caretLineStart = false; + long caretPosition = position; + + if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE) + { + wxRichTextLine* thisLine = container->GetLineAtPosition(position-1); + wxRichTextRange lineRange; + if (thisLine) + lineRange = thisLine->GetAbsoluteRange(); + + if (thisLine && (position-1) == lineRange.GetEnd()) + { + caretPosition --; + caretLineStart = true; + } + else + { + wxRichTextParagraph* para = container->GetParagraphAtPosition(position); + if (para && para->GetRange().GetStart() == position) + caretPosition --; + } + } + return caretPosition; } /// Move up @@ -940,99 +1776,120 @@ bool wxRichTextCtrl::MoveUp(int noLines, int flags) /// Move up bool wxRichTextCtrl::MoveDown(int noLines, int flags) { - long lineNumber = GetBuffer().GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart); + if (!GetCaret()) + return false; + + long lineNumber = GetFocusObject()->GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart); wxPoint pt = GetCaret()->GetPosition(); long newLine = lineNumber + noLines; + bool notInThisObject = false; if (lineNumber != -1) { if (noLines > 0) { - long lastLine = GetBuffer().GetVisibleLineNumber(GetBuffer().GetRange().GetEnd()); - + long lastLine = GetFocusObject()->GetVisibleLineNumber(GetFocusObject()->GetOwnRange().GetEnd()); if (newLine > lastLine) - return false; + notInThisObject = true; } else { if (newLine < 0) - return false; + notInThisObject = true; } } - wxRichTextLine* lineObj = GetBuffer().GetLineForVisibleLineNumber(newLine); - if (lineObj) - { - pt.y = lineObj->GetAbsolutePosition().y + 2; + wxRichTextParagraphLayoutBox* container = GetFocusObject(); + int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS; + + if (notInThisObject) + { + // If we know we're navigating out of the current object, + // try to find an object anywhere in the buffer at the new position (up or down a bit) + container = & GetBuffer(); + hitTestFlags &= ~wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS; + + if (noLines > 0) // going down + { + pt.y = GetFocusObject()->GetPosition().y + GetFocusObject()->GetCachedSize().y + 2; + } + else // going up + { + pt.y = GetFocusObject()->GetPosition().y - 2; + } } else - return false; + { + wxRichTextLine* lineObj = GetFocusObject()->GetLineForVisibleLineNumber(newLine); + if (lineObj) + pt.y = lineObj->GetAbsolutePosition().y + 2; + else + return false; + } long newPos = 0; wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); - - int hitTest = GetBuffer().HitTest(dc, pt, newPos); - - if (hitTest != wxRICHTEXT_HITTEST_NONE) - { - // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE, - // we want to be at the end of the last line but with m_caretAtLineStart set to true, - // so we view the caret at the start of the line. - bool caretLineStart = false; - if (hitTest == wxRICHTEXT_HITTEST_BEFORE) + + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hitTest = container->HitTest(dc, pt, newPos, & hitObj, & contextObj, hitTestFlags); + + if (hitObj && + ((hitTest & wxRICHTEXT_HITTEST_NONE) == 0) && + (! (hitObj == (& m_buffer) && ((hitTest & wxRICHTEXT_HITTEST_OUTSIDE) != 0))) // outside the buffer counts as 'do nothing' + ) + { + if (notInThisObject) { - wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1); - if (thisLine && (newPos-1) == thisLine->GetRange().GetEnd()) - { - // if (para->GetRange().GetStart() != thisLine->GetRange().GetStart()) - { - newPos --; - caretLineStart = true; - } - } - else + wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + if (actualContainer && actualContainer != GetFocusObject() && actualContainer->AcceptsFocus()) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(newPos); - if (para && para->GetRange().GetStart() == newPos) - newPos --; + SetFocusObject(actualContainer, false /* don't set caret position yet */); + + container = actualContainer; } } - long newSelEnd = newPos; + bool caretLineStart = true; + long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart); + long newSelEnd = caretPosition; + bool extendSel; - if (!ExtendSelection(m_caretPosition, newSelEnd, flags)) + if (notInThisObject) + extendSel = false; + else + extendSel = ExtendSelection(m_caretPosition, newSelEnd, flags); + + if (!extendSel) SelectNone(); - SetCaretPosition(newPos, caretLineStart); + SetCaretPosition(caretPosition, caretLineStart); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } - else - return false; + + return false; } /// Move to the end of the paragraph bool wxRichTextCtrl::MoveToParagraphEnd(int flags) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true); if (para) { long newPos = para->GetRange().GetEnd() - 1; - if (!ExtendSelection(m_caretPosition, newPos, flags)) + bool extendSel = ExtendSelection(m_caretPosition, newPos, flags); + if (!extendSel) SelectNone(); SetCaretPosition(newPos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } @@ -1042,19 +1899,18 @@ bool wxRichTextCtrl::MoveToParagraphEnd(int flags) /// Move to the start of the paragraph bool wxRichTextCtrl::MoveToParagraphStart(int flags) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true); if (para) { long newPos = para->GetRange().GetStart() - 1; - if (!ExtendSelection(m_caretPosition, newPos, flags)) + bool extendSel = ExtendSelection(m_caretPosition, newPos, flags); + if (!extendSel) SelectNone(); SetCaretPosition(newPos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } @@ -1068,16 +1924,16 @@ bool wxRichTextCtrl::MoveToLineEnd(int flags) if (line) { - long newPos = line->GetRange().GetEnd(); - if (!ExtendSelection(m_caretPosition, newPos, flags)) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + long newPos = lineRange.GetEnd(); + bool extendSel = ExtendSelection(m_caretPosition, newPos, flags); + if (!extendSel) SelectNone(); SetCaretPosition(newPos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } @@ -1090,19 +1946,19 @@ bool wxRichTextCtrl::MoveToLineStart(int flags) wxRichTextLine* line = GetVisibleLineForCaretPosition(m_caretPosition); if (line) { - long newPos = line->GetRange().GetStart()-1; + wxRichTextRange lineRange = line->GetAbsoluteRange(); + long newPos = lineRange.GetStart()-1; - if (!ExtendSelection(m_caretPosition, newPos, flags)) + bool extendSel = ExtendSelection(m_caretPosition, newPos, flags); + if (!extendSel) SelectNone(); - wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(line); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(line); - SetCaretPosition(newPos, para->GetRange().GetStart() != line->GetRange().GetStart()); + SetCaretPosition(newPos, para->GetRange().GetStart() != lineRange.GetStart()); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } @@ -1114,41 +1970,39 @@ bool wxRichTextCtrl::MoveHome(int flags) { if (m_caretPosition != -1) { - if (!ExtendSelection(m_caretPosition, -1, flags)) + bool extendSel = ExtendSelection(m_caretPosition, -1, flags); + if (!extendSel) SelectNone(); SetCaretPosition(-1); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } else - return false; + return false; } /// Move to the end of the buffer bool wxRichTextCtrl::MoveEnd(int flags) { - long endPos = GetBuffer().GetRange().GetEnd()-1; + long endPos = GetFocusObject()->GetOwnRange().GetEnd()-1; if (m_caretPosition != endPos) { - if (!ExtendSelection(m_caretPosition, endPos, flags)) + bool extendSel = ExtendSelection(m_caretPosition, endPos, flags); + if (!extendSel) SelectNone(); SetCaretPosition(endPos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } else - return false; + return false; } /// Move noPages pages up @@ -1167,23 +2021,23 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags) wxSize clientSize = GetClientSize(); int newY = line->GetAbsolutePosition().y + noPages*clientSize.y; - wxRichTextLine* newLine = GetBuffer().GetLineAtYPosition(newY); + wxRichTextLine* newLine = GetFocusObject()->GetLineAtYPosition(newY); if (newLine) { - long pos = newLine->GetRange().GetStart()-1; + wxRichTextRange lineRange = newLine->GetAbsoluteRange(); + long pos = lineRange.GetStart()-1; if (pos != m_caretPosition) { - wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(newLine); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(newLine); - if (!ExtendSelection(m_caretPosition, pos, flags)) + bool extendSel = ExtendSelection(m_caretPosition, pos, flags); + if (!extendSel) SelectNone(); - SetCaretPosition(pos, para->GetRange().GetStart() != newLine->GetRange().GetStart()); + SetCaretPosition(pos, para->GetRange().GetStart() != lineRange.GetStart()); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } } @@ -1192,21 +2046,31 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags) return false; } +static bool wxRichTextCtrlIsWhitespace(const wxString& str) +{ + return str == wxT(" ") || str == wxT("\t"); +} + // Finds the caret position for the next word long wxRichTextCtrl::FindNextWordPosition(int direction) const -{ - long endPos = GetBuffer().GetRange().GetEnd(); +{ + long endPos = GetFocusObject()->GetOwnRange().GetEnd(); if (direction > 0) { long i = m_caretPosition+1+direction; // +1 for conversion to character pos - + // First skip current text to space while (i < endPos && i > -1) { // i is in character, not caret positions - wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i)); - if (text != wxT(" ") && !text.IsEmpty()) + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i)); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false); + if (line && (i == line->GetAbsoluteRange().GetEnd())) + { + break; + } + else if (!wxRichTextCtrlIsWhitespace(text) && !text.empty()) i += direction; else { @@ -1216,10 +2080,14 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const while (i < endPos && i > -1) { // i is in character, not caret positions - wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i)); - if (text.IsEmpty()) // End of paragraph, or maybe an image + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i)); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false); + if (line && (i == line->GetAbsoluteRange().GetEnd())) + return wxMax(-1, i); + + if (text.empty()) // End of paragraph, or maybe an image return wxMax(-1, i - 1); - else if (text == wxT(" ") || text.IsEmpty()) + else if (wxRichTextCtrlIsWhitespace(text) || text.empty()) i += direction; else { @@ -1239,10 +2107,12 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const while (i < endPos && i > -1) { // i is in character, not caret positions - wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i)); - if (text.IsEmpty()) // End of paragraph, or maybe an image + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i)); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false); + + if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image break; - else if (text == wxT(" ") || text.IsEmpty()) + else if (wxRichTextCtrlIsWhitespace(text) || text.empty()) i += direction; else break; @@ -1251,13 +2121,16 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const while (i < endPos && i > -1) { // i is in character, not caret positions - wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i)); - if (text != wxT(" ") /* && !text.IsEmpty() */) + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i)); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false); + if (line && line->GetAbsoluteRange().GetStart() == i) + return i-1; + + if (!wxRichTextCtrlIsWhitespace(text) /* && !text.empty() */) i += direction; else { return i; - break; } } if (i < -1) @@ -1272,20 +2145,19 @@ bool wxRichTextCtrl::WordLeft(int WXUNUSED(n), int flags) long pos = FindNextWordPosition(-1); if (pos != m_caretPosition) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true); - - if (!ExtendSelection(m_caretPosition, pos, flags)) + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true); + + bool extendSel = ExtendSelection(m_caretPosition, pos, flags); + if (!extendSel) SelectNone(); - + SetCaretPosition(pos, para->GetRange().GetStart() != pos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } - + return false; } @@ -1295,37 +2167,109 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags) long pos = FindNextWordPosition(1); if (pos != m_caretPosition) { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true); - - if (!ExtendSelection(m_caretPosition, pos, flags)) + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true); + + bool extendSel = ExtendSelection(m_caretPosition, pos, flags); + if (!extendSel) SelectNone(); - + SetCaretPosition(pos, para->GetRange().GetStart() != pos); PositionCaret(); SetDefaultStyleToCursorStyle(); - if (!IsFrozen()) - Refresh(); return true; } - + return false; } /// Sizing void wxRichTextCtrl::OnSize(wxSizeEvent& event) { - GetBuffer().SetDirty(true); - + // Only do sizing optimization for large buffers + if (GetBuffer().GetOwnRange().GetEnd() > m_delayedLayoutThreshold) + { + m_fullLayoutRequired = true; + m_fullLayoutTime = wxGetLocalTimeMillis(); + m_fullLayoutSavedPosition = GetFirstVisiblePosition(); + LayoutContent(true /* onlyVisibleRect */); + } + else + GetBuffer().Invalidate(wxRICHTEXT_ALL); + +#if wxRICHTEXT_BUFFERED_PAINTING RecreateBuffer(); +#endif + + event.Skip(); +} + +// Force any pending layout due to large buffer +void wxRichTextCtrl::ForceDelayedLayout() +{ + if (m_fullLayoutRequired) + { + m_fullLayoutRequired = false; + m_fullLayoutTime = 0; + GetBuffer().Invalidate(wxRICHTEXT_ALL); + ShowPosition(m_fullLayoutSavedPosition); + Refresh(false); + Update(); + } +} + +/// Idle-time processing +void wxRichTextCtrl::OnIdle(wxIdleEvent& event) +{ +#if wxRICHTEXT_USE_OWN_CARET + if (((wxRichTextCaret*) GetCaret())->GetNeedsUpdate()) + { + ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate(false); + PositionCaret(); + GetCaret()->Show(); + } +#endif + + const int layoutInterval = wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL; + + if (m_fullLayoutRequired && (wxGetLocalTimeMillis() > (m_fullLayoutTime + layoutInterval))) + { + m_fullLayoutRequired = false; + m_fullLayoutTime = 0; + GetBuffer().Invalidate(wxRICHTEXT_ALL); + ShowPosition(m_fullLayoutSavedPosition); + Refresh(false); + } + + if (m_caretPositionForDefaultStyle != -2) + { + // If the caret position has changed, no longer reflect the default style + // in the UI. + if (GetCaretPosition() != m_caretPositionForDefaultStyle) + m_caretPositionForDefaultStyle = -2; + } + + event.Skip(); +} + +/// Scrolling +void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event) +{ +#if wxRICHTEXT_USE_OWN_CARET + if (!((wxRichTextCaret*) GetCaret())->GetNeedsUpdate()) + { + GetCaret()->Hide(); + ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate(); + } +#endif event.Skip(); } /// Set up scrollbars, e.g. after a resize -void wxRichTextCtrl::SetupScrollbars() +void wxRichTextCtrl::SetupScrollbars(bool atTop) { - if (m_freezeCount) + if (IsFrozen()) return; if (GetBuffer().IsEmpty()) @@ -1336,107 +2280,119 @@ void wxRichTextCtrl::SetupScrollbars() // TODO: reimplement scrolling so we scroll by line, not by fixed number // of pixels. See e.g. wxVScrolledWindow for ideas. - int pixelsPerUnit = 5; // 10; + int pixelsPerUnit = 5; wxSize clientSize = GetClientSize(); - int maxHeight = GetBuffer().GetCachedSize().y; + int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin(); - int unitsY = maxHeight/pixelsPerUnit; + // Round up so we have at least maxHeight pixels + int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5); + + int startX = 0, startY = 0; + if (!atTop) + GetViewStart(& startX, & startY); + + int maxPositionX = 0; + int maxPositionY = (int) ((((float)(wxMax((unitsY*pixelsPerUnit) - clientSize.y, 0)))/((float)pixelsPerUnit)) + 0.5); + + int newStartX = wxMin(maxPositionX, startX); + int newStartY = wxMin(maxPositionY, startY); + + int oldPPUX, oldPPUY; + int oldStartX, oldStartY; + int oldVirtualSizeX = 0, oldVirtualSizeY = 0; + GetScrollPixelsPerUnit(& oldPPUX, & oldPPUY); + GetViewStart(& oldStartX, & oldStartY); + GetVirtualSize(& oldVirtualSizeX, & oldVirtualSizeY); + if (oldPPUY > 0) + oldVirtualSizeY /= oldPPUY; + + if (oldPPUX == 0 && oldPPUY == pixelsPerUnit && oldVirtualSizeY == unitsY && oldStartX == newStartX && oldStartY == newStartY) + return; + + // Don't set scrollbars if there were none before, and there will be none now. + if (oldPPUY != 0 && (oldVirtualSizeY*oldPPUY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y)) + return; - int startX, startY; - GetViewStart(& startX, & startY); - - int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0); - int maxPositionY = (wxMax(maxHeight - clientSize.y, 0))/pixelsPerUnit; - // Move to previous scroll position if // possible - SetScrollbars(0, pixelsPerUnit, - 0, unitsY, - wxMin(maxPositionX, startX), wxMin(maxPositionY, startY)); + SetScrollbars(0, pixelsPerUnit, 0, unitsY, newStartX, newStartY); } /// Paint the background void wxRichTextCtrl::PaintBackground(wxDC& dc) { wxColour backgroundColour = GetBackgroundColour(); - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); // Clear the background dc.SetBrush(wxBrush(backgroundColour)); dc.SetPen(*wxTRANSPARENT_PEN); - wxRect windowRect(wxPoint(0, 0), GetClientSize()); + wxRect windowRect(GetClientSize()); windowRect.x -= 2; windowRect.y -= 2; windowRect.width += 4; windowRect.height += 4; - + // We need to shift the rectangle to take into account // scrolling. Converting device to logical coordinates. CalcUnscrolledPosition(windowRect.x, windowRect.y, & windowRect.x, & windowRect.y); dc.DrawRectangle(windowRect); } +#if wxRICHTEXT_BUFFERED_PAINTING /// Recreate buffer bitmap if necessary bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) { wxSize sz = size; if (sz == wxDefaultSize) sz = GetClientSize(); - + if (sz.x < 1 || sz.y < 1) return false; - - if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) + + if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) m_bufferBitmap = wxBitmap(sz.x, sz.y); - return m_bufferBitmap.Ok(); + return m_bufferBitmap.IsOk(); } +#endif // ---------------------------------------------------------------------------- // file IO functions // ---------------------------------------------------------------------------- -bool wxRichTextCtrl::LoadFile(const wxString& filename, int type) +bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType) { - bool success = GetBuffer().LoadFile(filename, type); + bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType); if (success) m_filename = filename; DiscardEdits(); SetInsertionPoint(0); - Layout(); + LayoutContent(); PositionCaret(); - Refresh(); - SendUpdateEvent(); + SetupScrollbars(true); + Refresh(false); + wxTextCtrl::SendTextUpdatedEvent(this); if (success) return true; else { wxLogError(_("File couldn't be loaded.")); - + return false; } } -bool wxRichTextCtrl::SaveFile(const wxString& filename, int type) +bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType) { - wxString filenameToUse = filename.empty() ? m_filename : filename; - if ( filenameToUse.empty() ) - { - // what kind of message to give? is it an error or a program bug? - wxLogDebug(wxT("Can't save textctrl to file without filename.")); - - return false; - } - - if (GetBuffer().SaveFile(filenameToUse, type)) + if (GetBuffer().SaveFile(filename, (wxRichTextFileType)fileType)) { - m_filename = filenameToUse; + m_filename = filename; DiscardEdits(); return true; - } wxLogError(_("The text couldn't be saved.")); @@ -1451,13 +2407,19 @@ bool wxRichTextCtrl::SaveFile(const wxString& filename, int type) /// Add a new paragraph of text to the end of the buffer wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text) { - return GetBuffer().AddParagraph(text); + wxRichTextRange range = GetFocusObject()->AddParagraph(text); + GetBuffer().Invalidate(); + LayoutContent(); + return range; } /// Add an image wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image) { - return GetBuffer().AddImage(image); + wxRichTextRange range = GetFocusObject()->AddImage(image); + GetBuffer().Invalidate(); + LayoutContent(); + return range; } // ---------------------------------------------------------------------------- @@ -1466,36 +2428,90 @@ wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image) void wxRichTextCtrl::SelectAll() { - SetSelection(0, GetLastPosition()); - m_selectionAnchor = -1; + SetSelection(-1, -1); } /// Select none void wxRichTextCtrl::SelectNone() { - SetSelection(-2, -2); + if (m_selection.IsValid()) + { + wxRichTextSelection oldSelection = m_selection; + + m_selection.Reset(); + + RefreshForSelectionChange(oldSelection, m_selection); + } m_selectionAnchor = -2; + m_selectionAnchorObject = NULL; + m_selectionState = wxRichTextCtrlSelectionState_Normal; } -wxString wxRichTextCtrl::GetStringSelection() const +static bool wxIsWordDelimiter(const wxString& text) { - long from, to; - GetSelection(&from, &to); - - return GetRange(from, to); + return !text.IsEmpty() && !wxIsalnum(text[0]); } -// do the window-specific processing after processing the update event -void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event) +/// Select the word at the given character position +bool wxRichTextCtrl::SelectWord(long position) { - if ( event.GetSetEnabled() ) - Enable(event.GetEnabled()); + if (position < 0 || position > GetFocusObject()->GetOwnRange().GetEnd()) + return false; + + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(position); + if (!para) + return false; + + if (position == para->GetRange().GetEnd()) + position --; + + long positionStart = position; + long positionEnd = position; + + for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --) + { + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionStart, positionStart)); + if (wxIsWordDelimiter(text)) + { + positionStart ++; + break; + } + } + if (positionStart < para->GetRange().GetStart()) + positionStart = para->GetRange().GetStart(); + + for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++) + { + wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionEnd, positionEnd)); + if (wxIsWordDelimiter(text)) + { + positionEnd --; + break; + } + } + if (positionEnd >= para->GetRange().GetEnd()) + positionEnd = para->GetRange().GetEnd(); + + if (positionEnd < positionStart) + return false; + + SetSelection(positionStart, positionEnd+1); - if ( event.GetSetText() ) + if (positionStart >= 0) { - if ( event.GetText() != GetValue() ) - SetValue(event.GetText()); + MoveCaret(positionStart-1, true); + SetDefaultStyleToCursorStyle(); } + + return true; +} + +wxString wxRichTextCtrl::GetStringSelection() const +{ + long from, to; + GetSelection(&from, &to); + + return GetRange(from, to); } // ---------------------------------------------------------------------------- @@ -1526,56 +2542,73 @@ wxRichTextCtrl::HitTest(const wxPoint& pt, wxClientDC dc((wxRichTextCtrl*) this); ((wxRichTextCtrl*)this)->PrepareDC(dc); - int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt, *pos); - if (hit == wxRICHTEXT_HITTEST_BEFORE) + // Buffer uses logical position (relative to start of buffer) + // so convert + wxPoint pt2 = GetLogicalPoint(pt); + + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS); + + if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE)) return wxTE_HT_BEFORE; - else if (hit == wxRICHTEXT_HITTEST_AFTER) + else if ((hit & wxRICHTEXT_HITTEST_AFTER) && (hit & wxRICHTEXT_HITTEST_OUTSIDE)) return wxTE_HT_BEYOND; - else if (hit == wxRICHTEXT_HITTEST_ON) + else if (hit & (wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_AFTER)) return wxTE_HT_ON_TEXT; - else - return wxTE_HT_UNKNOWN; + + return wxTE_HT_UNKNOWN; } // ---------------------------------------------------------------------------- // set/get the controls text // ---------------------------------------------------------------------------- -wxString wxRichTextCtrl::GetValue() const +wxString wxRichTextCtrl::DoGetValue() const { return GetBuffer().GetText(); } wxString wxRichTextCtrl::GetRange(long from, long to) const { - return GetBuffer().GetTextForRange(wxRichTextRange(from, to)); + // Public API for range is different from internals + return GetFocusObject()->GetTextForRange(wxRichTextRange(from, to-1)); } -void wxRichTextCtrl::SetValue(const wxString& value) +void wxRichTextCtrl::DoSetValue(const wxString& value, int flags) { - Clear(); + // Don't call Clear here, since it always sends a text updated event + m_buffer.ResetAndClearCommands(); + m_buffer.Invalidate(wxRICHTEXT_ALL); + m_caretPosition = -1; + m_caretPositionForDefaultStyle = -2; + m_caretAtLineStart = false; + m_selection.Reset(); + m_selectionState = wxRichTextCtrlSelectionState_Normal; - // if the text is long enough, it's faster to just set it instead of first - // comparing it with the old one (chances are that it will be different - // anyhow, this comparison is there to avoid flicker for small single-line - // edit controls mostly) - if ( (value.length() > 0x400) || (value != GetValue()) ) + Scroll(0,0); + + if (!IsFrozen()) + { + LayoutContent(); + Refresh(false); + } + + if (!value.IsEmpty()) { - DoWriteText(value, false /* not selection only */); + // Remove empty paragraph + GetBuffer().Clear(); + DoWriteText(value, flags); // for compatibility, don't move the cursor when doing SetValue() SetInsertionPoint(0); } - else // same text + else { // still send an event for consistency - SendUpdateEvent(); + if (flags & SetValue_SendEvent) + wxTextCtrl::SendTextUpdatedEvent(this); } - - // we should reset the modified flag even if the value didn't really change - - // mark the control as being not dirty - we changed its text, not the - // user DiscardEdits(); } @@ -1584,9 +2617,14 @@ void wxRichTextCtrl::WriteText(const wxString& value) DoWriteText(value); } -void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly)) +void wxRichTextCtrl::DoWriteText(const wxString& value, int flags) { - GetBuffer().InsertTextWithUndo(m_caretPosition+1, value, this); + wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix); + + GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, valueUnix, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + + if ( flags & SetValue_SendEvent ) + wxTextCtrl::SendTextUpdatedEvent(this); } void wxRichTextCtrl::AppendText(const wxString& text) @@ -1597,54 +2635,109 @@ void wxRichTextCtrl::AppendText(const wxString& text) } /// Write an image at the current insertion point -bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType) +bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType, const wxRichTextAttr& textAttr) { wxRichTextImageBlock imageBlock; wxImage image2 = image; if (imageBlock.MakeImageBlock(image2, bitmapType)) - return WriteImage(imageBlock); - else - return false; + return WriteImage(imageBlock, textAttr); + + return false; } -bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType) +bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType, const wxRichTextAttr& textAttr) { wxRichTextImageBlock imageBlock; wxImage image; if (imageBlock.MakeImageBlock(filename, bitmapType, image, false)) - return WriteImage(imageBlock); - else - return false; + return WriteImage(imageBlock, textAttr); + + return false; } -bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock) +bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wxRichTextAttr& textAttr) { - return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this); + return GetFocusObject()->InsertImageWithUndo(m_caretPosition+1, imageBlock, this, & GetBuffer(), 0, textAttr); } -bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType) +bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType, const wxRichTextAttr& textAttr) { - if (bitmap.Ok()) + if (bitmap.IsOk()) { wxRichTextImageBlock imageBlock; - + wxImage image = bitmap.ConvertToImage(); - if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType)) - return WriteImage(imageBlock); - else - return false; + if (image.IsOk() && imageBlock.MakeImageBlock(image, bitmapType)) + return WriteImage(imageBlock, textAttr); } + return false; } +// Write a text box at the current insertion point. +wxRichTextBox* wxRichTextCtrl::WriteTextBox(const wxRichTextAttr& textAttr) +{ + wxRichTextBox* textBox = new wxRichTextBox; + textBox->SetAttributes(textAttr); + textBox->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style + textBox->AddParagraph(wxEmptyString); + textBox->SetParent(NULL); + + // The object returned is the one actually inserted into the buffer, + // while the original one is deleted. + wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(m_caretPosition+1, textBox, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + wxRichTextBox* box = wxDynamicCast(obj, wxRichTextBox); + return box; +} + +// Write a table at the current insertion point, returning the table. +wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr, const wxRichTextAttr& cellAttr) +{ + wxASSERT(rows > 0 && cols > 0); + + if (rows <= 0 || cols <= 0) + return NULL; + + wxRichTextTable* table = new wxRichTextTable; + table->SetAttributes(tableAttr); + table->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style + + table->CreateTable(rows, cols); + + table->SetParent(NULL); + + int i, j; + for (j = 0; j < rows; j++) + { + for (i = 0; i < cols; i++) + { + table->GetCell(j, i)->GetAttributes() = cellAttr; + } + } + + // The object returned is the one actually inserted into the buffer, + // while the original one is deleted. + wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(m_caretPosition+1, table, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + wxRichTextTable* tableResult = wxDynamicCast(obj, wxRichTextTable); + return tableResult; +} + + /// Insert a newline (actually paragraph) at the current insertion point. bool wxRichTextCtrl::Newline() { - return GetBuffer().InsertNewlineWithUndo(m_caretPosition+1, this); + return GetFocusObject()->InsertNewlineWithUndo(m_caretPosition+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); } +/// Insert a line break at the current insertion point. +bool wxRichTextCtrl::LineBreak() +{ + wxString text; + text = wxRichTextLineBreakChar; + return GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, text, this, & GetBuffer()); +} // ---------------------------------------------------------------------------- // Clipboard operations @@ -1654,7 +2747,7 @@ void wxRichTextCtrl::Copy() { if (CanCopy()) { - wxRichTextRange range = GetSelectionRange(); + wxRichTextRange range = GetInternalSelectionRange(); GetBuffer().CopyToClipboard(range); } } @@ -1663,12 +2756,12 @@ void wxRichTextCtrl::Cut() { if (CanCut()) { - wxRichTextRange range = GetSelectionRange(); + wxRichTextRange range = GetInternalSelectionRange(); GetBuffer().CopyToClipboard(range); DeleteSelectedContent(); - Layout(); - Refresh(); + LayoutContent(); + Refresh(false); } } @@ -1677,10 +2770,10 @@ void wxRichTextCtrl::Paste() if (CanPaste()) { BeginBatchUndo(_("Paste")); - + long newPos = m_caretPosition; DeleteSelectedContent(& newPos); - + GetBuffer().PasteFromClipboard(newPos); EndBatchUndo(); @@ -1697,7 +2790,12 @@ void wxRichTextCtrl::DeleteSelection() bool wxRichTextCtrl::HasSelection() const { - return m_selectionRange.GetStart() != -2 && m_selectionRange.GetEnd() != -2; + return (m_selection.IsValid() && m_selection.GetContainer() == GetFocusObject()); +} + +bool wxRichTextCtrl::HasUnfocusedSelection() const +{ + return m_selection.IsValid(); } bool wxRichTextCtrl::CanCopy() const @@ -1729,6 +2827,13 @@ bool wxRichTextCtrl::CanDeleteSelection() const // Accessors // ---------------------------------------------------------------------------- +void wxRichTextCtrl::SetContextMenu(wxMenu* menu) +{ + if (m_contextMenu && m_contextMenu != menu) + delete m_contextMenu; + m_contextMenu = menu; +} + void wxRichTextCtrl::SetEditable(bool editable) { m_editable = editable; @@ -1739,6 +2844,10 @@ void wxRichTextCtrl::SetInsertionPoint(long pos) SelectNone(); m_caretPosition = pos - 1; + + PositionCaret(); + + SetDefaultStyleToCursorStyle(); } void wxRichTextCtrl::SetInsertionPointEnd() @@ -1754,15 +2863,24 @@ long wxRichTextCtrl::GetInsertionPoint() const wxTextPos wxRichTextCtrl::GetLastPosition() const { - return GetBuffer().GetRange().GetEnd(); + return GetFocusObject()->GetOwnRange().GetEnd(); } // If the return values from and to are the same, there is no // selection. void wxRichTextCtrl::GetSelection(long* from, long* to) const { - *from = m_selectionRange.GetStart(); - *to = m_selectionRange.GetEnd(); + if (m_selection.IsValid()) + { + *from = m_selection.GetRange().GetStart(); + *to = m_selection.GetRange().GetEnd(); + (*to) ++; + } + else + { + *from = -2; + *to = -2; + } } bool wxRichTextCtrl::IsEditable() const @@ -1781,32 +2899,40 @@ void wxRichTextCtrl::SetSelection(long from, long to) if ( (from == -1) && (to == -1) ) { from = 0; - to = GetLastPosition(); + to = GetLastPosition()+1; } - DoSetSelection(from, to); -} + if (from == to) + { + SelectNone(); + } + else + { + wxRichTextSelection oldSelection = m_selection; -void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret)) -{ - m_selectionAnchor = from; - m_selectionRange.SetRange(from, to); - if (!IsFrozen()) - Refresh(); - PositionCaret(); + m_selectionAnchor = from-1; + m_selectionAnchorObject = NULL; + m_selection.Set(wxRichTextRange(from, to-1), GetFocusObject()); + + m_caretPosition = wxMax(-1, to-1); + + RefreshForSelectionChange(oldSelection, m_selection); + PositionCaret(); + } } // ---------------------------------------------------------------------------- // Editing // ---------------------------------------------------------------------------- -void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to), const wxString& value) +void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to), + const wxString& value) { BeginBatchUndo(_("Replace")); DeleteSelectedContent(); - DoWriteText(value, true /* selection only */); + DoWriteText(value, SetValue_SelectionOnly); EndBatchUndo(); } @@ -1815,14 +2941,11 @@ void wxRichTextCtrl::Remove(long from, long to) { SelectNone(); - GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to), - m_caretPosition, // Current caret position - from, // New caret position - this); + GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(from, to-1), this, & GetBuffer()); - Layout(); + LayoutContent(); if (!IsFrozen()) - Refresh(); + Refresh(false); } bool wxRichTextCtrl::IsModified() const @@ -1837,13 +2960,14 @@ void wxRichTextCtrl::MarkDirty() void wxRichTextCtrl::DiscardEdits() { + m_caretPositionForDefaultStyle = -2; m_buffer.Modify(false); m_buffer.GetCommandProcessor()->ClearCommands(); } int wxRichTextCtrl::GetNumberOfLines() const { - return GetBuffer().GetParagraphCount(); + return GetFocusObject()->GetParagraphCount(); } // ---------------------------------------------------------------------------- @@ -1852,12 +2976,12 @@ int wxRichTextCtrl::GetNumberOfLines() const long wxRichTextCtrl::XYToPosition(long x, long y) const { - return GetBuffer().XYToPosition(x, y); + return GetFocusObject()->XYToPosition(x, y); } bool wxRichTextCtrl::PositionToXY(long pos, long *x, long *y) const { - return GetBuffer().PositionToXY(pos, x, y); + return GetFocusObject()->PositionToXY(pos, x, y); } // ---------------------------------------------------------------------------- @@ -1872,12 +2996,12 @@ void wxRichTextCtrl::ShowPosition(long pos) int wxRichTextCtrl::GetLineLength(long lineNo) const { - return GetBuffer().GetParagraphLength(lineNo); + return GetFocusObject()->GetParagraphLength(lineNo); } wxString wxRichTextCtrl::GetLineText(long lineNo) const { - return GetBuffer().GetParagraphText(lineNo); + return GetFocusObject()->GetParagraphText(lineNo); } // ---------------------------------------------------------------------------- @@ -1902,19 +3026,19 @@ void wxRichTextCtrl::Redo() bool wxRichTextCtrl::CanUndo() const { - return GetCommandProcessor()->CanUndo(); + return GetCommandProcessor()->CanUndo() && IsEditable(); } bool wxRichTextCtrl::CanRedo() const { - return GetCommandProcessor()->CanRedo(); + return GetCommandProcessor()->CanRedo() && IsEditable(); } // ---------------------------------------------------------------------------- -// implemenation details +// implementation details // ---------------------------------------------------------------------------- -void wxRichTextCtrl::Command(wxCommandEvent & event) +void wxRichTextCtrl::Command(wxCommandEvent& event) { SetValue(event.GetString()); GetEventHandler()->ProcessEvent(event); @@ -1929,39 +3053,6 @@ void wxRichTextCtrl::OnDropFiles(wxDropFilesEvent& event) } } -// ---------------------------------------------------------------------------- -// text control event processing -// ---------------------------------------------------------------------------- - -bool wxRichTextCtrl::SendUpdateEvent() -{ - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); - InitCommandEvent(event); - - return GetEventHandler()->ProcessEvent(event); -} - -void wxRichTextCtrl::InitCommandEvent(wxCommandEvent& event) const -{ - event.SetEventObject((wxControlBase *)this); // const_cast - - switch ( m_clientDataType ) - { - case wxClientData_Void: - event.SetClientData(GetClientData()); - break; - - case wxClientData_Object: - event.SetClientObject(GetClientObject()); - break; - - case wxClientData_None: - // nothing to do - ; - } -} - - wxSize wxRichTextCtrl::DoGetBestSize() const { return wxSize(10, 10); @@ -2035,7 +3126,8 @@ void wxRichTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) void wxRichTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - SelectAll(); + if (GetLastPosition() > 0) + SelectAll(); } void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) @@ -2043,122 +3135,281 @@ void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) event.Enable(GetLastPosition() > 0); } -void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event)) +void wxRichTextCtrl::OnProperties(wxCommandEvent& event) { - if (!m_contextMenu) + int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1; + if (idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount()) { - m_contextMenu = new wxMenu; - m_contextMenu->Append(wxID_UNDO, _("&Undo")); - m_contextMenu->Append(wxID_REDO, _("&Redo")); - m_contextMenu->AppendSeparator(); - m_contextMenu->Append(wxID_CUT, _("Cu&t")); - m_contextMenu->Append(wxID_COPY, _("&Copy")); - m_contextMenu->Append(wxID_PASTE, _("&Paste")); - m_contextMenu->Append(wxID_CLEAR, _("&Delete")); - m_contextMenu->AppendSeparator(); - m_contextMenu->Append(wxID_SELECTALL, _("Select &All")); + wxRichTextObject* obj = m_contextMenuPropertiesInfo.GetObject(idx); + if (obj && obj->CanEditProperties()) + obj->EditProperties(this, & GetBuffer()); + + m_contextMenuPropertiesInfo.Clear(); } - PopupMenu(m_contextMenu); - return; } -bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style) +void wxRichTextCtrl::OnUpdateProperties(wxUpdateUIEvent& event) { - return GetBuffer().SetStyle(wxRichTextRange(start, end), style); + int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1; + event.Enable(idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount()); } -bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style) +void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event) { - return GetBuffer().SetStyle(range, style); + if (event.GetEventObject() != this) + { + event.Skip(); + return; + } + + wxClientDC dc(this); + PrepareDC(dc); + dc.SetFont(GetFont()); + + long position = 0; + wxPoint pt = event.GetPosition(); + wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt)); + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj); + + m_contextMenuPropertiesInfo.Clear(); + + if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER) + { + wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + if (hitObj && actualContainer) + { + if (actualContainer->AcceptsFocus()) + { + SetFocusObject(actualContainer, false /* don't set caret position yet */); + SetCaretPositionAfterClick(actualContainer, position, hit); + } + + m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj); + } + else + m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL); + } + else + { + m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL); + } + + if (m_contextMenu) + { + m_contextMenuPropertiesInfo.AddMenuItems(m_contextMenu); + PopupMenu(m_contextMenu); + } } -bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style) +bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { - return GetBuffer().SetDefaultStyle(style); + return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), wxRichTextAttr(style)); } -const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const +bool wxRichTextCtrl::SetStyle(long start, long end, const wxRichTextAttr& style) { - return GetBuffer().GetDefaultStyle(); + return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), style); } -bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style) const +bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style) { - return GetBuffer().GetStyle(position, style); + return GetFocusObject()->SetStyle(range.ToInternal(), wxRichTextAttr(style)); } -bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style) const +bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style) { - return GetBuffer().GetStyle(position, style); + return GetFocusObject()->SetStyle(range.ToInternal(), style); } -/// Set font, and also the buffer attributes -bool wxRichTextCtrl::SetFont(const wxFont& font) +void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr) { -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - wxControl::SetFont(font); -#else - wxScrolledWindow::SetFont(font); -#endif + GetFocusObject()->SetStyle(obj, textAttr); +} - wxTextAttrEx attr = GetBuffer().GetAttributes(); - attr.SetFont(font); - GetBuffer().SetBasicStyle(attr); - GetBuffer().SetDefaultStyle(attr); +// extended style setting operation with flags including: +// wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY. +// see richtextbuffer.h for more details. - return true; +bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags) +{ + return GetFocusObject()->SetStyle(range.ToInternal(), style, flags); } -/// Transform logical to physical (unscrolling) -wxPoint wxRichTextCtrl::GetPhysicalPoint(const wxPoint& ptLogical) +bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style) { - wxPoint pt; - CalcScrolledPosition(ptLogical.x, ptLogical.y, & pt.x, & pt.y); + return GetBuffer().SetDefaultStyle(style); +} - return pt; +bool wxRichTextCtrl::SetDefaultStyle(const wxRichTextAttr& style) +{ + wxRichTextAttr attr1(style); + attr1.GetTextBoxAttr().Reset(); + return GetBuffer().SetDefaultStyle(attr1); } -/// Transform physical to logical -wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical) +const wxRichTextAttr& wxRichTextCtrl::GetDefaultStyleEx() const { - wxPoint pt; + return GetBuffer().GetDefaultStyle(); +} + +bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style) +{ + wxRichTextAttr attr; + if (GetFocusObject()->GetStyle(position, attr)) + { + style = attr; + return true; + } + else + return false; +} + +bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style) +{ + return GetFocusObject()->GetStyle(position, style); +} + +bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container) +{ + wxRichTextAttr attr; + if (container->GetStyle(position, attr)) + { + style = attr; + return true; + } + else + return false; +} + +// get the common set of styles for the range +bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style) +{ + wxRichTextAttr attr; + if (GetFocusObject()->GetStyleForRange(range.ToInternal(), attr)) + { + style = attr; + return true; + } + else + return false; +} + +bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style) +{ + return GetFocusObject()->GetStyleForRange(range.ToInternal(), style); +} + +bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container) +{ + return container->GetStyleForRange(range.ToInternal(), style); +} + +/// Get the content (uncombined) attributes for this position. +bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style) +{ + return GetFocusObject()->GetUncombinedStyle(position, style); +} + +/// Get the content (uncombined) attributes for this position. +bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container) +{ + return container->GetUncombinedStyle(position, style); +} + +/// Set font, and also the buffer attributes +bool wxRichTextCtrl::SetFont(const wxFont& font) +{ + wxControl::SetFont(font); + + wxRichTextAttr attr = GetBuffer().GetAttributes(); + attr.SetFont(font); + GetBuffer().SetBasicStyle(attr); + + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(false); + + return true; +} + +/// Transform logical to physical +wxPoint wxRichTextCtrl::GetPhysicalPoint(const wxPoint& ptLogical) const +{ + wxPoint pt; + CalcScrolledPosition(ptLogical.x, ptLogical.y, & pt.x, & pt.y); + + return pt; +} + +/// Transform physical to logical +wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical) const +{ + wxPoint pt; CalcUnscrolledPosition(ptPhysical.x, ptPhysical.y, & pt.x, & pt.y); return pt; } /// Position the caret -void wxRichTextCtrl::PositionCaret() +void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) { + if (!GetCaret()) + return; + + //wxLogDebug(wxT("PositionCaret")); + wxRect caretRect; - if (GetCaretPositionForIndex(GetCaretPosition(), caretRect)) + if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container)) { - wxPoint originalPt = caretRect.GetPosition(); - wxPoint pt = GetPhysicalPoint(originalPt); + wxPoint newPt = caretRect.GetPosition(); + wxSize newSz = caretRect.GetSize(); + wxPoint pt = GetPhysicalPoint(newPt); + if (GetCaret()->GetPosition() != pt || GetCaret()->GetSize() != newSz) + { + GetCaret()->Hide(); + if (GetCaret()->GetSize() != newSz) + GetCaret()->SetSize(newSz); - GetCaret()->Move(pt); - GetCaret()->SetSize(caretRect.GetSize()); + int halfSize = newSz.y/2; + // If the caret is beyond the margin, hide it by moving it out of the way + if (((pt.y + halfSize) < GetBuffer().GetTopMargin()) || ((pt.y + halfSize) > (GetClientSize().y - GetBuffer().GetBottomMargin()))) + { + pt.x = -200; + pt.y = -200; + } + + GetCaret()->Move(pt); + GetCaret()->Show(); + } } } /// Get the caret height and position for the given character position -bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect) +bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container) { wxClientDC dc(this); dc.SetFont(GetFont()); - + PrepareDC(dc); wxPoint pt; int height = 0; - if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart)) + if (!container) + container = GetFocusObject(); + + if (container->FindPosition(dc, position, pt, & height, m_caretAtLineStart)) { + // Caret height can't be zero + if (height == 0) + height = dc.GetCharHeight(); + rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height)); return true; } - else - return false; + + return false; } /// Gets the line for the visible caret position. If the caret is @@ -2167,15 +3418,16 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect) /// if this is the case. wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPosition) const { - wxRichTextLine* line = GetBuffer().GetLineAtPosition(caretPosition, true); - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPosition, true); + wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(caretPosition, true); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPosition, true); if (line) { - if (caretPosition == line->GetRange().GetStart()-1 && - (para->GetRange().GetStart() != line->GetRange().GetStart())) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (caretPosition == lineRange.GetStart()-1 && + (para->GetRange().GetStart() != lineRange.GetStart())) { if (!m_caretAtLineStart) - line = GetBuffer().GetLineAtPosition(caretPosition-1, true); + line = GetFocusObject()->GetLineAtPosition(caretPosition-1, true); } } return line; @@ -2183,16 +3435,19 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio /// Move the caret to the given character position -bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart) +bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart, wxRichTextParagraphLayoutBox* container) { - if (GetBuffer().GetDirty()) - Layout(); + if (GetBuffer().IsDirty()) + LayoutContent(); - if (pos <= GetBuffer().GetRange().GetEnd()) + if (!container) + container = GetFocusObject(); + + if (pos <= container->GetOwnRange().GetEnd()) { SetCaretPosition(pos, showAtLineStart); - PositionCaret(); + PositionCaret(container); return true; } @@ -2202,40 +3457,50 @@ bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart) /// Layout the buffer: which we must do before certain operations, such as /// setting the caret position. -bool wxRichTextCtrl::Layout() +bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect) { - wxRect availableSpace(wxPoint(0, 0), GetClientSize()); - if (availableSpace.width == 0) - availableSpace.width = 10; - if (availableSpace.height == 0) - availableSpace.height = 10; + if (GetBuffer().IsDirty() || onlyVisibleRect) + { + wxRect availableSpace(GetClientSize()); + if (availableSpace.width == 0) + availableSpace.width = 10; + if (availableSpace.height == 0) + availableSpace.height = 10; + + int flags = wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT; + if (onlyVisibleRect) + { + flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT; + availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0))); + } - wxClientDC dc(this); - dc.SetFont(GetFont()); - - PrepareDC(dc); + wxClientDC dc(this); + dc.SetFont(GetFont()); - GetBuffer().Defragment(); - GetBuffer().UpdateRanges(); // If items were deleted, ranges need recalculation - GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); - GetBuffer().SetDirty(false); - - if (!IsFrozen()) - SetupScrollbars(); + PrepareDC(dc); + + GetBuffer().Defragment(); + GetBuffer().UpdateRanges(); // If items were deleted, ranges need recalculation + GetBuffer().Layout(dc, availableSpace, flags); + GetBuffer().Invalidate(wxRICHTEXT_NONE); + + if (!IsFrozen()) + SetupScrollbars(); + } return true; } /// Is all of the selection bold? -bool wxRichTextCtrl::IsSelectionBold() const +bool wxRichTextCtrl::IsSelectionBold() { if (HasSelection()) { wxRichTextAttr attr; wxRichTextRange range = GetSelectionRange(); attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT); - attr.SetFontWeight(wxBOLD); - + attr.SetFontWeight(wxFONTWEIGHT_BOLD); + return HasCharacterAttributes(range, attr); } else @@ -2244,25 +3509,28 @@ bool wxRichTextCtrl::IsSelectionBold() const // to see what the effect would be if we started typing. wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT); - if (GetStyle(GetCaretPosition()+1, attr)) + + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + if (GetStyle(pos, attr)) { - wxRichTextApplyStyle(attr, GetDefaultStyleEx()); - return attr.GetFontWeight() == wxBOLD; + if (IsDefaultStyleShowing()) + wxRichTextApplyStyle(attr, GetDefaultStyleEx()); + return attr.GetFontWeight() == wxFONTWEIGHT_BOLD; } } return false; } /// Is all of the selection italics? -bool wxRichTextCtrl::IsSelectionItalics() const +bool wxRichTextCtrl::IsSelectionItalics() { if (HasSelection()) { wxRichTextRange range = GetSelectionRange(); wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC); - attr.SetFontStyle(wxITALIC); - + attr.SetFontStyle(wxFONTSTYLE_ITALIC); + return HasCharacterAttributes(range, attr); } else @@ -2271,17 +3539,20 @@ bool wxRichTextCtrl::IsSelectionItalics() const // to see what the effect would be if we started typing. wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC); - if (GetStyle(GetCaretPosition()+1, attr)) + + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + if (GetStyle(pos, attr)) { - wxRichTextApplyStyle(attr, GetDefaultStyleEx()); - return attr.GetFontStyle() == wxITALIC; + if (IsDefaultStyleShowing()) + wxRichTextApplyStyle(attr, GetDefaultStyleEx()); + return attr.GetFontStyle() == wxFONTSTYLE_ITALIC; } } return false; } /// Is all of the selection underlined? -bool wxRichTextCtrl::IsSelectionUnderlined() const +bool wxRichTextCtrl::IsSelectionUnderlined() { if (HasSelection()) { @@ -2289,7 +3560,7 @@ bool wxRichTextCtrl::IsSelectionUnderlined() const wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE); attr.SetFontUnderlined(true); - + return HasCharacterAttributes(range, attr); } else @@ -2298,9 +3569,12 @@ bool wxRichTextCtrl::IsSelectionUnderlined() const // to see what the effect would be if we started typing. wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE); - if (GetStyle(GetCaretPosition()+1, attr)) + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + + if (GetStyle(pos, attr)) { - wxRichTextApplyStyle(attr, GetDefaultStyleEx()); + if (IsDefaultStyleShowing()) + wxRichTextApplyStyle(attr, GetDefaultStyleEx()); return attr.GetFontUnderlined(); } } @@ -2312,12 +3586,16 @@ bool wxRichTextCtrl::ApplyBoldToSelection() { wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT); - attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD); + attr.SetFontWeight(IsSelectionBold() ? wxFONTWEIGHT_NORMAL : wxFONTWEIGHT_BOLD); if (HasSelection()) - return SetStyle(GetSelectionRange(), attr); + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); else - SetDefaultStyle(attr); + { + wxRichTextAttr current = GetDefaultStyleEx(); + current.Apply(attr); + SetAndShowDefaultStyle(current); + } return true; } @@ -2326,12 +3604,16 @@ bool wxRichTextCtrl::ApplyItalicToSelection() { wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC); - attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC); + attr.SetFontStyle(IsSelectionItalics() ? wxFONTSTYLE_NORMAL : wxFONTSTYLE_ITALIC); if (HasSelection()) - return SetStyle(GetSelectionRange(), attr); + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); else - SetDefaultStyle(attr); + { + wxRichTextAttr current = GetDefaultStyleEx(); + current.Apply(attr); + SetAndShowDefaultStyle(current); + } return true; } @@ -2340,34 +3622,32 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection() { wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE); - attr.SetFontWeight(!IsSelectionUnderlined()); + attr.SetFontUnderlined(!IsSelectionUnderlined()); if (HasSelection()) - return SetStyle(GetSelectionRange(), attr); + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); else - SetDefaultStyle(attr); + { + wxRichTextAttr current = GetDefaultStyleEx(); + current.Apply(attr); + SetAndShowDefaultStyle(current); + } return true; } /// Is all of the selection aligned according to the specified flag? -bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment) const +bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment) { + wxRichTextRange range; if (HasSelection()) - { - wxRichTextRange range = GetSelectionRange(); - wxRichTextAttr attr; - attr.SetAlignment(alignment); - - return HasParagraphAttributes(range, attr); - } + range = GetSelectionRange(); else - { - // If no selection, then we need to get information from the current paragraph. - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1); - if (para) - return para->GetAttributes().GetAlignment() == alignment; - } - return false; + range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+2); + + wxRichTextAttr attr; + attr.SetAlignment(alignment); + + return HasParagraphAttributes(range, attr); } /// Apply alignment to the selection @@ -2379,28 +3659,610 @@ bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment) return SetStyle(GetSelectionRange(), attr); else { - wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(GetCaretPosition()+1); if (para) - return SetStyle(para->GetRange(), attr); + return SetStyleEx(para->GetRange().FromInternal(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY); } return true; } +/// Apply a named style to the selection +bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) +{ + // Flags are defined within each definition, so only certain + // attributes are applied. + wxRichTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle()); + + int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET; + + if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition))) + { + flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; + + wxRichTextRange range; + + if (HasSelection()) + range = GetSelectionRange(); + else + { + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + range = wxRichTextRange(pos, pos+1); + } + + return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags); + } + + bool isPara = false; + + // Make sure the attr has the style name + if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition))) + { + isPara = true; + attr.SetParagraphStyleName(def->GetName()); + + // If applying a paragraph style, we only want the paragraph nodes to adopt these + // attributes, and not the leaf nodes. This will allow the content (e.g. text) + // to change its style independently. + flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; + } + else + attr.SetCharacterStyleName(def->GetName()); + + if (HasSelection()) + return SetStyleEx(GetSelectionRange(), attr, flags); + else + { + wxRichTextAttr current = GetDefaultStyleEx(); + wxRichTextAttr defaultStyle(attr); + if (isPara) + { + // Don't apply extra character styles since they are already implied + // in the paragraph style + defaultStyle.SetFlags(defaultStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER); + } + current.Apply(defaultStyle); + SetAndShowDefaultStyle(current); + + // If it's a paragraph style, we want to apply the style to the + // current paragraph even if we didn't select any text. + if (isPara) + { + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos); + if (para) + { + return SetStyleEx(para->GetRange().FromInternal(), attr, flags); + } + } + return true; + } +} + +/// Apply the style sheet to the buffer, for example if the styles have changed. +bool wxRichTextCtrl::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet) +{ + if (!styleSheet) + styleSheet = GetBuffer().GetStyleSheet(); + if (!styleSheet) + return false; + + if (GetBuffer().ApplyStyleSheet(styleSheet)) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(false); + return true; + } + else + return false; +} + /// Sets the default style to the style under the cursor bool wxRichTextCtrl::SetDefaultStyleToCursorStyle() { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_CHARACTER); - if (GetStyle(GetCaretPosition(), attr)) + // If at the start of a paragraph, use the next position. + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + + if (GetUncombinedStyle(pos, attr)) { SetDefaultStyle(attr); return true; } + + return false; +} + +/// Returns the first visible position in the current view +long wxRichTextCtrl::GetFirstVisiblePosition() const +{ + wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y); + if (line) + return line->GetAbsoluteRange().GetStart(); + else + return 0; +} + +/// Get the first visible point in the window +wxPoint wxRichTextCtrl::GetFirstVisiblePoint() const +{ + int ppuX, ppuY; + int startXUnits, startYUnits; + + GetScrollPixelsPerUnit(& ppuX, & ppuY); + GetViewStart(& startXUnits, & startYUnits); + + return wxPoint(startXUnits * ppuX, startYUnits * ppuY); +} + +/// The adjusted caret position is the character position adjusted to take +/// into account whether we're at the start of a paragraph, in which case +/// style information should be taken from the next position, not current one. +long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const +{ + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPos+1); + + if (para && (caretPos+1 == para->GetRange().GetStart())) + caretPos ++; + return caretPos; +} + +/// Get/set the selection range in character positions. -1, -1 means no selection. +/// The range is in API convention, i.e. a single character selection is denoted +/// by (n, n+1) +wxRichTextRange wxRichTextCtrl::GetSelectionRange() const +{ + wxRichTextRange range = GetInternalSelectionRange(); + if (range != wxRichTextRange(-2,-2) && range != wxRichTextRange(-1,-1)) + range.SetEnd(range.GetEnd() + 1); + return range; +} + +void wxRichTextCtrl::SetSelectionRange(const wxRichTextRange& range) +{ + SetSelection(range.GetStart(), range.GetEnd()); +} + +/// Set list style +bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + return GetFocusObject()->SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel); +} + +bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) +{ + return GetFocusObject()->SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel); +} + +/// Clear list for given range +bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags) +{ + return GetFocusObject()->ClearListStyle(range.ToInternal(), flags); +} + +/// Number/renumber any list elements in the given range +bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + return GetFocusObject()->NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel); +} + +bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) +{ + return GetFocusObject()->NumberList(range.ToInternal(), defName, flags, startFrom, specifiedLevel); +} + +/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1 +bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel) +{ + return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel); +} + +bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel) +{ + return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel); +} + +/// Deletes the content in the given range +bool wxRichTextCtrl::Delete(const wxRichTextRange& range) +{ + return GetFocusObject()->DeleteRangeWithUndo(range.ToInternal(), this, & GetBuffer()); +} + +const wxArrayString& wxRichTextCtrl::GetAvailableFontNames() +{ + if (sm_availableFontNames.GetCount() == 0) + { + sm_availableFontNames = wxFontEnumerator::GetFacenames(); + sm_availableFontNames.Sort(); + } + return sm_availableFontNames; +} + +void wxRichTextCtrl::ClearAvailableFontNames() +{ + sm_availableFontNames.Clear(); +} + +void wxRichTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) +{ + //wxLogDebug(wxT("wxRichTextCtrl::OnSysColourChanged")); + + wxTextAttrEx basicStyle = GetBasicStyle(); + basicStyle.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + SetBasicStyle(basicStyle); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + + Refresh(); +} + +// Refresh the area affected by a selection change +bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection) +{ + // If the selection is not part of the focus object, or we have multiple ranges, then the chances are that + // the selection contains whole containers rather than just text, so refresh everything + // for now as it would be hard to compute the rectangle bounding all selections. + // TODO: improve on this. + if ((oldSelection.IsValid() && (oldSelection.GetContainer() != GetFocusObject() || oldSelection.GetCount() > 1)) || + (newSelection.IsValid() && (newSelection.GetContainer() != GetFocusObject() || newSelection.GetCount() > 1))) + { + Refresh(false); + return true; + } + + wxRichTextRange oldRange, newRange; + if (oldSelection.IsValid()) + oldRange = oldSelection.GetRange(); + else + oldRange = wxRICHTEXT_NO_SELECTION; + if (newSelection.IsValid()) + newRange = newSelection.GetRange(); + else + newRange = wxRICHTEXT_NO_SELECTION; + + // Calculate the refresh rectangle - just the affected lines + long firstPos, lastPos; + if (oldRange.GetStart() == -2 && newRange.GetStart() != -2) + { + firstPos = newRange.GetStart(); + lastPos = newRange.GetEnd(); + } + else if (oldRange.GetStart() != -2 && newRange.GetStart() == -2) + { + firstPos = oldRange.GetStart(); + lastPos = oldRange.GetEnd(); + } + else if (oldRange.GetStart() == -2 && newRange.GetStart() == -2) + { + return false; + } + else + { + firstPos = wxMin(oldRange.GetStart(), newRange.GetStart()); + lastPos = wxMax(oldRange.GetEnd(), newRange.GetEnd()); + } + + wxRichTextLine* firstLine = GetFocusObject()->GetLineAtPosition(firstPos); + wxRichTextLine* lastLine = GetFocusObject()->GetLineAtPosition(lastPos); + + if (firstLine && lastLine) + { + wxSize clientSize = GetClientSize(); + wxPoint pt1 = GetPhysicalPoint(firstLine->GetAbsolutePosition()); + wxPoint pt2 = GetPhysicalPoint(lastLine->GetAbsolutePosition()) + wxPoint(0, lastLine->GetSize().y); + + pt1.x = 0; + pt1.y = wxMax(0, pt1.y); + pt2.x = 0; + pt2.y = wxMin(clientSize.y, pt2.y); + + wxRect rect(pt1, wxSize(clientSize.x, pt2.y - pt1.y)); + RefreshRect(rect, false); + } + else + Refresh(false); + + return true; +} + +// margins functions +bool wxRichTextCtrl::DoSetMargins(const wxPoint& pt) +{ + GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS); + GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS); + GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS); + GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS); + + return true; +} + +wxPoint wxRichTextCtrl::DoGetMargins() const +{ + return wxPoint(GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().GetValue(), + GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().GetValue()); +} + +bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition) +{ + if (obj && !obj->AcceptsFocus()) + return false; + + wxRichTextParagraphLayoutBox* oldContainer = GetFocusObject(); + bool changingContainer = (m_focusObject != obj); + + m_focusObject = obj; + + if (!obj) + m_focusObject = & m_buffer; + + if (setCaretPosition && changingContainer) + { + m_selection.Reset(); + m_selectionAnchor = -2; + m_selectionAnchorObject = NULL; + m_selectionState = wxRichTextCtrlSelectionState_Normal; + + long pos = -1; + + m_caretAtLineStart = false; + MoveCaret(pos, m_caretAtLineStart); + SetDefaultStyleToCursorStyle(); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetOldContainer(oldContainer); + cmdEvent.SetContainer(m_focusObject); + + GetEventHandler()->ProcessEvent(cmdEvent); + } + return true; +} + +#if wxRICHTEXT_USE_OWN_CARET + +// ---------------------------------------------------------------------------- +// initialization and destruction +// ---------------------------------------------------------------------------- + +void wxRichTextCaret::Init() +{ + m_hasFocus = true; + + m_xOld = + m_yOld = -1; + m_richTextCtrl = NULL; + m_needsUpdate = false; + m_flashOn = true; +} + +wxRichTextCaret::~wxRichTextCaret() +{ + if (m_timer.IsRunning()) + m_timer.Stop(); +} + +// ---------------------------------------------------------------------------- +// showing/hiding/moving the caret (base class interface) +// ---------------------------------------------------------------------------- + +void wxRichTextCaret::DoShow() +{ + m_flashOn = true; + + if (!m_timer.IsRunning()) + m_timer.Start(GetBlinkTime()); + + Refresh(); +} + +void wxRichTextCaret::DoHide() +{ + if (m_timer.IsRunning()) + m_timer.Stop(); + + Refresh(); +} + +void wxRichTextCaret::DoMove() +{ + if (IsVisible()) + { + Refresh(); + + if (m_xOld != -1 && m_yOld != -1) + { + if (m_richTextCtrl) + { + wxRect rect(GetPosition(), GetSize()); + m_richTextCtrl->RefreshRect(rect, false); + } + } + } + + m_xOld = m_x; + m_yOld = m_y; +} + +void wxRichTextCaret::DoSize() +{ + int countVisible = m_countVisible; + if (countVisible > 0) + { + m_countVisible = 0; + DoHide(); + } + + if (countVisible > 0) + { + m_countVisible = countVisible; + DoShow(); + } +} + +// ---------------------------------------------------------------------------- +// handling the focus +// ---------------------------------------------------------------------------- + +void wxRichTextCaret::OnSetFocus() +{ + m_hasFocus = true; + + if ( IsVisible() ) + Refresh(); +} + +void wxRichTextCaret::OnKillFocus() +{ + m_hasFocus = false; +} + +// ---------------------------------------------------------------------------- +// drawing the caret +// ---------------------------------------------------------------------------- + +void wxRichTextCaret::Refresh() +{ + if (m_richTextCtrl) + { + wxRect rect(GetPosition(), GetSize()); + m_richTextCtrl->RefreshRect(rect, false); + } +} + +void wxRichTextCaret::DoDraw(wxDC *dc) +{ + dc->SetPen( *wxBLACK_PEN ); + + dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH)); + dc->SetPen(*wxBLACK_PEN); + + wxPoint pt(m_x, m_y); + + if (m_richTextCtrl) + { + pt = m_richTextCtrl->GetLogicalPoint(pt); + } + if (IsVisible() && m_flashOn) + dc->DrawRectangle(pt.x, pt.y, m_width, m_height); +} + +void wxRichTextCaret::Notify() +{ + m_flashOn = !m_flashOn; + Refresh(); +} + +void wxRichTextCaretTimer::Notify() +{ + m_caret->Notify(); +} +#endif + // wxRICHTEXT_USE_OWN_CARET + +// Add an item +bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichTextObject* obj) +{ + if (GetCount() < 3) + { + m_labels.Add(label); + m_objects.Add(obj); + return true; + } else return false; } +// Returns number of menu items were added. +int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd) const +{ + wxMenuItem* item = menu->FindItem(startCmd); + // If none of the standard properties identifiers are in the menu, assume it's + // a custom menu without properties commands, and don't add them. + if (item) + { + // If no items, to add just set the text to something generic + if (GetCount() == 0) + { + menu->SetLabel(startCmd, _("&Properties")); + + // Delete the others if necessary + int i; + for (i = startCmd+1; i < startCmd+3; i++) + { + if (menu->FindItem(i)) + { + menu->Delete(i); + } + } + } + else + { + int i; + int pos = -1; + // Find the position of the first properties item + for (i = 0; i < (int) menu->GetMenuItemCount(); i++) + { + wxMenuItem* item = menu->FindItemByPosition(i); + if (item && item->GetId() == startCmd) + { + pos = i; + break; + } + } + + if (pos != -1) + { + int insertBefore = pos+1; + for (i = startCmd; i < startCmd+GetCount(); i++) + { + if (menu->FindItem(i)) + { + menu->SetLabel(i, m_labels[i - startCmd]); + } + else + { + if (insertBefore >= (int) menu->GetMenuItemCount()) + menu->Append(i, m_labels[i - startCmd]); + else + menu->Insert(insertBefore, i, m_labels[i - startCmd]); + } + insertBefore ++; + } + + // Delete any old items still left on the menu + for (i = startCmd + GetCount(); i < startCmd+3; i++) + { + if (menu->FindItem(i)) + { + menu->Delete(i); + } + } + } + } + } + + return GetCount(); +} + +// Add appropriate menu items for the current container and clicked on object +// (and container's parent, if appropriate). +int wxRichTextContextMenuPropertiesInfo::AddItems(wxRichTextObject* container, wxRichTextObject* obj) +{ + Clear(); + if (obj && obj->CanEditProperties()) + AddItem(obj->GetPropertiesMenuLabel(), obj); + + if (container && container != obj && container->CanEditProperties() && m_labels.Index(container->GetPropertiesMenuLabel()) == wxNOT_FOUND) + AddItem(container->GetPropertiesMenuLabel(), container); + + if (container && container->GetParent() && container->GetParent()->CanEditProperties() && m_labels.Index(container->GetParent()->GetPropertiesMenuLabel()) == wxNOT_FOUND) + AddItem(container->GetParent()->GetPropertiesMenuLabel(), container->GetParent()); + + return GetCount(); +} + #endif // wxUSE_RICHTEXT -