X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64c47f48c3ffe42ce3d3fb94809864a33d5de377..9583e4f4a038030e75c40038d88e9bba538aa7a5:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index bb941820ce..636c494439 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -22,11 +22,8 @@ #include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP + #include "wx/wx.h" #include "wx/settings.h" - #include "wx/menu.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/stopwatch.h" #endif #include "wx/textfile.h" @@ -34,6 +31,7 @@ #include "wx/filename.h" #include "wx/dcbuffer.h" #include "wx/arrimpl.cpp" +#include "wx/fontenum.h" // DLL options compatibility check: #include "wx/app.h" @@ -46,20 +44,16 @@ 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) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED) -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE IMPLEMENT_CLASS( wxRichTextCtrl, wxControl ) -#else -IMPLEMENT_CLASS( wxRichTextCtrl, wxScrolledWindow ) -#endif IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent ) -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl ) -#else -BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow ) -#endif EVT_PAINT(wxRichTextCtrl::OnPaint) EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground) EVT_IDLE(wxRichTextCtrl::OnIdle) @@ -102,18 +96,21 @@ END_EVENT_TABLE() * wxRichTextCtrl */ +wxArrayString wxRichTextCtrl::sm_availableFontNames; + wxRichTextCtrl::wxRichTextCtrl() -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - : wxScrollHelper(this) -#endif + : wxScrollHelper(this) { Init(); } -wxRichTextCtrl::wxRichTextCtrl( wxWindow* parent, wxWindowID id, const 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) + : wxScrollHelper(this) { Init(); Create(parent, id, value, pos, size, style); @@ -122,52 +119,68 @@ wxRichTextCtrl::wxRichTextCtrl( wxWindow* parent, wxWindowID id, const wxString& /// Creation bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style) { -#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE - if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE - )) + 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 - )) - return false; -#endif if (!GetFont().Ok()) { SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } + GetBuffer().Reset(); GetBuffer().SetRichTextCtrl(this); + + SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16)); + GetCaret()->Show(); + + if (style & wxTE_READONLY) + SetEditable(false); wxTextAttrEx attributes; attributes.SetFont(GetFont()); attributes.SetTextColour(*wxBLACK); attributes.SetBackgroundColour(*wxWHITE); attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT); - attributes.SetFlags(wxTEXT_ATTR_ALL); + attributes.SetLineSpacing(10); + attributes.SetParagraphSpacingAfter(10); + attributes.SetParagraphSpacingBefore(0); - SetDefaultStyle(attributes); SetBasicStyle(attributes); + // The default attributes will be merged with base attributes, so + // can be empty to begin with + wxTextAttrEx defaultAttributes; + SetDefaultStyle(defaultAttributes); + SetBackgroundColour(*wxWHITE); SetBackgroundStyle(wxBG_STYLE_CUSTOM); // Tell the sizers to use the given or best size - SetBestFittingSize(size); + SetInitialSize(size); +#if wxRICHTEXT_BUFFERED_PAINTING // Create a buffer RecreateBuffer(size); +#endif + + m_textCursor = wxCursor(wxCURSOR_IBEAM); + m_urlCursor = wxCursor(wxCURSOR_HAND); - SetCursor(wxCursor(wxCURSOR_IBEAM)); + SetCursor(m_textCursor); if (!value.IsEmpty()) SetValue(value); + GetBuffer().AddEventHandler(this); + return true; } wxRichTextCtrl::~wxRichTextCtrl() { + GetBuffer().RemoveEventHandler(this); + delete m_contextMenu; } @@ -211,7 +224,7 @@ void wxRichTextCtrl::Thaw() /// Clear all text void wxRichTextCtrl::Clear() { - m_buffer.Reset(); + m_buffer.ResetAndClearCommands(); m_buffer.SetDirty(true); m_caretPosition = -1; m_caretPositionForDefaultStyle = -2; @@ -225,19 +238,21 @@ void wxRichTextCtrl::Clear() SetupScrollbars(); Refresh(false); } - SendUpdateEvent(); + SendTextUpdatedEvent(); } /// Painting void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { - if (GetCaret()) + if (GetCaret() && GetCaret()->IsVisible()) GetCaret()->Hide(); { +#if wxRICHTEXT_BUFFERED_PAINTING wxBufferedPaintDC dc(this, m_bufferBitmap); - //wxLogDebug(wxT("OnPaint")); - +#else + wxPaintDC dc(this); +#endif PrepareDC(dc); if (m_freezeCount > 0) @@ -248,9 +263,11 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) // 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()) { @@ -262,7 +279,7 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */); } - if (GetCaret()) + if (GetCaret() && !GetCaret()->IsVisible()) GetCaret()->Show(); PositionCaret(); @@ -275,21 +292,24 @@ void wxRichTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) { - wxCaret* caret = new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16); - SetCaret(caret); - caret->Show(); - PositionCaret(); + if (GetCaret()) + { + if (!GetCaret()->IsVisible()) + GetCaret()->Show(); + PositionCaret(); + } - if (!IsFrozen()) - Refresh(false); + // if (!IsFrozen()) + // Refresh(false); } void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event)) { - SetCaret(NULL); + if (GetCaret() && GetCaret()->IsVisible()) + GetCaret()->Hide(); - if (!IsFrozen()) - Refresh(false); + // if (!IsFrozen()) + // Refresh(false); } /// Left-click @@ -329,44 +349,65 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) 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) - { - wxString msg = wxString::Format(wxT("Found position %ld"), position); - frame->SetStatusText(msg, 1); - } -#endif } 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) + { + wxTextAttrEx 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()); @@ -374,6 +415,32 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) long position = 0; 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) + { + wxTextAttrEx attr; + if (GetStyle(position, attr)) + { + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_urlCursor); + } + else if (!attr.HasFlag(wxTEXT_ATTR_URL)) + { + SetCursor(m_textCursor); + } + } + } + } + + if (!event.Dragging()) + { + event.Skip(); + return; + } if (m_dragging && hit != wxRICHTEXT_HITTEST_NONE) { @@ -417,6 +484,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) /// Left-double-click void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& event) { + SelectWord(GetCaretPosition()+1); event.Skip(); } @@ -430,7 +498,7 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event) 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; @@ -444,7 +512,16 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) event.GetKeyCode() == WXK_HOME || event.GetKeyCode() == WXK_PAGEUP || event.GetKeyCode() == WXK_PAGEDOWN || - event.GetKeyCode() == WXK_END) + 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; @@ -466,19 +543,26 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) DeleteSelectedContent(& newPos); - GetBuffer().InsertNewlineWithUndo(newPos+1, this); + GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + EndBatchUndo(); + SetDefaultStyleToCursorStyle(); + + ScrollIntoView(m_caretPosition, WXK_RIGHT); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_RETURN, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); - GetEventHandler()->ProcessEvent(cmdEvent); - - EndBatchUndo(); - SetDefaultStyleToCursorStyle(); - - ScrollIntoView(m_caretPosition, WXK_RIGHT); + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + { + // Generate conventional event + wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId()); + InitCommandEvent(textEvent); + + GetEventHandler()->ProcessEvent(textEvent); + } + Update(); } else if (event.GetKeyCode() == WXK_BACK) { @@ -498,7 +582,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { GetBuffer().Reset(); @@ -509,6 +592,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } ScrollIntoView(m_caretPosition, WXK_LEFT); + Update(); } else if (event.GetKeyCode() == WXK_DELETE) { @@ -527,7 +611,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { GetBuffer().Reset(); @@ -536,21 +619,158 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) PositionCaret(); SetDefaultStyleToCursorStyle(); } + Update(); } else { - BeginBatchUndo(_("Insert Text")); + long keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_ESCAPE: + // case WXK_SPACE: + case WXK_DELETE: + 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_NUMPAD0: + case WXK_NUMPAD1: + case WXK_NUMPAD2: + case WXK_NUMPAD3: + case WXK_NUMPAD4: + case WXK_NUMPAD5: + case WXK_NUMPAD6: + case WXK_NUMPAD7: + case WXK_NUMPAD8: + case WXK_NUMPAD9: + case WXK_MULTIPLY: + case WXK_ADD: + case WXK_SEPARATOR: + case WXK_SUBTRACT: + case WXK_DECIMAL: + case WXK_DIVIDE: + 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_SPACE: + case WXK_NUMPAD_TAB: + case WXK_NUMPAD_ENTER: + 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_NUMPAD_EQUAL: + case WXK_NUMPAD_MULTIPLY: + case WXK_NUMPAD_ADD: + case WXK_NUMPAD_SEPARATOR: + case WXK_NUMPAD_SUBTRACT: + case WXK_NUMPAD_DECIMAL: + { + event.Skip(); + return; + } - long newPos = m_caretPosition; - DeleteSelectedContent(& newPos); + default: + { + if (event.CmdDown() || event.AltDown()) + { + event.Skip(); + return; + } - wxString str = (wxChar) event.GetKeyCode(); - GetBuffer().InsertTextWithUndo(newPos+1, str, this); + if (keycode == wxT('\t')) + { + // See if we need to promote or demote the selection or paragraph at the cursor + // position, instead of inserting a tab. + long pos = GetAdjustedCaretPosition(GetCaretPosition()); + wxRichTextParagraph* para = 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); + + return; + } + } - EndBatchUndo(); + BeginBatchUndo(_("Insert Text")); - SetDefaultStyleToCursorStyle(); - ScrollIntoView(m_caretPosition, WXK_RIGHT); + long newPos = m_caretPosition; + DeleteSelectedContent(& newPos); + + wxString str = (wxChar) event.GetKeyCode(); + GetBuffer().InsertTextWithUndo(newPos+1, str, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + + EndBatchUndo(); + + SetDefaultStyleToCursorStyle(); + ScrollIntoView(m_caretPosition, WXK_RIGHT); + Update(); + } + } } } @@ -609,50 +829,50 @@ bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags) { 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); @@ -735,7 +955,10 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) wxSize clientSize = GetClientSize(); // 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_DOWN || + keyCode == WXK_END || keyCode == WXK_NUMPAD_END || + keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN) { if ((rect.y + rect.height) > (clientSize.y + startY)) { @@ -769,7 +992,10 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) } } // 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) { @@ -1412,7 +1638,9 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event) else GetBuffer().Invalidate(wxRICHTEXT_ALL); +#if wxRICHTEXT_BUFFERED_PAINTING RecreateBuffer(); +#endif event.Skip(); } @@ -1506,6 +1734,7 @@ void wxRichTextCtrl::PaintBackground(wxDC& dc) dc.DrawRectangle(windowRect); } +#if wxRICHTEXT_BUFFERED_PAINTING /// Recreate buffer bitmap if necessary bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) { @@ -1520,32 +1749,12 @@ 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); @@ -1558,7 +1767,7 @@ bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType) PositionCaret(); SetupScrollbars(true); Refresh(false); - SendUpdateEvent(); + SendTextUpdatedEvent(); if (success) return true; @@ -1620,29 +1829,66 @@ void wxRichTextCtrl::SelectNone() 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; - // update text - if ( event.GetSetText() ) + wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position); + if (!para) + return false; + + 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(); + + 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 @@ -1708,7 +1954,7 @@ wxString wxRichTextCtrl::GetRange(long from, long to) const return GetBuffer().GetTextForRange(wxRichTextRange(from, to-1)); } -void wxRichTextCtrl::SetValue(const wxString& value) +void wxRichTextCtrl::DoSetValue(const wxString& value, int flags) { Clear(); @@ -1718,15 +1964,18 @@ void wxRichTextCtrl::SetValue(const wxString& value) // edit controls mostly) if ( (value.length() > 0x400) || (value != GetValue()) ) { - DoWriteText(value, false /* not selection only */); + DoWriteText(value); // for compatibility, don't move the cursor when doing SetValue() SetInsertionPoint(0); } else // same text { - // still send an event for consistency - SendUpdateEvent(); + if ( flags & SetValue_SendEvent ) + { + // still send an event for consistency + SendTextUpdatedEvent(); + } } // we should reset the modified flag even if the value didn't really change @@ -1741,10 +1990,14 @@ void wxRichTextCtrl::WriteText(const wxString& value) DoWriteText(value); } -void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly)) +void wxRichTextCtrl::DoWriteText(const wxString& value, int flags) { - wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Unix); - GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueDos, this); + wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix); + + GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this); + + if ( flags & SetValue_SendEvent ) + SendTextUpdatedEvent(); } void wxRichTextCtrl::AppendText(const wxString& text) @@ -1811,7 +2064,7 @@ void wxRichTextCtrl::Copy() { if (CanCopy()) { - wxRichTextRange range = GetSelectionRange(); + wxRichTextRange range = GetInternalSelectionRange(); GetBuffer().CopyToClipboard(range); } } @@ -1820,7 +2073,7 @@ void wxRichTextCtrl::Cut() { if (CanCut()) { - wxRichTextRange range = GetSelectionRange(); + wxRichTextRange range = GetInternalSelectionRange(); GetBuffer().CopyToClipboard(range); DeleteSelectedContent(); @@ -1950,6 +2203,7 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare { m_selectionAnchor = from; m_selectionRange.SetRange(from, to-1); + Refresh(false); PositionCaret(); } @@ -1958,13 +2212,14 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare // 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(); } @@ -2088,39 +2343,6 @@ void wxRichTextCtrl::OnDropFiles(wxDropFilesEvent& event) } } -// ---------------------------------------------------------------------------- -// text control event processing -// ---------------------------------------------------------------------------- - -bool wxRichTextCtrl::SendUpdateEvent() -{ - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); - InitCommandEvent(event); - - return GetEventHandler()->ProcessEvent(event); -} - -void wxRichTextCtrl::InitCommandEvent(wxCommandEvent& event) const -{ - event.SetEventObject((wxControlBase *)this); // const_cast - - switch ( m_clientDataType ) - { - case wxClientData_Void: - event.SetClientData(GetClientData()); - break; - - case wxClientData_Object: - event.SetClientObject(GetClientObject()); - break; - - case wxClientData_None: - // nothing to do - ; - } -} - - wxSize wxRichTextCtrl::DoGetBestSize() const { return wxSize(10, 10); @@ -2236,6 +2458,24 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr return GetBuffer().SetStyle(range.ToInternal(), 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::SetStyleEx(long start, long end, const wxTextAttrEx& style, int flags) +{ + return GetBuffer().SetStyle(wxRichTextRange(start, end-1), style, flags); +} + +bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttrEx& style, int flags) +{ + return GetBuffer().SetStyle(range.ToInternal(), style, flags); +} + +bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags) +{ + return GetBuffer().SetStyle(range.ToInternal(), style, flags); +} + bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style) { return GetBuffer().SetDefaultStyle(style); @@ -2258,7 +2498,7 @@ const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style) { - wxTextAttrEx attr; + wxTextAttrEx attr(style); if (GetBuffer().GetStyle(position, attr)) { style = attr; @@ -2278,19 +2518,41 @@ bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style) return GetBuffer().GetStyle(position, 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 wxTextAttrEx attr = GetBuffer().GetAttributes(); attr.SetFont(font); GetBuffer().SetBasicStyle(attr); - GetBuffer().SetDefaultStyle(attr); + + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(false); return true; } @@ -2508,8 +2770,8 @@ bool wxRichTextCtrl::IsSelectionUnderlined() // to see what the effect would be if we started typing. wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE); - long pos = GetAdjustedCaretPosition(GetCaretPosition()); + if (GetStyle(pos, attr)) { if (IsDefaultStyleShowing()) @@ -2528,7 +2790,7 @@ bool wxRichTextCtrl::ApplyBoldToSelection() attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD); if (HasSelection()) - return SetStyle(GetSelectionRange(), attr); + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); else SetAndShowDefaultStyle(attr); return true; @@ -2542,7 +2804,7 @@ bool wxRichTextCtrl::ApplyItalicToSelection() attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC); if (HasSelection()) - return SetStyle(GetSelectionRange(), attr); + return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY); else SetAndShowDefaultStyle(attr); return true; @@ -2556,7 +2818,7 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection() 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); return true; @@ -2565,22 +2827,16 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection() /// 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 = GetInternalSelectionRange(); 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()+1); + + wxRichTextAttr attr; + attr.SetAlignment(alignment); + + return HasParagraphAttributes(range, attr); } /// Apply alignment to the selection @@ -2594,28 +2850,75 @@ bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment) { 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()); + int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE; + + 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); + return true; + } +} + +/// Apply the style sheet to the buffer, for example if the styles have changed. +bool wxRichTextCtrl::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet) +{ + if (!styleSheet) + styleSheet = GetBuffer().GetStyleSheet(); + if (!styleSheet) + return false; + + if (GetBuffer().ApplyStyleSheet(styleSheet)) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(false); + return true; + } + else + return false; } /// Sets the default style to the style under the cursor @@ -2627,7 +2930,11 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle() // 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; @@ -2646,6 +2953,18 @@ long wxRichTextCtrl::GetFirstVisiblePosition() const 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. @@ -2676,9 +2995,63 @@ void wxRichTextCtrl::SetSelectionRange(const wxRichTextRange& range) range1.SetEnd(range1.GetEnd() - 1); wxASSERT( range1.GetStart() > range1.GetEnd() ); - + 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); +} + +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(); +} + #endif // wxUSE_RICHTEXT