#include "wx/filename.h"
#include "wx/dcbuffer.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")
-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)
+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 );
-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
-#else
-IMPLEMENT_CLASS( wxRichTextCtrl, wxScrolledWindow )
-#endif
+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 );
-IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
+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 );
-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
-#else
-BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow )
+#if wxRICHTEXT_USE_OWN_CARET
+
+/*!
+ * 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.
+ */
+
+class wxRichTextCaret: public wxCaret
+{
+public:
+ // ctors
+ // -----
+ // default - use Create()
+ wxRichTextCaret() { Init(); }
+ // creates a block caret associated with the given window
+ wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
+ : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+ wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
+ : wxCaret(window, size) { 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; }
+
+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
+
+ wxRichTextCtrl* m_richTextCtrl;
+};
#endif
+
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextCtrl, wxTextCtrlBase )
+
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )
+
+BEGIN_EVENT_TABLE( wxRichTextCtrl, wxTextCtrlBase )
EVT_PAINT(wxRichTextCtrl::OnPaint)
EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
EVT_IDLE(wxRichTextCtrl::OnIdle)
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)
* 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 wxString& value, 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, value, pos, size, style);
+ Create(parent, id, value, pos, size, style, validator, name);
}
/// Creation
-bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, 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 (!wxTextCtrlBase::Create(parent, id, pos, size,
+ style|wxFULL_REPAINT_ON_RESIZE,
+ validator, name))
return false;
-#endif
if (!GetFont().Ok())
{
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
- GetBuffer().SetRichTextCtrl(this);
+ // No physical scrolling, so we can preserve margins
+ EnableScrolling(false, false);
+
+ if (style & wxTE_READONLY)
+ SetEditable(false);
- wxTextAttrEx attributes;
+ // The base attributes must all have default values
+ wxTextAttr 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);
+
SetBasicStyle(attributes);
// The default attributes will be merged with base attributes, so
// can be empty to begin with
- wxTextAttrEx defaultAttributes;
+ wxTextAttr defaultAttributes;
SetDefaultStyle(defaultAttributes);
- SetBackgroundColour(*wxWHITE);
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+ 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
- SetBestFittingSize(size);
+ SetInitialSize(size);
+#if wxRICHTEXT_BUFFERED_PAINTING
// Create a buffer
RecreateBuffer(size);
+#endif
- SetCursor(wxCursor(wxCURSOR_IBEAM));
+ 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);
+
return true;
}
wxRichTextCtrl::~wxRichTextCtrl()
{
+ GetBuffer().RemoveEventHandler(this);
+
delete m_contextMenu;
}
/// Member initialisation
void wxRichTextCtrl::Init()
{
- m_freezeCount = 0;
m_contextMenu = NULL;
m_caret = NULL;
m_caretPosition = -1;
m_caretPositionForDefaultStyle = -2;
}
-/// Call Freeze to prevent refresh
-void wxRichTextCtrl::Freeze()
+void wxRichTextCtrl::DoThaw()
{
- m_freezeCount ++;
-}
-
-/// Call Thaw to refresh
-void wxRichTextCtrl::Thaw()
-{
- m_freezeCount --;
-
- if (m_freezeCount == 0)
- {
+ if (GetBuffer().GetDirty())
+ LayoutContent();
+ else
SetupScrollbars();
- Refresh(false);
- }
+
+ wxWindow::DoThaw();
}
/// Clear all text
void wxRichTextCtrl::Clear()
{
- m_buffer.Reset();
+ m_buffer.ResetAndClearCommands();
m_buffer.SetDirty(true);
m_caretPosition = -1;
m_caretPositionForDefaultStyle = -2;
m_caretAtLineStart = false;
m_selectionRange.SetRange(-2, -2);
- SetScrollbars(0, 0, 0, 0, 0, 0);
+ Scroll(0,0);
- if (m_freezeCount == 0)
+ if (!IsFrozen())
{
- SetupScrollbars();
+ LayoutContent();
Refresh(false);
}
- SendUpdateEvent();
+
+ wxTextCtrl::SendTextUpdatedEvent(this);
}
/// Painting
void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
{
- if (GetCaret())
+#if !wxRICHTEXT_USE_OWN_CARET
+ if (GetCaret() && !IsFrozen())
GetCaret()->Hide();
+#endif
{
+#if wxRICHTEXT_BUFFERED_PAINTING
wxBufferedPaintDC dc(this, m_bufferBitmap);
- //wxLogDebug(wxT("OnPaint"));
-
- PrepareDC(dc);
+#else
+ wxPaintDC dc(this);
+#endif
- if (m_freezeCount > 0)
+ if (IsFrozen())
return;
+ PrepareDC(dc);
+
dc.SetFont(GetFont());
// Paint the background
PaintBackground(dc);
- wxRegion dirtyRegion = GetUpdateRegion();
+ // wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
+
+ wxRect drawingArea(GetUpdateRegion().GetBox());
+ drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition()));
- wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
wxRect availableSpace(GetClientSize());
if (GetBuffer().GetDirty())
{
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);
+
GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
+
+ dc.DestroyClippingRegion();
+
+#if wxRICHTEXT_USE_OWN_CARET
+ if (GetCaret()->IsVisible())
+ {
+ ((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
+ }
+#endif
}
+#if !wxRICHTEXT_USE_OWN_CARET
if (GetCaret())
GetCaret()->Show();
-
PositionCaret();
+#endif
}
// Empty implementation, to prevent flicker
void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
{
- wxCaret* caret = new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16);
- SetCaret(caret);
- caret->Show();
- PositionCaret();
+ 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(false);
+ }
+#endif
}
void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
{
- SetCaret(NULL);
+ if (GetCaret())
+ GetCaret()->Hide();
+#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
+ // Work around dropouts when control is focused
if (!IsFrozen())
+ {
Refresh(false);
+ }
+#endif
+}
+
+void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+ m_dragging = false;
}
/// Left-click
m_dragging = true;
CaptureMouse();
- SelectNone();
-
bool caretAtLineStart = false;
if (hit & wxRICHTEXT_HITTEST_BEFORE)
position --;
}
+ long oldCaretPos = m_caretPosition;
+
MoveCaret(position, caretAtLineStart);
SetDefaultStyleToCursorStyle();
-#if 0
- wxWindow* p = GetParent();
- while (p && !p->IsKindOf(CLASSINFO(wxFrame)))
- p = p->GetParent();
-
- wxFrame* frame = wxDynamicCast(p, wxFrame);
- if (frame)
+ if (event.ShiftDown())
{
- wxString msg = wxString::Format(wxT("Found position %ld"), position);
- frame->SetStatusText(msg, 1);
+ if (m_selectionRange.GetStart() == -2)
+ 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);
+ int hit = GetBuffer().HitTest(dc, logicalPt, position);
+
+ if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
+ {
+ wxRichTextEvent cmdEvent(
+ wxEVT_COMMAND_RICHTEXT_LEFT_CLICK,
+ GetId());
+ cmdEvent.SetEventObject(this);
+ cmdEvent.SetPosition(m_caretPosition+1);
+
+ if (!GetEventHandler()->ProcessEvent(cmdEvent))
+ {
+ wxTextAttr 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 = GetBuffer().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());
wxPoint logicalPt = event.GetLogicalPosition(dc);
int hit = GetBuffer().HitTest(dc, logicalPt, position);
+ // See if we need to change the cursor
+
+ {
+ if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
+ {
+ wxTextAttr attr;
+ if (GetStyle(position, attr))
+ {
+ 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_dragging && hit != wxRICHTEXT_HITTEST_NONE)
{
// TODO: test closeness
if (m_caretPosition != position)
{
- bool extendSel = ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+ ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
MoveCaret(position, caretAtLineStart);
SetDefaultStyleToCursorStyle();
-
- if (extendSel)
- Refresh(false);
}
}
}
void wxRichTextCtrl::OnRightClick(wxMouseEvent& event)
{
SetFocus();
- event.Skip();
+
+ wxRichTextEvent cmdEvent(
+ wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK,
+ GetId());
+ cmdEvent.SetEventObject(this);
+ cmdEvent.SetPosition(m_caretPosition+1);
+
+ 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);
+
+ 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);
+
+ 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_END)
- {
- KeyboardNavigate(event.GetKeyCode(), flags);
+ if (event.GetEventType() == wxEVT_KEY_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_END ||
+
+ event.GetKeyCode() == WXK_NUMPAD_LEFT ||
+ event.GetKeyCode() == WXK_NUMPAD_RIGHT ||
+ event.GetKeyCode() == WXK_NUMPAD_UP ||
+ event.GetKeyCode() == WXK_NUMPAD_DOWN ||
+ event.GetKeyCode() == WXK_NUMPAD_HOME ||
+ event.GetKeyCode() == WXK_NUMPAD_PAGEUP ||
+ event.GetKeyCode() == WXK_NUMPAD_PAGEDOWN ||
+ event.GetKeyCode() == WXK_NUMPAD_END)
+ {
+ KeyboardNavigate(event.GetKeyCode(), flags);
+ return;
+ }
+
+ 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_NUMPAD_DELETE:
+ case WXK_WINDOWS_LEFT:
+ {
+ return;
+ }
+ default:
+ {
+ }
+ }
+
+ // 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)
+ {
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this);
+ processed = true;
+ }
+ }
+
+ if (!processed)
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this);
+ }
+
+ EndBatchUndo();
+
+ if (GetLastPosition() == -1)
+ {
+ GetBuffer().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);
+ GetEventHandler()->ProcessEvent(cmdEvent);
+
+ Update();
+ }
+ else
+ event.Skip();
+
return;
}
DeleteSelectedContent(& newPos);
- GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ if (event.ShiftDown())
+ {
+ wxString text;
+ text = wxRichTextLineBreakChar;
+ GetBuffer().InsertTextWithUndo(newPos+1, text, this);
+ m_caretAtLineStart = true;
+ PositionCaret();
+ }
+ else
+ GetBuffer().InsertNewlineWithUndo(newPos+1, this, 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);
- GetEventHandler()->ProcessEvent(cmdEvent);
+ cmdEvent.SetPosition(newPos+1);
- EndBatchUndo();
- SetDefaultStyleToCursorStyle();
+ if (!GetEventHandler()->ProcessEvent(cmdEvent))
+ {
+ // Generate conventional event
+ wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId());
+ InitCommandEvent(textEvent);
- ScrollIntoView(m_caretPosition, WXK_RIGHT);
+ 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 (m_caretPosition > -1 && !HasSelection())
+ if (newPos > -1)
{
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition, m_caretPosition),
- m_caretPosition, // Current caret position
- m_caretPosition-1, // New caret position
- this);
+ if (event.CmdDown())
+ {
+ long pos = wxRichTextCtrl::FindNextWordPosition(-1);
+ if (pos < newPos)
+ {
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this);
+ processed = true;
+ }
+ }
+
+ if (!processed)
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this);
}
- else
- DeleteSelectedContent();
EndBatchUndo();
- // Shouldn't this be in Do()?
if (GetLastPosition() == -1)
{
GetBuffer().Reset();
}
ScrollIntoView(m_caretPosition, WXK_LEFT);
+
+ wxRichTextEvent cmdEvent(
+ wxEVT_COMMAND_RICHTEXT_DELETE,
+ GetId());
+ cmdEvent.SetEventObject(this);
+ cmdEvent.SetFlags(flags);
+ cmdEvent.SetPosition(m_caretPosition+1);
+ 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 < GetBuffer().GetRange().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))
+ {
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos+1, pos), this);
+ processed = true;
+ }
+ }
+
+ if (!processed)
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos+1, newPos+1), this);
}
- else
- DeleteSelectedContent();
EndBatchUndo();
- // Shouldn't this be in Do()?
if (GetLastPosition() == -1)
{
GetBuffer().Reset();
PositionCaret();
SetDefaultStyleToCursorStyle();
}
+
+ wxRichTextEvent cmdEvent(
+ wxEVT_COMMAND_RICHTEXT_DELETE,
+ GetId());
+ cmdEvent.SetEventObject(this);
+ cmdEvent.SetFlags(flags);
+ cmdEvent.SetPosition(m_caretPosition+1);
+ 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;
+ }
- wxString str = (wxChar) event.GetKeyCode();
- GetBuffer().InsertTextWithUndo(newPos+1, str, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ 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);
- EndBatchUndo();
+ 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 = GetBuffer().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;
+ }
+ }
- SetDefaultStyleToCursorStyle();
- ScrollIntoView(m_caretPosition, WXK_RIGHT);
+ BeginBatchUndo(_("Insert Text"));
+
+ long newPos = m_caretPosition;
+ DeleteSelectedContent(& newPos);
+
+#if wxUSE_UNICODE
+ wxString str = event.GetUnicodeKey();
+#else
+ wxString str = (wxChar) event.GetKeyCode();
+#endif
+ GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
+
+ EndBatchUndo();
+
+ SetDefaultStyleToCursorStyle();
+ ScrollIntoView(m_caretPosition, WXK_RIGHT);
+
+ GetEventHandler()->ProcessEvent(cmdEvent);
+
+ Update();
+ }
+ }
}
}
if (HasSelection())
{
long pos = m_selectionRange.GetStart();
- GetBuffer().DeleteRangeWithUndo(m_selectionRange,
- m_caretPosition, // Current caret position
- pos, // New caret position
- this);
+ GetBuffer().DeleteRangeWithUndo(m_selectionRange, this);
m_selectionRange.SetRange(-2, -2);
if (newPos)
{
bool success = false;
- 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)
+ else if (keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP)
{
success = PageUp(1, flags);
}
- else if (keyCode == WXK_PAGEDOWN)
+ 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);
{
if (flags & wxRICHTEXT_SHIFT_DOWN)
{
+ if (oldPos == newPos)
+ return false;
+
+ wxRichTextRange oldSelection = m_selectionRange;
+
// If not currently selecting, start selecting
if (m_selectionRange.GetStart() == -2)
{
// the end.
if (newPos > m_selectionAnchor)
m_selectionRange.SetRange(m_selectionAnchor+1, newPos);
+ else if (newPos == m_selectionAnchor)
+ m_selectionRange = wxRichTextRange(-2, -2);
else
m_selectionRange.SetRange(newPos+1, m_selectionAnchor);
}
+ RefreshForSelectionChange(oldSelection, m_selectionRange);
+
if (m_selectionRange.GetStart() > m_selectionRange.GetEnd())
{
wxLogDebug(wxT("Strange selection range"));
bool scrolled = false;
wxSize clientSize = GetClientSize();
+ clientSize.y -= GetBuffer().GetBottomMargin();
+
+ 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_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))
{
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 ;
+ int y = rect.y - GetBuffer().GetTopMargin();
int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startYUnits != yUnits)
}
}
// Going up
- else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || 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 ;
+ int y = rect.y - GetBuffer().GetTopMargin();
int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startYUnits != yUnits)
}
}
}
- PositionCaret();
+
+#if !wxRICHTEXT_USE_OWN_CARET
+ if (scrolled)
+#endif
+ PositionCaret();
return scrolled;
}
startX = 0;
startY = startY * ppuY;
- int sx = 0, sy = 0;
- 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.GetBottom() > (startY + GetBuffer().GetTopMargin())) && (rect.GetTop() < (startY + clientSize.y));
}
void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
else
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
else
// 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)
+ if (hitTest & wxRICHTEXT_HITTEST_BEFORE)
{
wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);
wxRichTextRange lineRange;
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
else
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
else
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
}
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
{
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- if (text != wxT(" ") && !text.empty())
+ wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ if (line && (i == line->GetAbsoluteRange().GetEnd()))
+ {
+ break;
+ }
+ else if (!wxRichTextCtrlIsWhitespace(text) && !text.empty())
i += direction;
else
{
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
+ wxRichTextLine* line = GetBuffer().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.empty())
+ else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
i += direction;
else
{
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- if (text.empty()) // End of paragraph, or maybe an image
+ wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+
+ if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
break;
- else if (text == wxT(" ") || text.empty())
+ else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
i += direction;
else
break;
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- if (text != wxT(" ") /* && !text.empty() */)
+ wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ if (line && line->GetAbsoluteRange().GetStart() == i)
+ return i-1;
+
+ if (!wxRichTextCtrlIsWhitespace(text) /* && !text.empty() */)
i += direction;
else
{
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
PositionCaret();
SetDefaultStyleToCursorStyle();
- if (extendSel)
- Refresh(false);
return true;
}
else
GetBuffer().Invalidate(wxRICHTEXT_ALL);
+#if wxRICHTEXT_BUFFERED_PAINTING
RecreateBuffer();
+#endif
event.Skip();
}
/// 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)))
/// Scrolling
void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
{
- // Not used
+#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(bool atTop)
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
if (GetBuffer().IsEmpty())
int pixelsPerUnit = 5;
wxSize clientSize = GetClientSize();
- int maxHeight = GetBuffer().GetCachedSize().y;
+ int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin();
// Round up so we have at least maxHeight pixels
int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5);
if (!atTop)
GetViewStart(& startX, & startY);
- int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);
+ 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 < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))
+ return;
+
// 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
dc.DrawRectangle(windowRect);
}
+#if wxRICHTEXT_BUFFERED_PAINTING
/// Recreate buffer bitmap if necessary
bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
{
m_bufferBitmap = wxBitmap(sz.x, sz.y);
return m_bufferBitmap.Ok();
}
+#endif
// ----------------------------------------------------------------------------
// file IO functions
// ----------------------------------------------------------------------------
-#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-bool wxRichTextCtrl::LoadFile(const wxString& filename, int fileType)
-{
- return DoLoadFile(filename, fileType);
-}
-
-bool wxRichTextCtrl::SaveFile(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;
- }
-
- return DoSaveFile(filenameToUse, fileType);
-}
-#endif
-
bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
{
- bool success = GetBuffer().LoadFile(filename, fileType);
+ bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
if (success)
m_filename = filename;
PositionCaret();
SetupScrollbars(true);
Refresh(false);
- SendUpdateEvent();
+ wxTextCtrl::SendTextUpdatedEvent(this);
if (success)
return true;
bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
{
- if (GetBuffer().SaveFile(filename, fileType))
+ if (GetBuffer().SaveFile(filename, (wxRichTextFileType)fileType))
{
m_filename = filename;
/// Add a new paragraph of text to the end of the buffer
wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text)
{
- return GetBuffer().AddParagraph(text);
+ wxRichTextRange range = GetBuffer().AddParagraph(text);
+ LayoutContent();
+ return range;
}
/// Add an image
wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
{
- return GetBuffer().AddImage(image);
+ wxRichTextRange range = GetBuffer().AddImage(image);
+ LayoutContent();
+ return range;
}
// ----------------------------------------------------------------------------
void wxRichTextCtrl::SelectNone()
{
if (!(GetSelectionRange() == wxRichTextRange(-2, -2)))
- SetSelection(-2, -2);
+ {
+ wxRichTextRange oldSelection = m_selectionRange;
+
+ m_selectionRange = wxRichTextRange(-2, -2);
+
+ RefreshForSelectionChange(oldSelection, m_selectionRange);
+ }
m_selectionAnchor = -2;
}
-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
-#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
+/// Select the word at the given character position
+bool wxRichTextCtrl::SelectWord(long position)
{
- // call inherited
- wxWindowBase::DoUpdateWindowUI(event);
+ if (position < 0 || position > GetBuffer().GetRange().GetEnd())
+ return false;
+
+ wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
+ if (!para)
+ return false;
- // update text
- if ( event.GetSetText() )
+ if (position == para->GetRange().GetEnd())
+ position --;
+
+ long positionStart = position;
+ long positionEnd = position;
+
+ for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --)
{
- if ( event.GetText() != GetValue() )
- SetValue(event.GetText());
+ wxString text = GetBuffer().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 = GetBuffer().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 (positionStart >= 0)
+ {
+ MoveCaret(positionStart-1, true);
+ SetDefaultStyleToCursorStyle();
+ }
+
+ return true;
+}
+
+wxString wxRichTextCtrl::GetStringSelection() const
+{
+ long from, to;
+ GetSelection(&from, &to);
+
+ return GetRange(from, to);
}
-#endif // !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
// ----------------------------------------------------------------------------
// hit testing
int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt2, *pos);
- switch ( hit )
- {
- case wxRICHTEXT_HITTEST_BEFORE:
- return wxTE_HT_BEFORE;
-
- case wxRICHTEXT_HITTEST_AFTER:
- return wxTE_HT_BEYOND;
-
- case wxRICHTEXT_HITTEST_ON:
- return wxTE_HT_ON_TEXT;
- }
+ if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
+ return wxTE_HT_BEFORE;
+ else if ((hit & wxRICHTEXT_HITTEST_AFTER) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
+ return wxTE_HT_BEYOND;
+ else if (hit & (wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_AFTER))
+ return wxTE_HT_ON_TEXT;
return wxTE_HT_UNKNOWN;
}
// set/get the controls text
// ----------------------------------------------------------------------------
-wxString wxRichTextCtrl::GetValue() const
+wxString wxRichTextCtrl::DoGetValue() const
{
return GetBuffer().GetText();
}
return GetBuffer().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.SetDirty(true);
+ m_caretPosition = -1;
+ m_caretPositionForDefaultStyle = -2;
+ m_caretAtLineStart = false;
+ m_selectionRange.SetRange(-2, -2);
- // 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();
- }
-
- // 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
+ if (flags & SetValue_SendEvent)
+ wxTextCtrl::SendTextUpdatedEvent(this);
+ }
DiscardEdits();
}
DoWriteText(value);
}
-void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly))
+void wxRichTextCtrl::DoWriteText(const wxString& value, int flags)
{
- wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Unix);
+ wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
+
+ GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
- GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueDos, this);
+ if ( flags & SetValue_SendEvent )
+ wxTextCtrl::SendTextUpdatedEvent(this);
}
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)
{
wxRichTextImageBlock imageBlock;
return false;
}
-bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType)
{
wxRichTextImageBlock imageBlock;
return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
}
-bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType)
{
if (bitmap.Ok())
{
/// Insert a newline (actually paragraph) at the current insertion point.
bool wxRichTextCtrl::Newline()
{
- return GetBuffer().InsertNewlineWithUndo(m_caretPosition+1, this);
+ return GetBuffer().InsertNewlineWithUndo(m_caretPosition+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
}
+/// Insert a line break at the current insertion point.
+bool wxRichTextCtrl::LineBreak()
+{
+ wxString text;
+ text = wxRichTextLineBreakChar;
+ return GetBuffer().InsertTextWithUndo(m_caretPosition+1, text, this);
+}
// ----------------------------------------------------------------------------
// Clipboard operations
SelectNone();
m_caretPosition = pos - 1;
+
+ PositionCaret();
}
void wxRichTextCtrl::SetInsertionPointEnd()
to = GetLastPosition()+1;
}
- DoSetSelection(from, to);
-}
+ if (from == to)
+ {
+ SelectNone();
+ }
+ else
+ {
+ wxRichTextRange oldSelection = m_selectionRange;
+ m_selectionAnchor = from;
+ m_selectionRange.SetRange(from, to-1);
+ if (from > -2)
+ m_caretPosition = from-1;
-void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
-{
- m_selectionAnchor = from;
- m_selectionRange.SetRange(from, to-1);
- Refresh(false);
- PositionCaret();
+ RefreshForSelectionChange(oldSelection, m_selectionRange);
+ 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();
}
{
SelectNone();
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to),
- m_caretPosition, // Current caret position
- from, // New caret position
- this);
+ GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to-1), this);
LayoutContent();
if (!IsFrozen())
}
}
-// ----------------------------------------------------------------------------
-// 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);
event.Enable(GetLastPosition() > 0);
}
-void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event))
+void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{
+ if (event.GetEventObject() != this)
+ {
+ event.Skip();
+ return;
+ }
+
if (!m_contextMenu)
{
m_contextMenu = new wxMenu;
return;
}
-bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style)
-{
- return GetBuffer().SetStyle(wxRichTextRange(start, end-1), style);
-}
-
bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
- return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttrEx(style));
+ return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttr(style));
}
-bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
+bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style)
{
return GetBuffer().SetStyle(range.ToInternal(), style);
}
-bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style)
-{
- return GetBuffer().SetDefaultStyle(style);
-}
+// extended style setting operation with flags including:
+// wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY.
+// see richtextbuffer.h for more details.
-bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttr& style, int flags)
{
- return GetBuffer().SetDefaultStyle(wxTextAttrEx(style));
+ return GetBuffer().SetStyle(range.ToInternal(), style, flags);
}
-const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const
+bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
{
- return GetBuffer().GetDefaultStyle();
+ return GetBuffer().SetDefaultStyle(wxTextAttr(style));
}
const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
}
bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style)
-{
- wxTextAttrEx attr(style);
- if (GetBuffer().GetStyle(position, attr))
- {
- style = attr;
- return true;
- }
- else
- return false;
-}
-
-bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style)
{
return GetBuffer().GetStyle(position, style);
}
-bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style)
+// get the common set of styles for the range
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)
{
- return GetBuffer().GetStyle(position, style);
+ return GetBuffer().GetStyleForRange(range.ToInternal(), style);
}
/// Get the content (uncombined) attributes for this position.
-
bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
-{
- wxTextAttrEx attr(style);
- if (GetBuffer().GetUncombinedStyle(position, attr))
- {
- style = attr;
- return true;
- }
- else
- return false;
-}
-
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttrEx& style)
-{
- return GetBuffer().GetUncombinedStyle(position, style);
-}
-
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style)
{
return GetBuffer().GetUncombinedStyle(position, style);
}
/// Set font, and also the buffer attributes
bool wxRichTextCtrl::SetFont(const wxFont& font)
{
-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
- wxControl::SetFont(font);
-#else
- wxScrolledWindow::SetFont(font);
-#endif
+ wxTextCtrlBase::SetFont(font);
- wxTextAttrEx attr = GetBuffer().GetAttributes();
+ wxTextAttr attr = GetBuffer().GetAttributes();
attr.SetFont(font);
GetBuffer().SetBasicStyle(attr);
-#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
- // Don't set the default style, since it will be inherited from
- // the basic style.
- GetBuffer().SetDefaultStyle(attr);
-#endif
-
GetBuffer().Invalidate(wxRICHTEXT_ALL);
Refresh(false);
wxRect caretRect;
if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
{
- wxPoint originalPt = caretRect.GetPosition();
- wxPoint pt = GetPhysicalPoint(originalPt);
- if (GetCaret()->GetPosition() != pt)
+ 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);
+
+ 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.y = -200;
+
GetCaret()->Move(pt);
- GetCaret()->SetSize(caretRect.GetSize());
+ GetCaret()->Show();
}
}
}
if (GetBuffer().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;
}
{
if (HasSelection())
{
- wxRichTextAttr attr;
- wxRichTextRange range = GetInternalSelectionRange();
+ wxTextAttr attr;
+ wxRichTextRange range = GetSelectionRange();
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
- attr.SetFontWeight(wxBOLD);
+ attr.SetFontWeight(wxFONTWEIGHT_BOLD);
return HasCharacterAttributes(range, attr);
}
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxRichTextAttr attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
{
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
- return attr.GetFontWeight() == wxBOLD;
+ return attr.GetFontWeight() == wxFONTWEIGHT_BOLD;
}
}
return false;
{
if (HasSelection())
{
- wxRichTextRange range = GetInternalSelectionRange();
- wxRichTextAttr attr;
+ wxRichTextRange range = GetSelectionRange();
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
- attr.SetFontStyle(wxITALIC);
+ attr.SetFontStyle(wxFONTSTYLE_ITALIC);
return HasCharacterAttributes(range, attr);
}
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxRichTextAttr attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
{
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
- return attr.GetFontStyle() == wxITALIC;
+ return attr.GetFontStyle() == wxFONTSTYLE_ITALIC;
}
}
return false;
{
if (HasSelection())
{
- wxRichTextRange range = GetInternalSelectionRange();
- wxRichTextAttr attr;
+ wxRichTextRange range = GetSelectionRange();
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
attr.SetFontUnderlined(true);
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxRichTextAttr attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
/// Apply bold to the selection
bool wxRichTextCtrl::ApplyBoldToSelection()
{
- wxRichTextAttr attr;
+ wxTextAttr 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
- SetAndShowDefaultStyle(attr);
+ {
+ wxRichTextAttr current = GetDefaultStyleEx();
+ current.Apply(attr);
+ SetAndShowDefaultStyle(current);
+ }
return true;
}
/// Apply italic to the selection
bool wxRichTextCtrl::ApplyItalicToSelection()
{
- wxRichTextAttr attr;
+ wxTextAttr 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
- SetAndShowDefaultStyle(attr);
+ {
+ wxRichTextAttr current = GetDefaultStyleEx();
+ current.Apply(attr);
+ SetAndShowDefaultStyle(current);
+ }
return true;
}
/// Apply underline to the selection
bool wxRichTextCtrl::ApplyUnderlineToSelection()
{
- wxRichTextAttr attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
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
- SetAndShowDefaultStyle(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)
{
+ wxRichTextRange range;
if (HasSelection())
- {
- wxRichTextRange range = GetInternalSelectionRange();
- 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);
+
+ wxTextAttr attr;
+ attr.SetAlignment(alignment);
+
+ return HasParagraphAttributes(range, attr);
}
/// Apply alignment to the selection
bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
{
- wxRichTextAttr attr;
+ wxTextAttr attr;
attr.SetAlignment(alignment);
if (HasSelection())
return SetStyle(GetSelectionRange(), attr);
{
wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
if (para)
- return SetStyle(para->GetRange().FromInternal(), 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
-void wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
+bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
{
// Flags are defined within each definition, so only certain
// attributes are applied.
- wxRichTextAttr attr(def->GetStyle());
+ wxTextAttr 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);
+ }
// Make sure the attr has the style name
if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
+ {
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())
- SetStyle(GetSelectionRange(), attr);
+ return SetStyleEx(GetSelectionRange(), attr, flags);
else
- SetAndShowDefaultStyle(attr);
+ {
+ wxRichTextAttr current = GetDefaultStyleEx();
+ current.Apply(attr);
+ SetAndShowDefaultStyle(current);
+ return true;
+ }
}
/// Apply the style sheet to the buffer, for example if the styles have changed.
/// Sets the default style to the style under the cursor
bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_CHARACTER);
// If at the start of a paragraph, use the next position.
long pos = GetAdjustedCaretPosition(GetCaretPosition());
-#if wxRICHTEXT_USE_DYNAMIC_STYLES
if (GetUncombinedStyle(pos, attr))
-#else
- if (GetStyle(pos, attr))
-#endif
{
SetDefaultStyle(attr);
return true;
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.
SetInternalSelectionRange(range1);
}
+/// Set list style
+bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+ return GetBuffer().SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+}
+
+bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
+{
+ return GetBuffer().SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+}
+
+/// Clear list for given range
+bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags)
+{
+ return GetBuffer().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 GetBuffer().NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+}
+
+bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
+{
+ return GetBuffer().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 GetBuffer().PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel);
+}
+
+bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
+{
+ return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);
+}
+
+/// Deletes the content in the given range
+bool wxRichTextCtrl::Delete(const wxRichTextRange& range)
+{
+ return GetBuffer().DeleteRangeWithUndo(range.ToInternal(), this);
+}
+
+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 wxRichTextRange& oldSelection, const wxRichTextRange& newSelection)
+{
+ // Calculate the refresh rectangle - just the affected lines
+ long firstPos, lastPos;
+ if (oldSelection.GetStart() == -2 && newSelection.GetStart() != -2)
+ {
+ firstPos = newSelection.GetStart();
+ lastPos = newSelection.GetEnd();
+ }
+ else if (oldSelection.GetStart() != -2 && newSelection.GetStart() == -2)
+ {
+ firstPos = oldSelection.GetStart();
+ lastPos = oldSelection.GetEnd();
+ }
+ else if (oldSelection.GetStart() == -2 && newSelection.GetStart() == -2)
+ {
+ return false;
+ }
+ else
+ {
+ firstPos = wxMin(oldSelection.GetStart(), newSelection.GetStart());
+ lastPos = wxMax(oldSelection.GetEnd(), newSelection.GetEnd());
+ }
+
+ wxRichTextLine* firstLine = GetBuffer().GetLineAtPosition(firstPos);
+ wxRichTextLine* lastLine = GetBuffer().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;
+}
+
+#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;
+}
+
+wxRichTextCaret::~wxRichTextCaret()
+{
+}
+
+// ----------------------------------------------------------------------------
+// showing/hiding/moving the caret (base class interface)
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::DoShow()
+{
+ Refresh();
+}
+
+void wxRichTextCaret::DoHide()
+{
+ 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);
+
+ // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
+ // done under wxGTK - no idea why
+ //dc->SetLogicalFunction(wxINVERT);
+
+ wxPoint pt(m_x, m_y);
+
+ if (m_richTextCtrl)
+ {
+ pt = m_richTextCtrl->GetLogicalPoint(pt);
+ }
+ dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+#endif
+ // wxRICHTEXT_USE_OWN_CARET
+
#endif
// wxUSE_RICHTEXT
projects / wxWidgets.git / blobdiff