X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a4a38c1432412277235562ec561bad73b61574d..71a09c3579dd5cb4cd8fa7fdc143561cbff74e12:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index cbe4d43fc8..69151389e1 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/richtext/richeditctrl.cpp +// Name: src/richtext/richtextctrl.cpp // Purpose: A rich edit control // Author: Julian Smart // Modified by: // Created: 2005-09-30 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,29 +34,40 @@ #include "wx/fontenum.h" #include "wx/accel.h" +#if defined (__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) +#define wxHAVE_PRIMARY_SELECTION 1 +#else +#define wxHAVE_PRIMARY_SELECTION 0 +#endif + +#if wxUSE_CLIPBOARD && wxHAVE_PRIMARY_SELECTION +#include "wx/clipbrd.h" +#endif + // 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 ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_LEFT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_RIGHT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_LEFT_DCLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_RETURN, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_CHARACTER, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_DELETE, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_CONTENT_DELETED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLE_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_PROPERTIES_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_BUFFER_RESET, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent ); #if wxRICHTEXT_USE_OWN_CARET @@ -115,6 +125,9 @@ public: void Notify(); + bool GetRefreshEnabled() const { return m_refreshEnabled; } + void EnableRefresh(bool b) { m_refreshEnabled = b; } + protected: virtual void DoShow(); virtual void DoHide(); @@ -134,6 +147,9 @@ private: bool m_flashOn; wxRichTextCaretTimer m_timer; wxRichTextCtrl* m_richTextCtrl; + bool m_refreshEnabled; + wxPen m_caretPen; + wxBrush m_caretBrush; }; #endif @@ -230,7 +246,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va validator, name)) return false; - if (!GetFont().Ok()) + if (!GetFont().IsOk()) { SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } @@ -249,7 +265,6 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va attributes.SetLineSpacing(10); attributes.SetParagraphSpacingAfter(10); attributes.SetParagraphSpacingBefore(0); - SetBasicStyle(attributes); int margin = 5; @@ -293,12 +308,12 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va // 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); + entries[0].Set(wxACCEL_CTRL, (int) 'C', wxID_COPY); + entries[1].Set(wxACCEL_CTRL, (int) 'X', wxID_CUT); + entries[2].Set(wxACCEL_CTRL, (int) 'V', wxID_PASTE); + entries[3].Set(wxACCEL_CTRL, (int) 'A', wxID_SELECTALL); + entries[4].Set(wxACCEL_CTRL, (int) 'Z', wxID_UNDO); + entries[5].Set(wxACCEL_CTRL, (int) 'Y', wxID_REDO); wxAcceleratorTable accel(6, entries); SetAcceleratorTable(accel); @@ -316,6 +331,10 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va m_contextMenu->AppendSeparator(); m_contextMenu->Append(wxID_RICHTEXT_PROPERTIES1, _("&Properties")); +#if wxUSE_DRAG_AND_DROP + SetDropTarget(new wxRichTextDropTarget(this)); +#endif + return true; } @@ -337,14 +356,20 @@ void wxRichTextCtrl::Init() m_selectionAnchorObject = NULL; m_selectionState = wxRichTextCtrlSelectionState_Normal; m_editable = true; + m_useVirtualAttributes = false; + m_verticalScrollbarEnabled = true; m_caretAtLineStart = false; m_dragging = false; +#if wxUSE_DRAG_AND_DROP + m_preDrag = false; +#endif m_fullLayoutRequired = false; m_fullLayoutTime = 0; m_fullLayoutSavedPosition = 0; m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD; m_caretPositionForDefaultStyle = -2; m_focusObject = & m_buffer; + m_scale = 1.0; } void wxRichTextCtrl::DoThaw() @@ -393,6 +418,11 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) #if !wxRICHTEXT_USE_OWN_CARET if (GetCaret() && !IsFrozen()) GetCaret()->Hide(); +#else + // Stop the caret refreshing the control from within the + // paint handler + if (GetCaret()) + ((wxRichTextCaret*) GetCaret())->EnableRefresh(false); #endif { @@ -409,35 +439,45 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetFont(GetFont()); - // Paint the background - PaintBackground(dc); - - // wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize()); - wxRect drawingArea(GetUpdateRegion().GetBox()); - drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition())); + drawingArea.SetPosition(GetUnscaledPoint(GetLogicalPoint(drawingArea.GetPosition()))); + drawingArea.SetSize(GetUnscaledSize(drawingArea.GetSize())); - wxRect availableSpace(GetClientSize()); + wxRect availableSpace(GetUnscaledSize(GetClientSize())); + wxRichTextDrawingContext context(& GetBuffer()); if (GetBuffer().IsDirty()) { - GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); + dc.SetUserScale(GetScale(), GetScale()); + + GetBuffer().Layout(dc, context, availableSpace, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); GetBuffer().Invalidate(wxRICHTEXT_NONE); + + dc.SetUserScale(1.0, 1.0); + SetupScrollbars(); } + // Paint the background + PaintBackground(dc); + wxRect clipRect(availableSpace); clipRect.x += GetBuffer().GetLeftMargin(); clipRect.y += GetBuffer().GetTopMargin(); clipRect.width -= (GetBuffer().GetLeftMargin() + GetBuffer().GetRightMargin()); clipRect.height -= (GetBuffer().GetTopMargin() + GetBuffer().GetBottomMargin()); + + clipRect = GetScaledRect(clipRect); 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.SetUserScale(GetScale(), GetScale()); + + GetBuffer().Draw(dc, context, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags); dc.DestroyClippingRegion(); @@ -447,15 +487,21 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) #if wxRICHTEXT_USE_OWN_CARET if (GetCaret()->IsVisible()) { + PositionCaret(); ((wxRichTextCaret*) GetCaret())->DoDraw(& dc); } #endif + + dc.SetUserScale(1.0, 1.0); } #if !wxRICHTEXT_USE_OWN_CARET if (GetCaret()) GetCaret()->Show(); PositionCaret(); +#else + if (GetCaret()) + ((wxRichTextCaret*) GetCaret())->EnableRefresh(true); #endif } @@ -542,7 +588,28 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) long position = 0; wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position, & hitObj, & contextObj); + wxRichTextDrawingContext context(& GetBuffer()); + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(event.GetLogicalPosition(dc)), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); + +#if wxUSE_DRAG_AND_DROP + // If there's no selection, or we're not inside it, this isn't an attempt to initiate Drag'n'Drop + if (IsEditable() && HasSelection() && GetSelectionRange().ToInternal().Contains(position)) + { + // This might be an attempt at initiating Drag'n'Drop. So set the time & flags + m_preDrag = true; + m_dragStartPoint = event.GetPosition(); // No need to worry about logical positions etc, we only care about the distance from the original pt + +#if wxUSE_DATETIME + m_dragStartTime = wxDateTime::UNow(); +#endif // wxUSE_DATETIME + + // Preserve behaviour of clicking on an object within the selection + if (hit != wxRICHTEXT_HITTEST_NONE && hitObj) + m_dragging = true; + + return; // Don't skip the event, else the selection will be lost + } +#endif // wxUSE_DRAG_AND_DROP if (hit != wxRICHTEXT_HITTEST_NONE && hitObj) { @@ -553,7 +620,6 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) SetFocusObject(container, false /* don't set caret position yet */); } - m_dragStart = event.GetLogicalPosition(dc); m_dragging = true; CaptureMouse(); @@ -563,12 +629,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) // For now, don't handle shift-click when we're selecting multiple objects. if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal) - { - if (!m_selection.IsValid()) - ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); - else - ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); - } + ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); else SelectNone(); } @@ -594,13 +655,44 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) wxPoint logicalPt = event.GetLogicalPosition(dc); wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; + wxRichTextDrawingContext context(& GetBuffer()); // 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); + int hit = GetFocusObject()->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_HONOUR_ATOMIC); + +#if wxUSE_DRAG_AND_DROP + if (m_preDrag) + { + // Preserve the behaviour that would have happened without drag-and-drop detection, in OnLeftClick + m_preDrag = false; // Tell DnD not to happen now: we are processing Left Up ourselves. + + // Do the actions that would have been done in OnLeftClick if we hadn't tried to drag + long position = 0; + wxRichTextObject* hitObj = NULL; + wxRichTextObject* contextObj = NULL; + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(event.GetLogicalPosition(dc)), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); + wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject(); + wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + if (container && container != GetFocusObject() && container->AcceptsFocus()) + { + SetFocusObject(container, false /* don't set caret position yet */); + } + + long oldCaretPos = m_caretPosition; + + SetCaretPositionAfterClick(container, position, hit); + + // For now, don't handle shift-click when we're selecting multiple objects. + if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal) + ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); + else + SelectNone(); + } +#endif if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE)) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, + wxEVT_RICHTEXT_LEFT_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(position); @@ -639,11 +731,109 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) } } } + +#if wxUSE_DRAG_AND_DROP + m_preDrag = false; +#endif // wxUSE_DRAG_AND_DROP + +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ && wxHAVE_PRIMARY_SELECTION + if (HasSelection() && GetFocusObject() && GetFocusObject()->GetBuffer()) + { + // Put the selection in PRIMARY, if it exists + wxTheClipboard->UsePrimarySelection(true); + + wxRichTextRange range = GetInternalSelectionRange(); + GetFocusObject()->GetBuffer()->CopyToClipboard(range); + + wxTheClipboard->UsePrimarySelection(false); + } +#endif } -/// Left-click +/// Mouse-movements void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) { + if (!event.Dragging() && m_dragging) + { + // We may have accidentally lost a mouse-up event, especially on Linux + m_dragging = false; + if (GetCapture() == this) + ReleaseMouse(); + } + +#if wxUSE_DRAG_AND_DROP + size_t distance = 0; + if (m_preDrag || m_dragging) + { + int x = m_dragStartPoint.x - event.GetPosition().x; + int y = m_dragStartPoint.y - event.GetPosition().y; + distance = abs(x) + abs(y); + } + + // See if we're starting Drag'n'Drop + if (m_preDrag) + { +#if wxUSE_DATETIME + wxTimeSpan diff = wxDateTime::UNow() - m_dragStartTime; +#endif + if ((distance > 10) +#if wxUSE_DATETIME + && (diff.GetMilliseconds() > 100) +#endif + ) + { + m_dragging = false; + + // Start drag'n'drop + wxRichTextRange range = GetInternalSelectionRange(); + if (range == wxRICHTEXT_NONE) + { + // Don't try to drag an empty range + m_preDrag = false; + return; + } + + // Cache the current situation, to be restored if Drag'n'Drop is cancelled + long oldPos = GetCaretPosition(); + wxRichTextParagraphLayoutBox* oldFocus = GetFocusObject(); + + wxDataObjectComposite* compositeObject = new wxDataObjectComposite(); + wxString text = GetFocusObject()->GetTextForRange(range); +#ifdef __WXMSW__ + text = wxTextFile::Translate(text, wxTextFileType_Dos); +#endif + compositeObject->Add(new wxTextDataObject(text), false /* not preferred */); + + wxRichTextBuffer* richTextBuf = new wxRichTextBuffer; + GetFocusObject()->CopyFragment(range, *richTextBuf); + compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */); + + wxRichTextDropSource source(*compositeObject, this); + // Use wxDrag_DefaultMove, not because it's the likelier choice but because pressing Ctrl for Copy obeys the principle of least surprise + // The alternative, wxDrag_DefaultCopy, requires the user to know that Move needs the Shift key pressed + BeginBatchUndo(_("Drag")); + switch (source.DoDragDrop(wxDrag_AllowMove | wxDrag_DefaultMove)) + { + case wxDragMove: + case wxDragCopy: break; + + case wxDragError: + wxLogError(wxT("An error occurred during drag and drop operation")); + case wxDragNone: + case wxDragCancel: + Refresh(); // This is needed in wxMSW, otherwise resetting the position doesn't 'take' + SetCaretPosition(oldPos); + SetFocusObject(oldFocus, false); + default: break; + } + EndBatchUndo(); + + m_preDrag = false; + return; + } + } +#endif // wxUSE_DRAG_AND_DROP + wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); @@ -663,7 +853,8 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) flags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS; container = GetFocusObject(); } - int hit = container->HitTest(dc, logicalPt, position, & hitObj, & contextObj, flags); + wxRichTextDrawingContext context(& GetBuffer()); + int hit = container->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, flags); // See if we need to change the cursor @@ -671,18 +862,8 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj) { 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); - } - } + if (actualContainer) + ProcessMouseMovement(actualContainer, hitObj, position, logicalPt); } else SetCursor(m_textCursor); @@ -694,7 +875,12 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) return; } - if (m_dragging) + if (m_dragging +#if wxUSE_DRAG_AND_DROP + && !m_preDrag + && (distance > 4) +#endif + ) { wxRichTextParagraphLayoutBox* commonAncestor = NULL; wxRichTextParagraphLayoutBox* otherContainer = NULL; @@ -703,7 +889,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) // Check for dragging across multiple containers long position2 = 0; wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL; - int hit2 = GetBuffer().HitTest(dc, logicalPt, position2, & hitObj2, & contextObj2, 0); + int hit2 = GetBuffer().HitTest(dc, context, GetUnscaledPoint(logicalPt), position2, & hitObj2, & contextObj2, 0); if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2) { // See if we can find a common ancestor @@ -767,9 +953,13 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) } } - if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal) + if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal +#if wxUSE_DRAG_AND_DROP + && !m_preDrag + && (distance > 4) +#endif + ) { - // TODO: test closeness SetCaretPositionAfterClick(container, position, hit, true /* extend selection */); } } @@ -787,7 +977,8 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) wxPoint logicalPt = event.GetLogicalPosition(dc); wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj); + wxRichTextDrawingContext context(& GetBuffer()); + int hit = GetFocusObject()->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); if (hitObj && hitObj->GetContainer() != GetFocusObject()) { @@ -800,7 +991,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) } wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, + wxEVT_RICHTEXT_RIGHT_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(position); @@ -815,7 +1006,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event)) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, + wxEVT_RICHTEXT_LEFT_DCLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -831,7 +1022,7 @@ void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event)) void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, + wxEVT_RICHTEXT_MIDDLE_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -839,6 +1030,13 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event) if (!GetEventHandler()->ProcessEvent(cmdEvent)) event.Skip(); + +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ && wxHAVE_PRIMARY_SELECTION + // Paste any PRIMARY selection, if it exists + wxTheClipboard->UsePrimarySelection(true); + Paste(); + wxTheClipboard->UsePrimarySelection(false); +#endif } /// Key press @@ -942,53 +1140,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) // Must process this before translation, otherwise it's translated into a WXK_DELETE event. if (event.CmdDown() && 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(); - - 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(); + if (!ProcessBackKey(event, flags)) + return; } else event.Skip(); @@ -1006,22 +1159,38 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) if (event.GetKeyCode() == WXK_RETURN) { - BeginBatchUndo(_("Insert Text")); + if (!CanInsertContent(* GetFocusObject(), m_caretPosition+1)) + return; long newPos = m_caretPosition; + if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) + { + return; + } + + BeginBatchUndo(_("Insert Text")); + DeleteSelectedContent(& newPos); if (event.ShiftDown()) { wxString text; text = wxRichTextLineBreakChar; - GetFocusObject()->InsertTextWithUndo(newPos+1, text, this, & GetBuffer()); + GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, text, this); m_caretAtLineStart = true; PositionCaret(); } else - GetFocusObject()->InsertNewlineWithUndo(newPos+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE); + GetFocusObject()->InsertNewlineWithUndo(& GetBuffer(), newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE); + + // Automatically renumber list + bool isNumberedList = false; + wxRichTextRange numberedListRange = FindRangeForList(newPos+1, isNumberedList); + if (isNumberedList && numberedListRange != wxRichTextRange(-1, -1)) + { + NumberList(numberedListRange, NULL, wxRICHTEXT_SETSTYLE_RENUMBER|wxRICHTEXT_SETSTYLE_WITH_UNDO); + } EndBatchUndo(); SetDefaultStyleToCursorStyle(); @@ -1029,7 +1198,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) ScrollIntoView(m_caretPosition, WXK_RIGHT); wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_RETURN, + wxEVT_RICHTEXT_RETURN, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); @@ -1039,7 +1208,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) if (!GetEventHandler()->ProcessEvent(cmdEvent)) { // Generate conventional event - wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId()); + wxCommandEvent textEvent(wxEVT_TEXT_ENTER, GetId()); InitCommandEvent(textEvent); GetEventHandler()->ProcessEvent(textEvent); @@ -1048,62 +1217,25 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } else if (event.GetKeyCode() == WXK_BACK) { - BeginBatchUndo(_("Delete Text")); - + ProcessBackKey(event, flags); + } + else if (event.GetKeyCode() == WXK_DELETE) + { 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(); - - if (GetLastPosition() == -1) + if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) { - GetFocusObject()->Reset(); - - m_caretPosition = -1; - PositionCaret(); - SetDefaultStyleToCursorStyle(); + return; } - 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); + int deletions = 0; + if (processed) + deletions ++; + // Submit range in character positions, which are greater than caret positions, if (newPos < GetFocusObject()->GetOwnRange().GetEnd()+1) { @@ -1112,13 +1244,25 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) long pos = wxRichTextCtrl::FindNextWordPosition(1); if (pos != -1 && (pos > newPos)) { - GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, pos), this, & GetBuffer()); + wxRichTextRange range(newPos+1, pos); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } processed = true; } } if (!processed && newPos < (GetLastPosition()-1)) - GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, newPos+1), this, & GetBuffer()); + { + wxRichTextRange range(newPos+1, newPos+1); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } + } } EndBatchUndo(); @@ -1132,14 +1276,19 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) 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); + ScrollIntoView(m_caretPosition, WXK_LEFT); + + // Always send this event; wxEVT_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion. + { + wxRichTextEvent cmdEvent( + wxEVT_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + } Update(); } @@ -1168,7 +1317,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_CHARACTER, + wxEVT_RICHTEXT_CHARACTER, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); @@ -1204,6 +1353,12 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } } + if (!CanInsertContent(* GetFocusObject(), m_caretPosition+1)) + return; + + if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) + return; + BeginBatchUndo(_("Insert Text")); long newPos = m_caretPosition; @@ -1214,13 +1369,14 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) #else wxString str = (wxChar) event.GetKeyCode(); #endif - GetFocusObject()->InsertTextWithUndo(newPos+1, str, this, & GetBuffer(), 0); + GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, str, this, 0); EndBatchUndo(); SetDefaultStyleToCursorStyle(); ScrollIntoView(m_caretPosition, WXK_RIGHT); + cmdEvent.SetPosition(m_caretPosition); GetEventHandler()->ProcessEvent(cmdEvent); Update(); @@ -1229,39 +1385,174 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } } -/// Delete content if there is a selection, e.g. when pressing a key. -bool wxRichTextCtrl::DeleteSelectedContent(long* newPos) +bool wxRichTextCtrl::ProcessMouseMovement(wxRichTextParagraphLayoutBox* container, wxRichTextObject* WXUNUSED(obj), long position, const wxPoint& WXUNUSED(pos)) { - if (HasSelection()) + wxRichTextAttr attr; + if (container && GetStyle(position, attr, container)) { - 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; + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_urlCursor); + } + else if (!attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_textCursor); + } return true; } else return false; } -/// Keyboard navigation +// Processes the back key +bool wxRichTextCtrl::ProcessBackKey(wxKeyEvent& event, int flags) +{ + if (!IsEditable()) + { + return false; + } -/* + if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) + { + return false; + } -Left: left one character -Right: right one character -Up: up one line + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true); + + // If we're at the start of a list item with a bullet, let's 'delete' the bullet, i.e. + // make it a continuation paragraph. + if (!HasSelection() && para && ((m_caretPosition+1) == para->GetRange().GetStart()) && + para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION) == 0) + { + wxRichTextParagraph* newPara = wxDynamicCast(para->Clone(), wxRichTextParagraph); + newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle() | wxTEXT_ATTR_BULLET_STYLE_CONTINUATION); + + wxRichTextAction* action = new wxRichTextAction(NULL, _("Remove Bullet"), wxRICHTEXT_CHANGE_STYLE, & GetBuffer(), GetFocusObject(), this); + action->SetRange(newPara->GetRange()); + action->SetPosition(GetCaretPosition()); + action->GetNewParagraphs().AppendChild(newPara); + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + + GetBuffer().Invalidate(para->GetRange()); + GetBuffer().SubmitAction(action); + + // Automatically renumber list + bool isNumberedList = false; + wxRichTextRange numberedListRange = FindRangeForList(m_caretPosition, isNumberedList); + if (isNumberedList && numberedListRange != wxRichTextRange(-1, -1)) + { + NumberList(numberedListRange, NULL, wxRICHTEXT_SETSTYLE_RENUMBER|wxRICHTEXT_SETSTYLE_WITH_UNDO); + } + + Update(); + } + else + { + BeginBatchUndo(_("Delete Text")); + + long newPos = m_caretPosition; + + bool processed = DeleteSelectedContent(& newPos); + + int deletions = 0; + if (processed) + deletions ++; + + // 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) + { + wxRichTextRange range(pos+1, newPos); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } + processed = true; + } + } + + if (!processed) + { + wxRichTextRange range(newPos, newPos); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } + } + } + + EndBatchUndo(); + + if (GetLastPosition() == -1) + { + GetFocusObject()->Reset(); + + m_caretPosition = -1; + PositionCaret(); + SetDefaultStyleToCursorStyle(); + } + + ScrollIntoView(m_caretPosition, WXK_LEFT); + + // Always send this event; wxEVT_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion. + { + wxRichTextEvent cmdEvent( + wxEVT_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + } + + Update(); + } + + return true; +} + +/// Delete content if there is a selection, e.g. when pressing a key. +bool wxRichTextCtrl::DeleteSelectedContent(long* newPos) +{ + if (HasSelection()) + { + 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; + return true; + } + else + return false; +} + +/// Keyboard navigation + +/* + +Left: left one character +Right: right one character +Up: up one line Down: down one line Ctrl-Left: left one word Ctrl-Right: right one word @@ -1429,7 +1720,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) if (ppuY != 0) syUnits = sy/ppuY; - wxRect rect = line->GetRect(); + wxRect rect = GetScaledRect(line->GetRect()); bool scrolled = false; @@ -1442,14 +1733,13 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) wxRichTextObject::GetTotalMargin(dc, & GetBuffer(), GetBuffer().GetAttributes(), leftMargin, rightMargin, topMargin, bottomMargin); } -// clientSize.y -= GetBuffer().GetBottomMargin(); - clientSize.y -= bottomMargin; + clientSize.y -= (int) (0.5 + bottomMargin * GetScale()); 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 (y >= 0 && (y + clientSize.y) < (int) (0.5 + GetBuffer().GetCachedSize().y * GetScale())) { if (startYUnits != yUnits) { @@ -1488,11 +1778,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) scrolled = true; } } - else if (rect.y < (startY + GetBuffer().GetTopMargin())) + else if (rect.y < (startY + (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()))) { // Make it scroll so this item is at the top // of the window - int y = rect.y - GetBuffer().GetTopMargin(); + int y = rect.y - (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); if (startYUnits != yUnits) @@ -1508,11 +1798,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME || keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP ) { - if (rect.y < (startY + GetBuffer().GetBottomMargin())) + if (rect.y < (startY + (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale()))) { // Make it scroll so this item is at the top // of the window - int y = rect.y - GetBuffer().GetTopMargin(); + int y = rect.y - (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); if (startYUnits != yUnits) @@ -1564,11 +1854,12 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const startX = 0; startY = startY * ppuY; - wxRect rect = line->GetRect(); + wxRect rect = GetScaledRect(line->GetRect()); wxSize clientSize = GetClientSize(); - clientSize.y -= GetBuffer().GetBottomMargin(); + clientSize.y -= (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale()); - return (rect.GetBottom() > (startY + GetBuffer().GetTopMargin())) && (rect.GetTop() < (startY + clientSize.y)); + return (rect.GetTop() >= (startY + (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()))) && + (rect.GetBottom() <= (startY + clientSize.y)); } void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) @@ -1691,7 +1982,7 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags) // we want to adjust the caret position such that it is positioned at the // start of the next line, rather than jumping past the first character of the // line. - if (noPositions == 1 && !extendSel) + if (noPositions == 1) MoveCaretForward(oldPos); else SetCaretPosition(newPos); @@ -1718,7 +2009,7 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags) if (!extendSel) SelectNone(); - if (noPositions == 1 && !extendSel) + if (noPositions == 1) MoveCaretBack(oldPos); else SetCaretPosition(newPos); @@ -1799,8 +2090,9 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) } wxRichTextParagraphLayoutBox* container = GetFocusObject(); - int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS; + int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS|wxRICHTEXT_HITTEST_HONOUR_ATOMIC; + bool lineIsEmpty = false; if (notInThisObject) { // If we know we're navigating out of the current object, @@ -1821,7 +2113,11 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) { wxRichTextLine* lineObj = GetFocusObject()->GetLineForVisibleLineNumber(newLine); if (lineObj) + { pt.y = lineObj->GetAbsolutePosition().y + 2; + if (lineObj->GetRange().GetStart() == lineObj->GetRange().GetEnd()) + lineIsEmpty = true; + } else return false; } @@ -1833,7 +2129,8 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - int hitTest = container->HitTest(dc, pt, newPos, & hitObj, & contextObj, hitTestFlags); + wxRichTextDrawingContext context(& GetBuffer()); + int hitTest = container->HitTest(dc, context, pt, newPos, & hitObj, & contextObj, hitTestFlags); if (hitObj && ((hitTest & wxRICHTEXT_HITTEST_NONE) == 0) && @@ -1852,6 +2149,15 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) } bool caretLineStart = true; + + // If the line is empty, there is only one possible position for the caret, + // so force the 'before' state so FindCaretPositionForCharacterPosition doesn't + // just return the same position. + if (lineIsEmpty) + { + hitTest &= ~wxRICHTEXT_HITTEST_AFTER; + hitTest |= wxRICHTEXT_HITTEST_BEFORE; + } long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart); long newSelEnd = caretPosition; bool extendSel; @@ -1906,7 +2212,7 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags) if (!extendSel) SelectNone(); - SetCaretPosition(newPos); + SetCaretPosition(newPos, true); PositionCaret(); SetDefaultStyleToCursorStyle(); @@ -2047,7 +2353,7 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags) static bool wxRichTextCtrlIsWhitespace(const wxString& str) { - return str == wxT(" ") || str == wxT("\t"); + return str == wxT(" ") || str == wxT("\t") || (!str.empty() && (str[0] == (wxChar) 160)); } // Finds the caret position for the next word @@ -2203,6 +2509,19 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event) 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) @@ -2258,7 +2577,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) if (IsFrozen()) return; - if (GetBuffer().IsEmpty()) + if (GetBuffer().IsEmpty() || !m_verticalScrollbarEnabled) { SetScrollbars(0, 0, 0, 0, 0, 0); return; @@ -2269,7 +2588,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) int pixelsPerUnit = 5; wxSize clientSize = GetClientSize(); - int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin(); + int maxHeight = (int) (0.5 + GetScale() * (GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin())); // Round up so we have at least maxHeight pixels int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5); @@ -2309,7 +2628,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) void wxRichTextCtrl::PaintBackground(wxDC& dc) { wxColour backgroundColour = GetBackgroundColour(); - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); // Clear the background @@ -2336,18 +2655,20 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) 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 // ---------------------------------------------------------------------------- - +#if wxUSE_FFILE && wxUSE_STREAMS bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType) { + SetFocusObject(& GetBuffer(), true); + bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType); if (success) m_filename = filename; @@ -2385,6 +2706,7 @@ bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType) return false; } +#endif // wxUSE_FFILE && wxUSE_STREAMS // ---------------------------------------------------------------------------- // wxRichTextCtrl specific functionality @@ -2412,11 +2734,6 @@ wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image) // selection and ranges // ---------------------------------------------------------------------------- -void wxRichTextCtrl::SelectAll() -{ - SetSelection(-1, -1); -} - /// Select none void wxRichTextCtrl::SelectNone() { @@ -2534,7 +2851,8 @@ wxRichTextCtrl::HitTest(const wxPoint& pt, wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS); + wxRichTextDrawingContext context((wxRichTextBuffer*) & GetBuffer()); + int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, context, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS); if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE)) return wxTE_HT_BEFORE; @@ -2546,6 +2864,24 @@ wxRichTextCtrl::HitTest(const wxPoint& pt, return wxTE_HT_UNKNOWN; } +wxRichTextParagraphLayoutBox* +wxRichTextCtrl::FindContainerAtPoint(const wxPoint pt, long& position, int& hit, wxRichTextObject* hitObj, int flags/* = 0*/) +{ + wxClientDC dc(this); + PrepareDC(dc); + dc.SetFont(GetFont()); + + wxPoint logicalPt = GetLogicalPoint(pt); + + wxRichTextObject* contextObj = NULL; + wxRichTextDrawingContext context(& GetBuffer()); + hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(logicalPt), position, &hitObj, &contextObj, flags); + wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); + + return container; +} + + // ---------------------------------------------------------------------------- // set/get the controls text // ---------------------------------------------------------------------------- @@ -2607,7 +2943,9 @@ void wxRichTextCtrl::DoWriteText(const wxString& value, int flags) { wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix); - GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, valueUnix, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + wxRichTextDrawingContext context(& GetBuffer()); + GetBuffer().Defragment(context); if ( flags & SetValue_SendEvent ) wxTextCtrl::SendTextUpdatedEvent(this); @@ -2645,17 +2983,17 @@ bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapTyp bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wxRichTextAttr& textAttr) { - return GetFocusObject()->InsertImageWithUndo(m_caretPosition+1, imageBlock, this, & GetBuffer(), 0, textAttr); + return GetFocusObject()->InsertImageWithUndo(& GetBuffer(), m_caretPosition+1, imageBlock, this, 0, textAttr); } 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)) + if (image.IsOk() && imageBlock.MakeImageBlock(image, bitmapType)) return WriteImage(imageBlock, textAttr); } @@ -2673,11 +3011,18 @@ wxRichTextBox* wxRichTextCtrl::WriteTextBox(const wxRichTextAttr& textAttr) // 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); + wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(& GetBuffer(), m_caretPosition+1, textBox, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); wxRichTextBox* box = wxDynamicCast(obj, wxRichTextBox); return box; } +wxRichTextField* wxRichTextCtrl::WriteField(const wxString& fieldType, const wxRichTextProperties& properties, + const wxRichTextAttr& textAttr) +{ + return GetFocusObject()->InsertFieldWithUndo(& GetBuffer(), m_caretPosition+1, fieldType, properties, + this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE, textAttr); +} + // Write a table at the current insertion point, returning the table. wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr, const wxRichTextAttr& cellAttr) { @@ -2705,7 +3050,7 @@ wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichText // 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); + wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(& GetBuffer(), m_caretPosition+1, table, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); wxRichTextTable* tableResult = wxDynamicCast(obj, wxRichTextTable); return tableResult; } @@ -2714,7 +3059,7 @@ wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichText /// Insert a newline (actually paragraph) at the current insertion point. bool wxRichTextCtrl::Newline() { - return GetFocusObject()->InsertNewlineWithUndo(m_caretPosition+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + return GetFocusObject()->InsertNewlineWithUndo(& GetBuffer(), m_caretPosition+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); } /// Insert a line break at the current insertion point. @@ -2722,7 +3067,7 @@ bool wxRichTextCtrl::LineBreak() { wxString text; text = wxRichTextLineBreakChar; - return GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, text, this, & GetBuffer()); + return GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, text, this); } // ---------------------------------------------------------------------------- @@ -2792,12 +3137,12 @@ bool wxRichTextCtrl::CanCopy() const bool wxRichTextCtrl::CanCut() const { - return HasSelection() && IsEditable(); + return CanDeleteSelection(); } bool wxRichTextCtrl::CanPaste() const { - if ( !IsEditable() ) + if ( !IsEditable() || !GetFocusObject() || !CanInsertContent(* GetFocusObject(), m_caretPosition+1)) return false; return GetBuffer().CanPasteFromClipboard(); @@ -2805,7 +3150,7 @@ bool wxRichTextCtrl::CanPaste() const bool wxRichTextCtrl::CanDeleteSelection() const { - return HasSelection() && IsEditable(); + return HasSelection() && IsEditable() && CanDeleteRange(* GetFocusObject(), GetSelectionRange()); } @@ -2830,6 +3175,7 @@ void wxRichTextCtrl::SetInsertionPoint(long pos) SelectNone(); m_caretPosition = pos - 1; + m_caretAtLineStart = true; PositionCaret(); @@ -2911,14 +3257,21 @@ void wxRichTextCtrl::SetSelection(long from, long to) // Editing // ---------------------------------------------------------------------------- -void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to), +void wxRichTextCtrl::Replace(long from, long to, const wxString& value) { BeginBatchUndo(_("Replace")); + SetSelection(from, to); + + wxRichTextAttr attr(GetDefaultStyle()); + DeleteSelectedContent(); - DoWriteText(value, SetValue_SelectionOnly); + SetDefaultStyle(attr); + + if (!value.IsEmpty()) + DoWriteText(value, SetValue_SelectionOnly); EndBatchUndo(); } @@ -3127,8 +3480,8 @@ void wxRichTextCtrl::OnProperties(wxCommandEvent& event) if (idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount()) { wxRichTextObject* obj = m_contextMenuPropertiesInfo.GetObject(idx); - if (obj && obj->CanEditProperties()) - obj->EditProperties(this, & GetBuffer()); + if (obj && CanEditProperties(obj)) + EditProperties(obj, this); m_contextMenuPropertiesInfo.Clear(); } @@ -3148,45 +3501,98 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event) return; } + ShowContextMenu(m_contextMenu, event.GetPosition()); +} + +// Prepares the context menu, adding appropriate property-editing commands. +// Returns the number of property commands added. +int wxRichTextCtrl::PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands) +{ wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); + m_contextMenuPropertiesInfo.Clear(); + 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); + if (pt != wxDefaultPosition) + { + wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt)); + wxRichTextDrawingContext context(& GetBuffer()); + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(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); + } - if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER) + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddItems(this, actualContainer, hitObj); + } + else + { + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL); + } + } + else + { + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL); + } + } + else { + // Invoked from the keyboard, so don't set the caret position and don't use the event + // position + hitObj = GetFocusObject()->GetLeafObjectAtPosition(m_caretPosition+1); + if (hitObj) + contextObj = hitObj->GetParentContainer(); + else + contextObj = GetFocusObject(); + 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); + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddItems(this, actualContainer, hitObj); } else - m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL); + { + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL); + } } - else + + if (menu) { - m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL); + if (addPropertyCommands) + m_contextMenuPropertiesInfo.AddMenuItems(menu); + return m_contextMenuPropertiesInfo.GetCount(); } + else + return 0; +} - if (m_contextMenu) +// Shows the context menu, adding appropriate property-editing commands +bool wxRichTextCtrl::ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands) +{ + if (menu) { - m_contextMenuPropertiesInfo.AddMenuItems(m_contextMenu); - PopupMenu(m_contextMenu); + PrepareContextMenu(menu, pt, addPropertyCommands); + PopupMenu(menu); + return true; } + else + return false; } bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) @@ -3209,9 +3615,9 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr return GetFocusObject()->SetStyle(range.ToInternal(), style); } -void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr) +void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags) { - GetFocusObject()->SetStyle(obj, textAttr); + GetFocusObject()->SetStyle(obj, textAttr, flags); } // extended style setting operation with flags including: @@ -3304,6 +3710,11 @@ bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style, wx return container->GetUncombinedStyle(position, style); } +bool wxRichTextCtrl::SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags) +{ + return GetFocusObject()->SetProperties(range.ToInternal(), properties, flags); +} + /// Set font, and also the buffer attributes bool wxRichTextCtrl::SetFont(const wxFont& font) { @@ -3348,6 +3759,11 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) wxRect caretRect; if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container)) { +#if !wxRICHTEXT_USE_OWN_CARET + caretRect = GetScaledRect(caretRect); +#endif + int topMargin = (int) (0.5 + GetScale()*GetBuffer().GetTopMargin()); + int bottomMargin = (int) (0.5 + GetScale()*GetBuffer().GetBottomMargin()); wxPoint newPt = caretRect.GetPosition(); wxSize newSz = caretRect.GetSize(); wxPoint pt = GetPhysicalPoint(newPt); @@ -3357,13 +3773,26 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) if (GetCaret()->GetSize() != newSz) GetCaret()->SetSize(newSz); - 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()))) + // Adjust size so the caret size and position doesn't appear in the margins + if (((pt.y + newSz.y) <= topMargin) || (pt.y >= (GetClientSize().y - bottomMargin))) { pt.x = -200; pt.y = -200; } + else if (pt.y < topMargin && (pt.y + newSz.y) > topMargin) + { + newSz.y -= (topMargin - pt.y); + if (newSz.y > 0) + { + pt.y = topMargin; + GetCaret()->SetSize(newSz); + } + } + else if (pt.y < (GetClientSize().y - bottomMargin) && (pt.y + newSz.y) > (GetClientSize().y - bottomMargin)) + { + newSz.y = GetClientSize().y - bottomMargin - pt.y; + GetCaret()->SetSize(newSz); + } GetCaret()->Move(pt); GetCaret()->Show(); @@ -3375,9 +3804,9 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container) { wxClientDC dc(this); - dc.SetFont(GetFont()); - PrepareDC(dc); + dc.SetUserScale(GetScale(), GetScale()); + dc.SetFont(GetFont()); wxPoint pt; int height = 0; @@ -3385,7 +3814,8 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRic if (!container) container = GetFocusObject(); - if (container->FindPosition(dc, position, pt, & height, m_caretAtLineStart)) + wxRichTextDrawingContext context(& GetBuffer()); + if (container->FindPosition(dc, context, position, pt, & height, m_caretAtLineStart)) { // Caret height can't be zero if (height == 0) @@ -3447,7 +3877,7 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect) { if (GetBuffer().IsDirty() || onlyVisibleRect) { - wxRect availableSpace(GetClientSize()); + wxRect availableSpace(GetUnscaledSize(GetClientSize())); if (availableSpace.width == 0) availableSpace.width = 10; if (availableSpace.height == 0) @@ -3457,27 +3887,31 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect) if (onlyVisibleRect) { flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT; - availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0))); + availableSpace.SetPosition(GetUnscaledPoint(GetLogicalPoint(wxPoint(0, 0)))); } wxClientDC dc(this); - dc.SetFont(GetFont()); PrepareDC(dc); + dc.SetFont(GetFont()); + dc.SetUserScale(GetScale(), GetScale()); - GetBuffer().Defragment(); + wxRichTextDrawingContext context(& GetBuffer()); + GetBuffer().Defragment(context); GetBuffer().UpdateRanges(); // If items were deleted, ranges need recalculation - GetBuffer().Layout(dc, availableSpace, flags); + GetBuffer().Layout(dc, context, availableSpace, availableSpace, flags); GetBuffer().Invalidate(wxRICHTEXT_NONE); - if (!IsFrozen()) + dc.SetUserScale(1.0, 1.0); + + if (!IsFrozen() && !onlyVisibleRect) SetupScrollbars(); } return true; } -/// Is all of the selection bold? +/// Is all of the selection, or the current caret position, bold? bool wxRichTextCtrl::IsSelectionBold() { if (HasSelection()) @@ -3507,7 +3941,7 @@ bool wxRichTextCtrl::IsSelectionBold() return false; } -/// Is all of the selection italics? +/// Is all of the selection, or the current caret position, italics? bool wxRichTextCtrl::IsSelectionItalics() { if (HasSelection()) @@ -3537,7 +3971,7 @@ bool wxRichTextCtrl::IsSelectionItalics() return false; } -/// Is all of the selection underlined? +/// Is all of the selection, or the current caret position, underlined? bool wxRichTextCtrl::IsSelectionUnderlined() { if (HasSelection()) @@ -3567,6 +4001,33 @@ bool wxRichTextCtrl::IsSelectionUnderlined() return false; } +/// Does all of the selection, or the current caret position, have this wxTextAttrEffects flag(s)? +bool wxRichTextCtrl::DoesSelectionHaveTextEffectFlag(int flag) +{ + wxRichTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_EFFECTS); + attr.SetTextEffectFlags(flag); + attr.SetTextEffects(flag); + + if (HasSelection()) + { + return HasCharacterAttributes(GetSelectionRange(), attr); + } + else + { + // If no selection, then we need to combine current style with default style + // to see what the effect would be if we started typing. + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + if (GetStyle(pos, attr)) + { + if (IsDefaultStyleShowing()) + wxRichTextApplyStyle(attr, GetDefaultStyleEx()); + return (attr.GetTextEffectFlags() & flag) != 0; + } + } + return false; +} + /// Apply bold to the selection bool wxRichTextCtrl::ApplyBoldToSelection() { @@ -3621,6 +4082,28 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection() return true; } +/// Apply the wxTextAttrEffects flag(s) to the selection, or the current caret position if there's no selection +bool wxRichTextCtrl::ApplyTextEffectToSelection(int flags) +{ + wxRichTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_EFFECTS); + attr.SetTextEffectFlags(flags); + if (!DoesSelectionHaveTextEffectFlag(flags)) + attr.SetTextEffects(flags); + else + attr.SetTextEffects(attr.GetTextEffectFlags() & ~flags); + + if (HasSelection()) + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); + else + { + 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) { @@ -3661,7 +4144,7 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET; - if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition))) + if (wxDynamicCast(def, wxRichTextListStyleDefinition)) { flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; @@ -3681,7 +4164,7 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) bool isPara = false; // Make sure the attr has the style name - if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition))) + if (wxDynamicCast(def, wxRichTextParagraphStyleDefinition)) { isPara = true; attr.SetParagraphStyleName(def->GetName()); @@ -3691,10 +4174,22 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) // to change its style independently. flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; } - else + else if (wxDynamicCast(def, wxRichTextCharacterStyleDefinition)) attr.SetCharacterStyleName(def->GetName()); + else if (wxDynamicCast(def, wxRichTextBoxStyleDefinition)) + attr.GetTextBoxAttr().SetBoxStyleName(def->GetName()); - if (HasSelection()) + if (wxDynamicCast(def, wxRichTextBoxStyleDefinition)) + { + if (GetFocusObject() && (GetFocusObject() != & GetBuffer())) + { + SetStyle(GetFocusObject(), attr); + return true; + } + else + return false; + } + else if (HasSelection()) return SetStyleEx(GetSelectionRange(), attr, flags); else { @@ -3751,7 +4246,15 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle() // If at the start of a paragraph, use the next position. long pos = GetAdjustedCaretPosition(GetCaretPosition()); - if (GetUncombinedStyle(pos, attr)) + wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(pos); + if (obj && obj->IsTopLevel()) + { + // Don't use the attributes of a top-level object, since they might apply + // to content of the object, e.g. background colour. + SetDefaultStyle(wxRichTextAttr()); + return true; + } + else if (GetUncombinedStyle(pos, attr)) { SetDefaultStyle(attr); return true; @@ -3763,7 +4266,7 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle() /// Returns the first visible position in the current view long wxRichTextCtrl::GetFirstVisiblePosition() const { - wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y); + wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetUnscaledPoint(GetLogicalPoint(wxPoint(0, 0))).y); if (line) return line->GetAbsoluteRange().GetStart(); else @@ -3849,6 +4352,61 @@ bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, co return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel); } +// Given a character position at which there is a list style, find the range +// encompassing the same list style by looking backwards and forwards. +wxRichTextRange wxRichTextCtrl::FindRangeForList(long pos, bool& isNumberedList) +{ + wxRichTextParagraphLayoutBox* focusObject = GetFocusObject(); + wxRichTextRange range = wxRichTextRange(-1, -1); + wxRichTextParagraph* para = focusObject->GetParagraphAtPosition(pos); + if (!para || !para->GetAttributes().HasListStyleName()) + return range; + else + { + wxString listStyle = para->GetAttributes().GetListStyleName(); + range = para->GetRange(); + + isNumberedList = para->GetAttributes().HasBulletNumber(); + + // Search back + wxRichTextObjectList::compatibility_iterator initialNode = focusObject->GetChildren().Find(para); + if (initialNode) + { + wxRichTextObjectList::compatibility_iterator startNode = initialNode->GetPrevious(); + while (startNode) + { + wxRichTextParagraph* p = wxDynamicCast(startNode->GetData(), wxRichTextParagraph); + if (p) + { + if (!p->GetAttributes().HasListStyleName() || p->GetAttributes().GetListStyleName() != listStyle) + break; + else + range.SetStart(p->GetRange().GetStart()); + } + + startNode = startNode->GetPrevious(); + } + + // Search forward + wxRichTextObjectList::compatibility_iterator endNode = initialNode->GetNext(); + while (endNode) + { + wxRichTextParagraph* p = wxDynamicCast(endNode->GetData(), wxRichTextParagraph); + if (p) + { + if (!p->GetAttributes().HasListStyleName() || p->GetAttributes().GetListStyleName() != listStyle) + break; + else + range.SetEnd(p->GetRange().GetEnd()); + } + + endNode = endNode->GetNext(); + } + } + } + return range; +} + /// Deletes the content in the given range bool wxRichTextCtrl::Delete(const wxRichTextRange& range) { @@ -3934,8 +4492,8 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSel if (firstLine && lastLine) { wxSize clientSize = GetClientSize(); - wxPoint pt1 = GetPhysicalPoint(firstLine->GetAbsolutePosition()); - wxPoint pt2 = GetPhysicalPoint(lastLine->GetAbsolutePosition()) + wxPoint(0, lastLine->GetSize().y); + wxPoint pt1 = GetPhysicalPoint(GetScaledPoint(firstLine->GetAbsolutePosition())); + wxPoint pt2 = GetPhysicalPoint(GetScaledPoint(lastLine->GetAbsolutePosition())) + wxPoint(0, (int) (0.5 + lastLine->GetSize().y * GetScale())); pt1.x = 0; pt1.y = wxMax(0, pt1.y); @@ -3976,6 +4534,9 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC wxRichTextParagraphLayoutBox* oldContainer = GetFocusObject(); bool changingContainer = (m_focusObject != obj); + if (changingContainer && HasSelection()) + SelectNone(); + m_focusObject = obj; if (!obj) @@ -3995,7 +4556,7 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC SetDefaultStyleToCursorStyle(); wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, + wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -4007,6 +4568,185 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC return true; } +#if wxUSE_DRAG_AND_DROP +void wxRichTextCtrl::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def, wxDataObject* DataObj) +{ + m_preDrag = false; + + if ((def != wxDragCopy) && (def != wxDragMove)) + { + return; + } + + if (!GetSelection().IsValid()) + { + return; + } + + wxRichTextParagraphLayoutBox* originContainer = GetSelection().GetContainer(); + wxRichTextParagraphLayoutBox* destContainer = GetFocusObject(); // This will be the drop container, not necessarily the same as the origin one + + wxRichTextBuffer* richTextBuffer = ((wxRichTextBufferDataObject*)DataObj)->GetRichTextBuffer(); + if (richTextBuffer) + { + long position = GetCaretPosition(); + wxRichTextRange selectionrange = GetInternalSelectionRange(); + if (selectionrange.Contains(position) && (def == wxDragMove)) + { + // It doesn't make sense to move onto itself + return; + } + + // If we're moving, and the data is being moved forward, we need to drop first, then delete the selection + // If moving backwards, we need to delete then drop. If we're copying (or doing nothing) we don't delete anyway + bool DeleteAfter = (def == wxDragMove) && (position > selectionrange.GetEnd()); + if ((def == wxDragMove) && !DeleteAfter) + { + // We can't use e.g. DeleteSelectedContent() as it uses the focus container + originContainer->DeleteRangeWithUndo(selectionrange, this, &GetBuffer()); + } + + destContainer->InsertParagraphsWithUndo(&GetBuffer(), position+1, *richTextBuffer, this, 0); + ShowPosition(position + richTextBuffer->GetOwnRange().GetEnd()); + + delete richTextBuffer; + + if (DeleteAfter) + { + // We can't use e.g. DeleteSelectedContent() as it uses the focus container + originContainer->DeleteRangeWithUndo(selectionrange, this, &GetBuffer()); + } + + SelectNone(); + Refresh(); + } +} +#endif // wxUSE_DRAG_AND_DROP + + +#if wxUSE_DRAG_AND_DROP +bool wxRichTextDropSource::GiveFeedback(wxDragResult WXUNUSED(effect)) +{ + wxCHECK_MSG(m_rtc, false, wxT("NULL m_rtc")); + + long position = 0; + int hit = 0; + wxRichTextObject* hitObj = NULL; + wxRichTextParagraphLayoutBox* container = m_rtc->FindContainerAtPoint(m_rtc->GetUnscaledPoint(m_rtc->ScreenToClient(wxGetMousePosition())), position, hit, hitObj); + + if (!(hit & wxRICHTEXT_HITTEST_NONE) && container && container->AcceptsFocus()) + { + m_rtc->StoreFocusObject(container); + m_rtc->SetCaretPositionAfterClick(container, position, hit); + } + + return false; // so that the base-class sets a cursor +} +#endif // wxUSE_DRAG_AND_DROP + +bool wxRichTextCtrl::CanDeleteRange(wxRichTextParagraphLayoutBox& WXUNUSED(container), const wxRichTextRange& WXUNUSED(range)) const +{ + return true; +} + +bool wxRichTextCtrl::CanInsertContent(wxRichTextParagraphLayoutBox& WXUNUSED(container), long WXUNUSED(pos)) const +{ + return true; +} + +void wxRichTextCtrl::EnableVerticalScrollbar(bool enable) +{ + m_verticalScrollbarEnabled = enable; + SetupScrollbars(); +} + +void wxRichTextCtrl::SetFontScale(double fontScale, bool refresh) +{ + GetBuffer().SetFontScale(fontScale); + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +void wxRichTextCtrl::SetDimensionScale(double dimScale, bool refresh) +{ + GetBuffer().SetDimensionScale(dimScale); + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +// Sets an overall scale factor for displaying and editing the content. +void wxRichTextCtrl::SetScale(double scale, bool refresh) +{ + m_scale = scale; + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +// Get an unscaled point +wxPoint wxRichTextCtrl::GetUnscaledPoint(const wxPoint& pt) const +{ + if (GetScale() == 1.0) + return pt; + else + return wxPoint((int) (0.5 + double(pt.x) / GetScale()), (int) (0.5 + double(pt.y) / GetScale())); +} + +// Get a scaled point +wxPoint wxRichTextCtrl::GetScaledPoint(const wxPoint& pt) const +{ + if (GetScale() == 1.0) + return pt; + else + return wxPoint((int) (0.5 + double(pt.x) * GetScale()), (int) (0.5 + double(pt.y) * GetScale())); +} + +// Get an unscaled size +wxSize wxRichTextCtrl::GetUnscaledSize(const wxSize& sz) const +{ + if (GetScale() == 1.0) + return sz; + else + return wxSize((int) (0.5 + double(sz.x) / GetScale()), (int) (0.5 + double(sz.y) / GetScale())); +} + +// Get a scaled size +wxSize wxRichTextCtrl::GetScaledSize(const wxSize& sz) const +{ + if (GetScale() == 1.0) + return sz; + else + return wxSize((int) (0.5 + double(sz.x) * GetScale()), (int) (0.5 + double(sz.y) * GetScale())); +} + +// Get an unscaled rect +wxRect wxRichTextCtrl::GetUnscaledRect(const wxRect& rect) const +{ + if (GetScale() == 1.0) + return rect; + else + return wxRect((int) (0.5 + double(rect.x) / GetScale()), (int) (0.5 + double(rect.y) / GetScale()), + (int) (0.5 + double(rect.width) / GetScale()), (int) (0.5 + double(rect.height) / GetScale())); +} + +// Get a scaled rect +wxRect wxRichTextCtrl::GetScaledRect(const wxRect& rect) const +{ + if (GetScale() == 1.0) + return rect; + else + return wxRect((int) (0.5 + double(rect.x) * GetScale()), (int) (0.5 + double(rect.y) * GetScale()), + (int) (0.5 + double(rect.width) * GetScale()), (int) (0.5 + double(rect.height) * GetScale())); +} + #if wxRICHTEXT_USE_OWN_CARET // ---------------------------------------------------------------------------- @@ -4016,6 +4756,7 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC void wxRichTextCaret::Init() { m_hasFocus = true; + m_refreshEnabled = true; m_xOld = m_yOld = -1; @@ -4038,7 +4779,7 @@ void wxRichTextCaret::DoShow() { m_flashOn = true; - if (!m_timer.IsRunning()) + if (!m_timer.IsRunning() && GetBlinkTime() > 0) m_timer.Start(GetBlinkTime()); Refresh(); @@ -4060,10 +4801,11 @@ void wxRichTextCaret::DoMove() if (m_xOld != -1 && m_yOld != -1) { - if (m_richTextCtrl) + if (m_richTextCtrl && m_refreshEnabled) { - wxRect rect(GetPosition(), GetSize()); - m_richTextCtrl->RefreshRect(rect, false); + wxRect rect(wxPoint(m_xOld, m_yOld), GetSize()); + wxRect scaledRect = m_richTextCtrl->GetScaledRect(rect); + m_richTextCtrl->RefreshRect(scaledRect, false); } } } @@ -4111,19 +4853,25 @@ void wxRichTextCaret::OnKillFocus() void wxRichTextCaret::Refresh() { - if (m_richTextCtrl) + if (m_richTextCtrl && m_refreshEnabled) { wxRect rect(GetPosition(), GetSize()); - m_richTextCtrl->RefreshRect(rect, false); + wxRect rectScaled = m_richTextCtrl->GetScaledRect(rect); + m_richTextCtrl->RefreshRect(rectScaled, false); } } void wxRichTextCaret::DoDraw(wxDC *dc) { - dc->SetPen( *wxBLACK_PEN ); - - dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH)); - dc->SetPen(*wxBLACK_PEN); + wxBrush brush(m_caretBrush); + wxPen pen(m_caretPen); + if (m_richTextCtrl && m_richTextCtrl->GetBasicStyle().HasTextColour()) + { + brush = wxBrush(m_richTextCtrl->GetBasicStyle().GetTextColour()); + pen = wxPen(m_richTextCtrl->GetBasicStyle().GetTextColour()); + } + dc->SetBrush((m_hasFocus ? brush : *wxTRANSPARENT_BRUSH)); + dc->SetPen(pen); wxPoint pt(m_x, m_y); @@ -4165,12 +4913,11 @@ bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichT 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 none of the standard properties identifiers are in the menu, add them if necessary. + // If no items to add, just set the text to something generic + if (GetCount() == 0) { - // If no items, to add just set the text to something generic - if (GetCount() == 0) + if (item) { menu->SetLabel(startCmd, _("&Properties")); @@ -4184,50 +4931,59 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd } } } - else + } + else + { + int i; + int pos = -1; + // Find the position of the first properties item + for (i = 0; i < (int) menu->GetMenuItemCount(); i++) { - 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) { - wxMenuItem* item = menu->FindItemByPosition(i); - if (item && item->GetId() == startCmd) - { - pos = i; - break; - } + pos = i; + break; } + } - if (pos != -1) + if (pos != -1) + { + int insertBefore = pos+1; + for (i = startCmd; i < startCmd+GetCount(); i++) { - int insertBefore = pos+1; - for (i = startCmd; i < startCmd+GetCount(); i++) + if (menu->FindItem(i)) { - if (menu->FindItem(i)) - { - menu->SetLabel(i, m_labels[i - startCmd]); - } + menu->SetLabel(i, m_labels[i - startCmd]); + } + else + { + if (insertBefore >= (int) menu->GetMenuItemCount()) + menu->Append(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 ++; + 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++) + // Delete any old items still left on the menu + for (i = startCmd + GetCount(); i < startCmd+3; i++) + { + if (menu->FindItem(i)) { - if (menu->FindItem(i)) - { - menu->Delete(i); - } + menu->Delete(i); } } } + else + { + // No existing property identifiers were found, so append to the end of the menu. + menu->AppendSeparator(); + for (i = startCmd; i < startCmd+GetCount(); i++) + { + menu->Append(i, m_labels[i - startCmd]); + } + } } return GetCount(); @@ -4235,17 +4991,17 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd // 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) +int wxRichTextContextMenuPropertiesInfo::AddItems(wxRichTextCtrl* ctrl, wxRichTextObject* container, wxRichTextObject* obj) { Clear(); - if (obj && obj->CanEditProperties()) - AddItem(obj->GetPropertiesMenuLabel(), obj); + if (obj && ctrl->CanEditProperties(obj)) + AddItem(ctrl->GetPropertiesMenuLabel(obj), obj); - if (container && container != obj && container->CanEditProperties() && m_labels.Index(container->GetPropertiesMenuLabel()) == wxNOT_FOUND) - AddItem(container->GetPropertiesMenuLabel(), container); + if (container && container != obj && ctrl->CanEditProperties(container) && m_labels.Index(ctrl->GetPropertiesMenuLabel(container)) == wxNOT_FOUND) + AddItem(ctrl->GetPropertiesMenuLabel(container), container); - if (container && container->GetParent() && container->GetParent()->CanEditProperties() && m_labels.Index(container->GetParent()->GetPropertiesMenuLabel()) == wxNOT_FOUND) - AddItem(container->GetParent()->GetPropertiesMenuLabel(), container->GetParent()); + if (container && container->GetParent() && ctrl->CanEditProperties(container->GetParent()) && m_labels.Index(ctrl->GetPropertiesMenuLabel(container->GetParent())) == wxNOT_FOUND) + AddItem(ctrl->GetPropertiesMenuLabel(container->GetParent()), container->GetParent()); return GetCount(); }