X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/011b3dcbef1f34e476a7a8be04d9525ec47b8062..5c87527c5a81eda63e7ccbda2f226ca02716e7da:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index ab68f2f393..33031e957a 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtextbuffer.cpp +// Name: src/richtext/richtextbuffer.cpp // Purpose: Buffer for wxRichTextCtrl // Author: Julian Smart -// Modified by: +// Modified by: // Created: 2005-09-30 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,32 +13,90 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif +#if wxUSE_RICHTEXT -#include "wx/image.h" +#include "wx/richtext/richtextbuffer.h" -#if wxUSE_RICHTEXT +#ifndef WX_PRECOMP + #include "wx/dc.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/dataobj.h" + #include "wx/module.h" +#endif +#include "wx/settings.h" #include "wx/filename.h" #include "wx/clipbrd.h" #include "wx/wfstream.h" -#include "wx/module.h" #include "wx/mstream.h" #include "wx/sstream.h" +#include "wx/textfile.h" +#include "wx/hashmap.h" -#include "wx/richtext/richtextbuffer.h" #include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextstyles.h" #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxRichTextObjectList); -WX_DEFINE_LIST(wxRichTextLineList); +WX_DEFINE_LIST(wxRichTextObjectList) +WX_DEFINE_LIST(wxRichTextLineList) + +// Switch off if the platform doesn't like it for some reason +#define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1 + +// Use GetPartialTextExtents for platforms that support it natively +#define wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS 1 + +const wxChar wxRichTextLineBreakChar = (wxChar) 29; + +// Helpers for efficiency + +inline void wxCheckSetFont(wxDC& dc, const wxFont& font) +{ +#if 0 + const wxFont& font1 = dc.GetFont(); + if (font1.IsOk() && font.IsOk()) + { + if (font1.GetPointSize() == font.GetPointSize() && + font1.GetFamily() == font.GetFamily() && + font1.GetStyle() == font.GetStyle() && + font1.GetWeight() == font.GetWeight() && + font1.GetUnderlined() == font.GetUnderlined() && + font1.GetFaceName() == font.GetFaceName()) + return; + } +#endif + dc.SetFont(font); +} + +inline void wxCheckSetPen(wxDC& dc, const wxPen& pen) +{ + const wxPen& pen1 = dc.GetPen(); + if (pen1.IsOk() && pen.IsOk()) + { + if (pen1.GetWidth() == pen.GetWidth() && + pen1.GetStyle() == pen.GetStyle() && + pen1.GetColour() == pen.GetColour()) + return; + } + dc.SetPen(pen); +} + +inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush) +{ + const wxBrush& brush1 = dc.GetBrush(); + if (brush1.IsOk() && brush.IsOk()) + { + if (brush1.GetStyle() == brush.GetStyle() && + brush1.GetColour() == brush.GetColour()) + return; + } + dc.SetBrush(brush); +} /*! * wxRichTextObject @@ -79,11 +137,6 @@ void wxRichTextObject::Copy(const wxRichTextObject& obj) m_range = obj.m_range; m_attributes = obj.m_attributes; m_descent = obj.m_descent; - - if (!m_attributes.GetFont().Ok()) - wxLogDebug(wxT("No font!")); - if (!obj.m_attributes.GetFont().Ok()) - wxLogDebug(wxT("Parent has no font!")); } void wxRichTextObject::SetMargins(int margin) @@ -99,11 +152,21 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin m_bottomMargin = bottomMargin; } -// Convert units in tends of a millimetre to device units +// Convert units in tenths of a millimetre to device units int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) { - int ppi = dc.GetPPI().x; + int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units); + + // Unscale + wxRichTextBuffer* buffer = GetBuffer(); + if (buffer) + p = (int) ((double)p / buffer->GetScale()); + return p; +} +// Convert units in tenths of a millimetre to device units +int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units) +{ // There are ppi pixels in 254.1 "1/10 mm" double pixels = ((double) units * (double)ppi) / 254.1; @@ -119,6 +182,14 @@ void wxRichTextObject::Dump(wxTextOutputStream& stream) stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n"); } +/// Gets the containing buffer +wxRichTextBuffer* wxRichTextObject::GetBuffer() const +{ + const wxRichTextObject* obj = this; + while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer))) + obj = obj->GetParent(); + return wxDynamicCast(obj, wxRichTextBuffer); +} /*! * wxRichTextCompositeObject @@ -174,9 +245,10 @@ bool wxRichTextCompositeObject::RemoveChild(wxRichTextObject* child, bool delete wxRichTextObjectList::compatibility_iterator node = m_children.Find(child); if (node) { + wxRichTextObject* obj = node->GetData(); + m_children.Erase(node); if (deleteChild) - delete node->GetData(); - delete node; + delete obj; return true; } @@ -195,7 +267,7 @@ bool wxRichTextCompositeObject::DeleteChildren() child->Dereference(); // Only delete if reference count is zero node = node->GetNext(); - delete oldNode; + m_children.Erase(oldNode); } return true; @@ -218,7 +290,9 @@ void wxRichTextCompositeObject::Copy(const wxRichTextCompositeObject& obj) while (node) { wxRichTextObject* child = node->GetData(); - m_children.Append(child->Clone()); + wxRichTextObject* newChild = child->Clone(); + newChild->SetParent(this); + m_children.Append(newChild); node = node->GetNext(); } @@ -240,7 +314,8 @@ int wxRichTextCompositeObject::HitTest(wxDC& dc, const wxPoint& pt, long& textPo node = node->GetNext(); } - return wxRICHTEXT_HITTEST_NONE; + textPosition = GetRange().GetEnd()-1; + return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE; } /// Finds the absolute position and row height for the given character position @@ -293,12 +368,12 @@ void wxRichTextCompositeObject::CalculateRange(long start, long& end) bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - + while (node) { wxRichTextObject* obj = (wxRichTextObject*) node->GetData(); wxRichTextObjectList::compatibility_iterator next = node->GetNext(); - + // Delete the range in each paragraph // When a chunk has been deleted, internally the content does not @@ -307,7 +382,7 @@ bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range) // If you may delete content from the same object twice, recalculate // the ranges inbetween DeleteRange calls by calling CalculateRanges, and // adjust the range you're deleting accordingly. - + if (!obj->GetRange().IsOutside(range)) { obj->DeleteRange(range); @@ -318,13 +393,13 @@ bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range) { // An empty paragraph has length 1, so won't be deleted unless the // whole range is deleted. - RemoveChild(obj, true); + RemoveChild(obj, true); } } - + node = next; } - + return true; } @@ -340,9 +415,9 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range if (!child->GetRange().IsOutside(range)) { childRange.LimitTo(child->GetRange()); - + wxString childText = child->GetTextForRange(childRange); - + text += childText; } node = node->GetNext(); @@ -352,26 +427,31 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range } /// Recursively merge all pieces that can be merged. -bool wxRichTextCompositeObject::Defragment() +bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { wxRichTextObject* child = node->GetData(); - wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject); - if (composite) - composite->Defragment(); - - if (node->GetNext()) + if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range)) { - wxRichTextObject* nextChild = node->GetNext()->GetData(); - if (child->CanMerge(nextChild) && child->Merge(nextChild)) + wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject); + if (composite) + composite->Defragment(); + + if (node->GetNext()) { - nextChild->Dereference(); - delete node->GetNext(); + wxRichTextObject* nextChild = node->GetNext()->GetData(); + if (child->CanMerge(nextChild) && child->Merge(nextChild)) + { + nextChild->Dereference(); + m_children.Erase(node->GetNext()); - // Don't set node -- we'll see if we can merge again with the next - // child. + // Don't set node -- we'll see if we can merge again with the next + // child. + } + else + node = node->GetNext(); } else node = node->GetNext(); @@ -440,13 +520,13 @@ bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style) } /// Get/set the size for the given range. Assume only has one child. -bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const +bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); if (node) { wxRichTextObject* child = node->GetData(); - return child->GetRangeSize(range, size, descent, dc, flags); + return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents); } else return false; @@ -480,10 +560,12 @@ void wxRichTextParagraphLayoutBox::Init() // For now, assume is the only box and has no initial size. m_range = wxRichTextRange(0, -1); + m_invalidRange.SetRange(-1, -1); m_leftMargin = 4; m_rightMargin = 4; m_topMargin = 4; m_bottomMargin = 4; + m_partialParagraph = false; } /// Draw the item @@ -494,17 +576,22 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, { wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); wxASSERT (child != NULL); - + if (child && !child->GetRange().IsOutside(range)) { wxRect childRect(child->GetPosition(), child->GetCachedSize()); - - if (childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop()) + + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom()) + { + // Stop drawing + break; + } + else if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetBottom() < rect.GetTop()) { // Skip } else - child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style); + child->Draw(dc, range, selectionRange, rect, descent, style); } node = node->GetNext(); @@ -515,7 +602,34 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, /// Lay the item out bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style) { - wxRect availableSpace(rect.x + m_leftMargin, + wxRect availableSpace; + bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT; + + // If only laying out a specific area, the passed rect has a different meaning: + // the visible part of the buffer. This is used in wxRichTextCtrl::OnSize, + // so that during a size, only the visible part will be relaid out, or + // it would take too long causing flicker. As an approximation, we assume that + // everything up to the start of the visible area is laid out correctly. + if (formatRect) + { + availableSpace = wxRect(0 + m_leftMargin, + 0 + m_topMargin, + rect.width - m_leftMargin - m_rightMargin, + rect.height); + + // Invalidate the part of the buffer from the first visible line + // to the end. If other parts of the buffer are currently invalid, + // then they too will be taken into account if they are above + // the visible point. + long startPos = 0; + wxRichTextLine* line = GetLineAtYPosition(rect.y); + if (line) + startPos = line->GetAbsoluteRange().GetStart(); + + Invalidate(wxRichTextRange(startPos, GetRange().GetEnd())); + } + else + availableSpace = wxRect(rect.x + m_leftMargin, rect.y + m_topMargin, rect.width - m_leftMargin - m_rightMargin, rect.height - m_topMargin - m_bottomMargin); @@ -523,18 +637,98 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl int maxWidth = 0; wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + + bool layoutAll = true; + + // Get invalid range, rounding to paragraph start/end. + wxRichTextRange invalidRange = GetInvalidRange(true); + + if (invalidRange == wxRICHTEXT_NONE && !formatRect) + return true; + + if (invalidRange == wxRICHTEXT_ALL) + layoutAll = true; + else // If we know what range is affected, start laying out from that point on. + if (invalidRange.GetStart() >= GetRange().GetStart()) + { + wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart()); + if (firstParagraph) + { + wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph); + wxRichTextObjectList::compatibility_iterator previousNode; + if ( firstNode ) + previousNode = firstNode->GetPrevious(); + if (firstNode) + { + if (previousNode) + { + wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph); + availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y; + } + + // Now we're going to start iterating from the first affected paragraph. + node = firstNode; + + layoutAll = false; + } + } + } + + // A way to force speedy rest-of-buffer layout (the 'else' below) + bool forceQuickLayout = false; + while (node) { // Assume this box only contains paragraphs wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (child != NULL); + wxCHECK_MSG( child, false, _T("Unknown object in layout") ); - child->Layout(dc, availableSpace, style); + // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines + if ( !forceQuickLayout && + (layoutAll || + child->GetLines().IsEmpty() || + !child->GetRange().IsOutside(invalidRange)) ) + { + child->Layout(dc, availableSpace, style); + + // Layout must set the cached size + availableSpace.y += child->GetCachedSize().y; + maxWidth = wxMax(maxWidth, child->GetCachedSize().x); + + // If we're just formatting the visible part of the buffer, + // and we're now past the bottom of the window, start quick + // layout. + if (formatRect && child->GetPosition().y > rect.GetBottom()) + forceQuickLayout = true; + } + else + { + // We're outside the immediately affected range, so now let's just + // move everything up or down. This assumes that all the children have previously + // been laid out and have wrapped line lists associated with them. + // TODO: check all paragraphs before the affected range. + + int inc = availableSpace.y - child->GetPosition().y; + + while (node) + { + wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); + if (child) + { + if (child->GetLines().GetCount() == 0) + child->Layout(dc, availableSpace, style); + else + child->SetPosition(wxPoint(child->GetPosition().x, child->GetPosition().y + inc)); - // Layout must set the cached size - availableSpace.y += child->GetCachedSize().y; - maxWidth = wxMax(maxWidth, child->GetCachedSize().x); + availableSpace.y += child->GetCachedSize().y; + maxWidth = wxMax(maxWidth, child->GetCachedSize().x); + } + + node = node->GetNext(); + } + break; + } node = node->GetNext(); } @@ -542,6 +736,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl SetCachedSize(wxSize(maxWidth, availableSpace.y)); m_dirty = false; + m_invalidRange = wxRICHTEXT_NONE; return true; } @@ -550,15 +745,18 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj) { wxRichTextBox::Copy(obj); + + m_partialParagraph = obj.m_partialParagraph; + m_defaultAttributes = obj.m_defaultAttributes; } /// Get/set the size for the given range. -bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const +bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const { wxSize sz; - wxRichTextObjectList::compatibility_iterator startPara = NULL; - wxRichTextObjectList::compatibility_iterator endPara = NULL; + wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator(); + wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator(); // First find the first paragraph whose starting position is within the range. wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); @@ -609,7 +807,7 @@ bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wx wxSize childSize; int childDescent = 0; - child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags); + child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags, position); descent = wxMax(childDescent, descent); @@ -661,24 +859,30 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { - // child is a paragraph - wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (child != NULL); - - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) + wxRichTextObject* obj = (wxRichTextObject*) node->GetData(); + if (obj->GetRange().Contains(pos)) { - wxRichTextLine* line = node2->GetData(); + // child is a paragraph + wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph); + wxASSERT (child != NULL); + + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); - if (line->GetRange().Contains(pos) || + wxRichTextRange range = line->GetAbsoluteRange(); - // If the position is end-of-paragraph, then return the last line of - // of the paragraph. - (line->GetRange().GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) - return line; + if (range.Contains(pos) || - node2 = node2->GetNext(); - } + // If the position is end-of-paragraph, then return the last line of + // of the paragraph. + ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))) + return line; + + node2 = node2->GetNext(); + } + } node = node->GetNext(); } @@ -710,7 +914,7 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtYPosition(int y) const return line; node2 = node2->GetNext(); - } + } node = node->GetNext(); } @@ -744,7 +948,7 @@ int wxRichTextParagraphLayoutBox::GetLineCount() const /// Get the paragraph for a given line wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const { - return GetParagraphAtPosition(line->GetRange().GetStart()); + return GetParagraphAtPosition(line->GetAbsoluteRange().GetStart()); } /// Get the line size at the given position @@ -761,16 +965,30 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP /// Convenience function to add a paragraph of text -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttr* paraStyle) { - wxTextAttrEx style(GetAttributes()); + // Don't use the base style, just the default style, and the base style will + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttr defaultCharStyle; + wxTextAttr defaultParaStyle; + + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); + wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; + wxTextAttr* cStyle = & defaultCharStyle; - wxRichTextParagraph* para = new wxRichTextParagraph(text, this, & style); + wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle); AppendChild(para); @@ -781,81 +999,108 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text) } /// Adds multiple paragraphs, based on newlines. -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttr* paraStyle) { - wxTextAttrEx style(GetAttributes()); - //wxLogDebug("Initial style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Initial size = %d", style.GetFont().GetPointSize()); + // Don't use the base style, just the default style, and the base style will + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttr defaultCharStyle; + wxTextAttr defaultParaStyle; - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - //wxLogDebug("Style after applying default style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Size after applying default style = %d", style.GetFont().GetPointSize()); + wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; + wxTextAttr* cStyle = & defaultCharStyle; wxRichTextParagraph* firstPara = NULL; wxRichTextParagraph* lastPara = NULL; wxRichTextRange range(-1, -1); + size_t i = 0; - size_t len = text.Length(); + size_t len = text.length(); wxString line; + wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); + + AppendChild(para); + + firstPara = para; + lastPara = para; + while (i < len) { wxChar ch = text[i]; if (ch == wxT('\n') || ch == wxT('\r')) { - wxRichTextParagraph* para = new wxRichTextParagraph(line, this, & style); + if (i != (len-1)) + { + wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); + plainText->SetText(line); + + para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); + + AppendChild(para); - AppendChild(para); - if (!firstPara) - firstPara = para; - lastPara = para; - line = wxEmptyString; + lastPara = para; + line = wxEmptyString; + } } else line += ch; i ++; } - if (!line.IsEmpty()) + + if (!line.empty()) { - lastPara = new wxRichTextParagraph(line, this, & style); - //wxLogDebug("Para Face = %s", lastPara->GetAttributes().GetFont().GetFaceName()); - AppendChild(lastPara); + wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); + plainText->SetText(line); } - if (firstPara) - range.SetStart(firstPara->GetRange().GetStart()); - else if (lastPara) - range.SetStart(lastPara->GetRange().GetStart()); - - if (lastPara) - range.SetEnd(lastPara->GetRange().GetEnd()); - else if (firstPara) - range.SetEnd(firstPara->GetRange().GetEnd()); - UpdateRanges(); + SetDirty(false); - return GetRange(); + return wxRichTextRange(firstPara->GetRange().GetStart(), lastPara->GetRange().GetEnd()); } /// Convenience function to add an image -wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image) +wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttr* paraStyle) { - wxTextAttrEx style(GetAttributes()); + // Don't use the base style, just the default style, and the base style will + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttr defaultCharStyle; + wxTextAttr defaultParaStyle; + + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); + wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; + wxTextAttr* cStyle = & defaultCharStyle; - wxRichTextParagraph* para = new wxRichTextParagraph(this, & style); + wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle); AppendChild(para); - para->AppendChild(new wxRichTextImage(image, this)); + para->AppendChild(new wxRichTextImage(image, this, cStyle)); UpdateRanges(); SetDirty(true); @@ -867,10 +1112,8 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image) /// Insert fragment into this box at the given position. If partialParagraph is true, /// it is assumed that the last (or only) paragraph is just a piece of data with no paragraph /// marker. -/// TODO: if fragment is inserted inside styled fragment, must apply that style to -/// to the data (if it has a default style, anyway). -bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragment& fragment) +bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment) { SetDirty(true); @@ -878,6 +1121,8 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm wxRichTextParagraph* para = GetParagraphAtPosition(position); if (para) { + wxTextAttrEx originalAttr = para->GetAttributes(); + wxRichTextObjectList::compatibility_iterator node = m_children.Find(para); // Now split at this position, returning the object to insert the new @@ -902,7 +1147,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm while (objectNode) { wxRichTextObject* newObj = objectNode->GetData()->Clone(); - + if (!nextObject) { // Append @@ -913,7 +1158,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm // Insert before nextObject para->InsertChild(newObj, nextObject); } - + objectNode = objectNode->GetNext(); } @@ -945,14 +1190,26 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph); wxASSERT(firstPara != NULL); + if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE)) + para->SetAttributes(firstPara->GetAttributes()); + + // Save empty paragraph attributes for appending later + // These are character attributes deliberately set for a new paragraph. Without this, + // we couldn't pass default attributes when appending a new paragraph. + wxTextAttrEx emptyParagraphAttributes; + wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst(); + + if (objectNode && firstPara->GetChildren().GetCount() == 1 && objectNode->GetData()->IsEmpty()) + emptyParagraphAttributes = objectNode->GetData()->GetAttributes(); + while (objectNode) { wxRichTextObject* newObj = objectNode->GetData()->Clone(); - + // Append para->AppendChild(newObj); - + objectNode = objectNode->GetNext(); } @@ -965,51 +1222,57 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext(); wxRichTextParagraph* finalPara = para; + bool needExtraPara = (!i || !fragment.GetPartialParagraph()); + // If there was only one paragraph, we need to insert a new one. - if (!i) + while (i) { - finalPara = new wxRichTextParagraph; + wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph); + wxASSERT( para != NULL ); - // TODO: These attributes should come from the subsequent paragraph - // when originally deleted, since the subsequent para takes on - // the previous para's attributes. - finalPara->SetAttributes(firstPara->GetAttributes()); + finalPara = (wxRichTextParagraph*) para->Clone(); if (nextParagraph) InsertChild(finalPara, nextParagraph); else - AppendChild(finalPara); + AppendChild(finalPara); + + i = i->GetNext(); } - else while (i) - { - wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph); - wxASSERT( para != NULL ); - finalPara = (wxRichTextParagraph*) para->Clone(); + // If there was only one paragraph, or we have full paragraphs in our fragment, + // we need to insert a new one. + if (needExtraPara) + { + finalPara = new wxRichTextParagraph; if (nextParagraph) InsertChild(finalPara, nextParagraph); else AppendChild(finalPara); - - i = i->GetNext(); } // 4. Add back the remaining content. if (finalPara) { - finalPara->MoveFromList(savedObjects); + if (nextObject) + finalPara->MoveFromList(savedObjects); // Ensure there's at least one object if (finalPara->GetChildCount() == 0) { - wxRichTextPlainText* text = new wxRichTextPlainText(wxT("")); - text->SetAttributes(finalPara->GetAttributes()); + wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); + text->SetAttributes(emptyParagraphAttributes); finalPara->AppendChild(text); } } + if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara) + finalPara->SetAttributes(firstPara->GetAttributes()); + else if (finalPara && finalPara != para) + finalPara->SetAttributes(originalAttr); + return true; } } @@ -1021,21 +1284,19 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm { wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph); wxASSERT( para != NULL ); - + AppendChild(para->Clone()); - + i = i->GetNext(); } return true; } - - return false; } /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'. /// If there was an incomplete paragraph at the end, partialParagraph is set to true. -bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wxRichTextFragment& fragment) +bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wxRichTextParagraphLayoutBox& fragment) { wxRichTextObjectList::compatibility_iterator i = GetChildren().GetFirst(); while (i) @@ -1046,7 +1307,7 @@ bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wx if (!para->GetRange().IsOutside(range)) { fragment.AppendChild(para->Clone()); - } + } i = i->GetNext(); } @@ -1123,20 +1384,21 @@ long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosi while (node2) { wxRichTextLine* line = node2->GetData(); - - if (line->GetRange().Contains(pos)) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + + if (lineRange.Contains(pos)) { // If the caret is displayed at the end of the previous wrapped line, // we want to return the line it's _displayed_ at (not the actual line // containing the position). - if (line->GetRange().GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos) + if (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos) return lineCount - 1; else return lineCount; } lineCount ++; - + node2 = node2->GetNext(); } // If we didn't find it in the lines, it must be @@ -1170,14 +1432,14 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long l while (node2) { wxRichTextLine* line = node2->GetData(); - + if (lineCount == lineNumber) return line; lineCount ++; - + node2 = node2->GetNext(); - } + } } else lineCount += child->GetLines().GetCount(); @@ -1193,14 +1455,15 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long l bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - + + wxRichTextParagraph* firstPara = NULL; while (node) { wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph); wxASSERT (obj != NULL); wxRichTextObjectList::compatibility_iterator next = node->GetNext(); - + // Delete the range in each paragraph if (!obj->GetRange().IsOutside(range)) @@ -1208,64 +1471,88 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) // Deletes the content of this object within the given range obj->DeleteRange(range); + wxRichTextRange thisRange = obj->GetRange(); + wxTextAttrEx thisAttr = obj->GetAttributes(); + // If the whole paragraph is within the range to delete, // delete the whole thing. - if (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd()) + if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd()) { // Delete the whole object RemoveChild(obj, true); + obj = NULL; } + else if (!firstPara) + firstPara = obj; + // If the range includes the paragraph end, we need to join this // and the next paragraph. - else if (range.Contains(obj->GetRange().GetEnd())) + if (range.GetEnd() <= thisRange.GetEnd()) { // We need to move the objects from the next paragraph // to this paragraph - if (next) + wxRichTextParagraph* nextParagraph = NULL; + if ((range.GetEnd() < thisRange.GetEnd()) && obj) + nextParagraph = obj; + else { - wxRichTextParagraph* nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph); - next = next->GetNext(); - if (nextParagraph) - { - // Delete the stuff we need to delete - nextParagraph->DeleteRange(range); + // We're ending at the end of the paragraph, so merge the _next_ paragraph. + if (next) + nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph); + } - // Move the objects to the previous para - wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst(); + bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara; - while (node1) - { - wxRichTextObject* obj1 = node1->GetData(); + wxTextAttrEx nextParaAttr; + if (applyFinalParagraphStyle) + { + // Special case when deleting the end of a paragraph - use _this_ paragraph's style, + // not the next one. + if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd()) + nextParaAttr = thisAttr; + else + nextParaAttr = nextParagraph->GetAttributes(); + } - // If the object is empty, optimise it out - if (obj1->IsEmpty()) - { - delete obj1; - } - else - { - obj->AppendChild(obj1); - } + if (firstPara && nextParagraph && firstPara != nextParagraph) + { + // Move the objects to the previous para + wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst(); - wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); - delete node1; + while (node1) + { + wxRichTextObject* obj1 = node1->GetData(); - node1 = next1; - } + firstPara->AppendChild(obj1); - // Delete the paragraph - RemoveChild(nextParagraph, true); + wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); + nextParagraph->GetChildren().Erase(node1); + node1 = next1; } - } + // Delete the paragraph + RemoveChild(nextParagraph, true); + } + + // Avoid empty paragraphs + if (firstPara && firstPara->GetChildren().GetCount() == 0) + { + wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); + firstPara->AppendChild(text); + } + + if (applyFinalParagraphStyle) + firstPara->SetAttributes(nextParaAttr); + + return true; } } - + node = next; } - + return true; } @@ -1280,15 +1567,16 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra wxRichTextObject* child = node->GetData(); if (!child->GetRange().IsOutside(range)) { - if (lineCount > 0) - text += wxT("\n"); wxRichTextRange childRange = range; childRange.LimitTo(child->GetRange()); - + wxString childText = child->GetTextForRange(childRange); - + text += childText; + if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext()) + text += wxT("\n"); + lineCount ++; } node = node->GetNext(); @@ -1306,7 +1594,7 @@ wxString wxRichTextParagraphLayoutBox::GetText() const /// Get the paragraph by number wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtLine(long paragraphNumber) const { - if ((size_t) paragraphNumber <= GetChildCount()) + if ((size_t) paragraphNumber >= GetChildCount()) return NULL; return (wxRichTextParagraph*) GetChild((size_t) paragraphNumber); @@ -1378,13 +1666,13 @@ wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long pos if (para) { wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst(); - + while (node) { wxRichTextObject* child = node->GetData(); if (child->GetRange().Contains(position)) return child; - + node = node->GetNext(); } if (position == para->GetRange().GetEnd() && para->GetChildCount() > 0) @@ -1394,7 +1682,7 @@ wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long pos } /// Set character or paragraph text attributes: apply character styles only to immediate text nodes -bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, bool withUndo) +bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttr& style, int flags) { bool characterStyle = false; bool paragraphStyle = false; @@ -1404,13 +1692,41 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const if (style.IsParagraphStyle()) paragraphStyle = true; + bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); + bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); + bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0); + bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0); + bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0); + bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0); + + // Apply paragraph style first, if any + wxTextAttr wholeStyle(style); + + if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName()); + if (def) + wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(GetStyleSheet())); + } + + // Limit the attributes to be set to the content to only character attributes. + wxTextAttr characterAttributes(wholeStyle); + characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER)); + + if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet()) + { + wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName()); + if (def) + wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(GetStyleSheet())); + } + // If we are associated with a control, make undoable; otherwise, apply immediately // to the data. bool haveControl = (GetRichTextCtrl() != NULL); wxRichTextAction* action = NULL; - + if (haveControl && withUndo) { action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); @@ -1434,8 +1750,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { // We'll be using a copy of the paragraph to make style changes, // not updating the buffer directly. - wxRichTextParagraph* newPara = NULL; - + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); + if (haveControl && withUndo) { newPara = new wxRichTextParagraph(*para); @@ -1447,61 +1763,112 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const else newPara = para; - if (paragraphStyle) - wxRichTextApplyStyle(newPara->GetAttributes(), style); + // If we're specifying paragraphs only, then we really mean character formatting + // to be included in the paragraph style + if ((paragraphStyle || parasOnly) && !charactersOnly) + { + if (removeStyle) + { + // Removes the given style from the paragraph + wxRichTextRemoveStyle(newPara->GetAttributes(), style); + } + else if (resetExistingStyle) + newPara->GetAttributes() = wholeStyle; + else + { + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxTextAttr combinedAttr(para->GetCombinedAttributes()); + wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr); + } + else + wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle); + } + } + + // When applying paragraph styles dynamically, don't change the text objects' attributes + // since they will computed as needed. Only apply the character styling if it's _only_ + // character styling. This policy is subject to change and might be put under user control. - if (characterStyle && range.GetStart() != newPara->GetRange().GetEnd()) + // Hm. we might well be applying a mix of paragraph and character styles, in which + // case we _do_ want to apply character styles regardless of what para styles are set. + // But if we're applying a paragraph style, which has some character attributes, but + // we only want the paragraphs to hold this character style, then we _don't_ want to + // apply the character style. So we need to be able to choose. + + if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd()) { wxRichTextRange childRange(range); childRange.LimitTo(newPara->GetRange()); - + // Find the starting position and if necessary split it so // we can start applying a different style. // TODO: check that the style actually changes or is different // from style outside of range - wxRichTextObject* firstObject = NULL; - wxRichTextObject* lastObject = NULL; - + wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL); + wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL); + if (childRange.GetStart() == newPara->GetRange().GetStart()) firstObject = newPara->GetChildren().GetFirst()->GetData(); else firstObject = newPara->SplitAt(range.GetStart()); - + // Increment by 1 because we're apply the style one _after_ the split point long splitPoint = childRange.GetEnd(); if (splitPoint != newPara->GetRange().GetEnd()) splitPoint ++; - + // Find last object - if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1)) + if (splitPoint == newPara->GetRange().GetEnd()) lastObject = newPara->GetChildren().GetLast()->GetData(); else // lastObject is set as a side-effect of splitting. It's // returned as the object before the new object. (void) newPara->SplitAt(splitPoint, & lastObject); - + wxASSERT(firstObject != NULL); wxASSERT(lastObject != NULL); - + if (!firstObject || !lastObject) continue; - + wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject); wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject); - - wxASSERT(firstNode != NULL); - wxASSERT(lastNode != NULL); - + + wxASSERT(firstNode); + wxASSERT(lastNode); + wxRichTextObjectList::compatibility_iterator node2 = firstNode; - + while (node2) { wxRichTextObject* child = node2->GetData(); - - wxRichTextApplyStyle(child->GetAttributes(), style); + + if (removeStyle) + { + // Removes the given style from the paragraph + wxRichTextRemoveStyle(child->GetAttributes(), style); + } + else if (resetExistingStyle) + child->GetAttributes() = characterAttributes; + else + { + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr); + } + else + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes); + } + if (node2 == lastNode) break; - + node2 = node2->GetNext(); } } @@ -1518,63 +1885,999 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const return true; } -/// Set text attributes -bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, bool withUndo) +/// Get the text attributes for this position. +bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttr& style) { - wxRichTextAttr richStyle = style; - return SetStyle(range, richStyle, withUndo); + return DoGetStyle(position, style, true); } -/// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const +bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttr& style) { - wxRichTextObject* obj = NULL; + return DoGetStyle(position, style, false); +} + +/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and +/// context attributes. +bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttr& style, bool combineStyles) +{ + wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); + if (style.IsParagraphStyle()) + { obj = GetParagraphAtPosition(position); + if (obj) + { + if (combineStyles) + { + // Start with the base style + style = GetAttributes(); + + // Apply the paragraph style + wxRichTextApplyStyle(style, obj->GetAttributes()); + } + else + style = obj->GetAttributes(); + + return true; + } + } else - obj = GetLeafObjectAtPosition(position); - if (obj) { - style = obj->GetAttributes(); - return true; + obj = GetLeafObjectAtPosition(position); + if (obj) + { + if (combineStyles) + { + wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph); + style = para ? para->GetCombinedAttributes(obj->GetAttributes()) : obj->GetAttributes(); + } + else + style = obj->GetAttributes(); + + return true; + } } - else - return false; + return false; } -/// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const +static bool wxHasStyle(long flags, long style) { - wxRichTextObject* obj = NULL; - if (style.IsParagraphStyle()) - obj = GetParagraphAtPosition(position); - else - obj = GetLeafObjectAtPosition(position); - if (obj) + return (flags & style) != 0; +} + +/// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of +/// content. +bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttr& currentStyle, const wxTextAttr& style, long& multipleStyleAttributes, int& multipleTextEffectAttributes, int& absentStyleAttributes, int& absentTextEffectAttributes) +{ + absentStyleAttributes |= (~style.GetFlags() & wxTEXT_ATTR_ALL); + absentTextEffectAttributes |= (~style.GetTextEffectFlags() & 0xFFFF); + + if (style.HasFont()) { - style = obj->GetAttributes(); - return true; + if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_SIZE)) + { + if (currentStyle.HasFontSize()) + { + if (currentStyle.GetFontSize() != style.GetFontSize()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_SIZE); + } + } + else + { + currentStyle.SetFontSize(style.GetFontSize()); + } + } + + if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_ITALIC)) + { + if (currentStyle.HasFontItalic()) + { + if (currentStyle.GetFontStyle() != style.GetFontStyle()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_ITALIC); + } + } + else + { + currentStyle.SetFontStyle(style.GetFontStyle()); + } + } + + if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT)) + { + if (currentStyle.HasFontWeight()) + { + if (currentStyle.GetFontWeight() != style.GetFontWeight()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT); + } + } + else + { + currentStyle.SetFontWeight(style.GetFontWeight()); + } + } + + if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_FACE)) + { + if (currentStyle.HasFontFaceName()) + { + wxString faceName1(currentStyle.GetFontFaceName()); + wxString faceName2(style.GetFontFaceName()); + + if (faceName1 != faceName2) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_FACE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_FACE); + } + } + else + { + currentStyle.SetFontFaceName(style.GetFontFaceName()); + } + } + + if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE)) + { + if (currentStyle.HasFontUnderlined()) + { + if (currentStyle.GetFontUnderlined() != style.GetFontUnderlined()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_UNDERLINE); + } + } + else + { + currentStyle.SetFontUnderlined(style.GetFontUnderlined()); + } + } + } + + if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR)) + { + if (currentStyle.HasTextColour()) + { + if (currentStyle.GetTextColour() != style.GetTextColour()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_TEXT_COLOUR; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TEXT_COLOUR); + } + } + else + currentStyle.SetTextColour(style.GetTextColour()); + } + + if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR)) + { + if (currentStyle.HasBackgroundColour()) + { + if (currentStyle.GetBackgroundColour() != style.GetBackgroundColour()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BACKGROUND_COLOUR; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR); + } + } + else + currentStyle.SetBackgroundColour(style.GetBackgroundColour()); + } + + if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_ALIGNMENT)) + { + if (currentStyle.HasAlignment()) + { + if (currentStyle.GetAlignment() != style.GetAlignment()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_ALIGNMENT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_ALIGNMENT); + } + } + else + currentStyle.SetAlignment(style.GetAlignment()); + } + + if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_TABS)) + { + if (currentStyle.HasTabs()) + { + if (!wxRichTextTabsEq(currentStyle.GetTabs(), style.GetTabs())) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_TABS; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TABS); + } + } + else + currentStyle.SetTabs(style.GetTabs()); + } + + if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LEFT_INDENT)) + { + if (currentStyle.HasLeftIndent()) + { + if (currentStyle.GetLeftIndent() != style.GetLeftIndent() || currentStyle.GetLeftSubIndent() != style.GetLeftSubIndent()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_LEFT_INDENT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT); + } + } + else + currentStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); + } + + if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT)) + { + if (currentStyle.HasRightIndent()) + { + if (currentStyle.GetRightIndent() != style.GetRightIndent()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_RIGHT_INDENT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_RIGHT_INDENT); + } + } + else + currentStyle.SetRightIndent(style.GetRightIndent()); + } + + if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER)) + { + if (currentStyle.HasParagraphSpacingAfter()) + { + if (currentStyle.GetParagraphSpacingAfter() != style.GetParagraphSpacingAfter()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_AFTER); + } + } + else + currentStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); + } + + if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE)) + { + if (currentStyle.HasParagraphSpacingBefore()) + { + if (currentStyle.GetParagraphSpacingBefore() != style.GetParagraphSpacingBefore()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_BEFORE); + } + } + else + currentStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); + } + + if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LINE_SPACING)) + { + if (currentStyle.HasLineSpacing()) + { + if (currentStyle.GetLineSpacing() != style.GetLineSpacing()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LINE_SPACING); + } + } + else + currentStyle.SetLineSpacing(style.GetLineSpacing()); + } + + if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) + { + if (currentStyle.HasCharacterStyleName()) + { + if (currentStyle.GetCharacterStyleName() != style.GetCharacterStyleName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER_STYLE_NAME); + } + } + else + currentStyle.SetCharacterStyleName(style.GetCharacterStyleName()); + } + + if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME)) + { + if (currentStyle.HasParagraphStyleName()) + { + if (currentStyle.GetParagraphStyleName() != style.GetParagraphStyleName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARAGRAPH_STYLE_NAME); + } + } + else + currentStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + } + + if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME)) + { + if (currentStyle.HasListStyleName()) + { + if (currentStyle.GetListStyleName() != style.GetListStyleName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LIST_STYLE_NAME); + } + } + else + currentStyle.SetListStyleName(style.GetListStyleName()); + } + + if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_STYLE)) + { + if (currentStyle.HasBulletStyle()) + { + if (currentStyle.GetBulletStyle() != style.GetBulletStyle()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_STYLE); + } + } + else + currentStyle.SetBulletStyle(style.GetBulletStyle()); + } + + if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER)) + { + if (currentStyle.HasBulletNumber()) + { + if (currentStyle.GetBulletNumber() != style.GetBulletNumber()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NUMBER); + } + } + else + currentStyle.SetBulletNumber(style.GetBulletNumber()); + } + + if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_TEXT)) + { + if (currentStyle.HasBulletText()) + { + if (currentStyle.GetBulletText() != style.GetBulletText()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT); + } + } + else + { + currentStyle.SetBulletText(style.GetBulletText()); + currentStyle.SetBulletFont(style.GetBulletFont()); + } + } + + if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_NAME)) + { + if (currentStyle.HasBulletName()) + { + if (currentStyle.GetBulletName() != style.GetBulletName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME); + } + } + else + { + currentStyle.SetBulletName(style.GetBulletName()); + } + } + + if (style.HasURL() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_URL)) + { + if (currentStyle.HasURL()) + { + if (currentStyle.GetURL() != style.GetURL()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_URL; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL); + } + } + else + { + currentStyle.SetURL(style.GetURL()); + } + } + + if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_EFFECTS)) + { + if (currentStyle.HasTextEffects()) + { + // We need to find the bits in the new style that are different: + // just look at those bits that are specified by the new style. + + // We need to remove the bits and flags that are not common between current style + // and new style. In so doing we need to take account of the styles absent from one or more of the + // previous styles. + + int currentRelevantTextEffects = currentStyle.GetTextEffects() & style.GetTextEffectFlags(); + int newRelevantTextEffects = style.GetTextEffects() & style.GetTextEffectFlags(); + + if (currentRelevantTextEffects != newRelevantTextEffects) + { + // Find the text effects that were different, using XOR + int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects; + + // Clash of style - mark as such + multipleTextEffectAttributes |= differentEffects; + currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects); + } + } + else + { + currentStyle.SetTextEffects(style.GetTextEffects()); + currentStyle.SetTextEffectFlags(style.GetTextEffectFlags()); + } + + // Mask out the flags and values that cannot be common because they were absent in one or more objecrs + // that we've looked at so far + currentStyle.SetTextEffects(currentStyle.GetTextEffects() & ~absentTextEffectAttributes); + currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~absentTextEffectAttributes); + + if (currentStyle.GetTextEffectFlags() == 0) + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_EFFECTS); + } + + if (style.HasOutlineLevel() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_OUTLINE_LEVEL)) + { + if (currentStyle.HasOutlineLevel()) + { + if (currentStyle.GetOutlineLevel() != style.GetOutlineLevel()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_OUTLINE_LEVEL; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_OUTLINE_LEVEL); + } + } + else + currentStyle.SetOutlineLevel(style.GetOutlineLevel()); + } + + return true; +} + +/// Get the combined style for a range - if any attribute is different within the range, +/// that attribute is not present within the flags. +/// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself +/// nested. +bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style) +{ + style = wxTextAttr(); + + // The attributes that aren't valid because of multiple styles within the range + long multipleStyleAttributes = 0; + int multipleTextEffectAttributes = 0; + + int absentStyleAttributesPara = 0; + int absentStyleAttributesChar = 0; + int absentTextEffectAttributesPara = 0; + int absentTextEffectAttributesChar = 0; + + wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst(); + while (node) + { + wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData(); + if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart())) + { + if (para->GetChildren().GetCount() == 0) + { + wxTextAttr paraStyle = para->GetCombinedAttributes(); + + CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesPara, absentTextEffectAttributesPara); + } + else + { + wxRichTextRange paraRange(para->GetRange()); + paraRange.LimitTo(range); + + // First collect paragraph attributes only + wxTextAttr paraStyle = para->GetCombinedAttributes(); + paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH); + CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesPara, absentTextEffectAttributesPara); + + wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst(); + + while (childNode) + { + wxRichTextObject* child = childNode->GetData(); + if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart())) + { + wxTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes()); + + // Now collect character attributes only + childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER); + + CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesChar, absentTextEffectAttributesChar); + } + + childNode = childNode->GetNext(); + } + } + } + node = node->GetNext(); + } + return true; +} + +/// Set default style +bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttr& style) +{ + m_defaultAttributes = style; + return true; +} + +/// Test if this whole range has character attributes of the specified kind. If any +/// of the attributes are different within the range, the test fails. You +/// can use this to implement, for example, bold button updating. style must have +/// flags indicating which attributes are of interest. +bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttr& style) const +{ + int foundCount = 0; + int matchingCount = 0; + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); + + if (para) + { + // Stop searching if we're beyond the range of interest + if (para->GetRange().GetStart() > range.GetEnd()) + return foundCount == matchingCount; + + if (!para->GetRange().IsOutside(range)) + { + wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); + + while (node2) + { + wxRichTextObject* child = node2->GetData(); + if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) + { + foundCount ++; + wxTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes()); + + if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + matchingCount ++; + } + + node2 = node2->GetNext(); + } + } + } + + node = node->GetNext(); + } + + return foundCount == matchingCount; +} + +/// Test if this whole range has paragraph attributes of the specified kind. If any +/// of the attributes are different within the range, the test fails. You +/// can use this to implement, for example, centering button updating. style must have +/// flags indicating which attributes are of interest. +bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttr& style) const +{ + int foundCount = 0; + int matchingCount = 0; + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); + + if (para) + { + // Stop searching if we're beyond the range of interest + if (para->GetRange().GetStart() > range.GetEnd()) + return foundCount == matchingCount; + + if (!para->GetRange().IsOutside(range)) + { + wxTextAttr textAttr = GetAttributes(); + // Apply the paragraph style + wxRichTextApplyStyle(textAttr, para->GetAttributes()); + + foundCount ++; + if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + matchingCount ++; + } + } + + node = node->GetNext(); + } + return foundCount == matchingCount; +} + +void wxRichTextParagraphLayoutBox::Clear() +{ + DeleteChildren(); +} + +void wxRichTextParagraphLayoutBox::Reset() +{ + Clear(); + + wxRichTextBuffer* buffer = wxDynamicCast(this, wxRichTextBuffer); + if (buffer && GetRichTextCtrl()) + { + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, GetRichTextCtrl()->GetId()); + event.SetEventObject(GetRichTextCtrl()); + + buffer->SendEvent(event, true); + } + + AddParagraph(wxEmptyString); + + Invalidate(wxRICHTEXT_ALL); +} + +/// Invalidate the buffer. With no argument, invalidates whole buffer. +void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange) +{ + SetDirty(true); + + if (invalidRange == wxRICHTEXT_ALL) + { + m_invalidRange = wxRICHTEXT_ALL; + return; + } + + // Already invalidating everything + if (m_invalidRange == wxRICHTEXT_ALL) + return; + + if ((invalidRange.GetStart() < m_invalidRange.GetStart()) || m_invalidRange.GetStart() == -1) + m_invalidRange.SetStart(invalidRange.GetStart()); + if (invalidRange.GetEnd() > m_invalidRange.GetEnd()) + m_invalidRange.SetEnd(invalidRange.GetEnd()); +} + +/// Get invalid range, rounding to entire paragraphs if argument is true. +wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const +{ + if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE) + return m_invalidRange; + + wxRichTextRange range = m_invalidRange; + + if (wholeParagraphs) + { + wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart()); + wxRichTextParagraph* para2 = GetParagraphAtPosition(range.GetEnd()); + if (para1) + range.SetStart(para1->GetRange().GetStart()); + if (para2) + range.SetEnd(para2->GetRange().GetEnd()); + } + return range; +} + +/// Apply the style sheet to the buffer, for example if the styles have changed. +bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet) +{ + wxASSERT(styleSheet != NULL); + if (!styleSheet) + return false; + + int foundCount = 0; + + wxRichTextAttr attr(GetBasicStyle()); + if (GetBasicStyle().HasParagraphStyleName()) + { + wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName()); + if (paraDef) + { + attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet)); + SetBasicStyle(attr); + foundCount ++; + } + } + + if (GetBasicStyle().HasCharacterStyleName()) + { + wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName()); + if (charDef) + { + attr.Apply(charDef->GetStyleMergedWithBase(styleSheet)); + SetBasicStyle(attr); + foundCount ++; + } + } + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); + + if (para) + { + // Combine paragraph and list styles. If there is a list style in the original attributes, + // the current indentation overrides anything else and is used to find the item indentation. + // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have, + // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list + // exception as above). + // Problem: when changing from one list style to another, there's a danger that the level info will get lost. + // So when changing a list style interactively, could retrieve level based on current style, then + // set appropriate indent and apply new style. + + if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) + { + int currentIndent = para->GetAttributes().GetLeftIndent(); + + wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName()); + if (paraDef && !listDef) + { + para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet); + foundCount ++; + } + else if (listDef && !paraDef) + { + // Set overall style defined for the list style definition + para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet); + + // Apply the style for this level + wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent))); + foundCount ++; + } + else if (listDef && paraDef) + { + // Combines overall list style, style for level, and paragraph style + para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyleMergedWithBase(styleSheet)); + foundCount ++; + } + } + else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) + { + int currentIndent = para->GetAttributes().GetLeftIndent(); + + wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName()); + + // Overall list definition style + para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet); + + // Style for this level + wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent))); + + foundCount ++; + } + else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + if (def) + { + para->GetAttributes() = def->GetStyleMergedWithBase(styleSheet); + foundCount ++; + } + } + } + + node = node->GetNext(); + } + return foundCount != 0; +} + +/// Set list style +bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); + + bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); + // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); + bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); + bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); + + // Current number, if numbering + int n = startFrom; + + wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); + + // If we are associated with a control, make undoable; otherwise, apply immediately + // to the data. + + bool haveControl = (GetRichTextCtrl() != NULL); + + wxRichTextAction* action = NULL; + + if (haveControl && withUndo) + { + action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(range); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); + } + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); + + if (para && para->GetChildCount() > 0) + { + // Stop searching if we're beyond the range of interest + if (para->GetRange().GetStart() > range.GetEnd()) + break; + + if (!para->GetRange().IsOutside(range)) + { + // We'll be using a copy of the paragraph to make style changes, + // not updating the buffer directly. + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); + + if (haveControl && withUndo) + { + newPara = new wxRichTextParagraph(*para); + action->GetNewParagraphs().AppendChild(newPara); + + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + } + else + newPara = para; + + if (def) + { + int thisIndent = newPara->GetAttributes().GetLeftIndent(); + int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent); + + // How is numbering going to work? + // If we are renumbering, or numbering for the first time, we need to keep + // track of the number for each level. But we might be simply applying a different + // list style. + // In Word, applying a style to several paragraphs, even if at different levels, + // reverts the level back to the same one. So we could do the same here. + // Renumbering will need to be done when we promote/demote a paragraph. + + // Apply the overall list style, and item style for this level + wxTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); + + // Now we need to do numbering + if (renumber) + { + newPara->GetAttributes().SetBulletNumber(n); + } + + n ++; + } + else if (!newPara->GetAttributes().GetListStyleName().IsEmpty()) + { + // if def is NULL, remove list style, applying any associated paragraph style + // to restore the attributes + + newPara->GetAttributes().SetListStyleName(wxEmptyString); + newPara->GetAttributes().SetLeftIndent(0, 0); + newPara->GetAttributes().SetBulletText(wxEmptyString); + + // Eliminate the main list-related attributes + newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_TEXT & wxTEXT_ATTR_LIST_STYLE_NAME); + + if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName()); + if (def) + { + newPara->GetAttributes() = def->GetStyleMergedWithBase(styleSheet); + } + } + } + } + } + + node = node->GetNext(); + } + + // Do action, or delay it until end of batch. + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); + + return true; +} + +bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) +{ + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName); + if (def) + return SetListStyle(range, def, flags, startFrom, specifiedLevel); } - else - return false; + return false; } -/// Set default style -bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style) +/// Clear list for given range +bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags) { - m_defaultAttributes = style; + return SetListStyle(range, NULL, flags); +} - return true; +/// Number/renumber any list elements in the given range +bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + return DoNumberList(range, range, 0, def, flags, startFrom, specifiedLevel); } -/// Test if this whole range has character attributes of the specified kind. If any -/// of the attributes are different within the range, the test fails. You -/// can use this to implement, for example, bold button updating. style must have -/// flags indicating which attributes are of interest. -bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const +/// Number/renumber any list elements in the given range. Also do promotion or demotion of items, if specified +bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy, + wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) { - int foundCount = 0; - int matchingCount = 0; + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); + + bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); + // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); +#ifdef __WXDEBUG__ + bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); +#endif + + bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); + + // Max number of levels + const int maxLevels = 10; + + // The level we're looking at now + int currentLevel = -1; + + // The item number for each level + int levels[maxLevels]; + int i; + + // Reset all numbering + for (i = 0; i < maxLevels; i++) + { + if (startFrom != -1) + levels[i] = startFrom-1; + else if (renumber) // start again + levels[i] = 0; + else + levels[i] = -1; // start from the number we found, if any + } + + wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); + + // If we are associated with a control, make undoable; otherwise, apply immediately + // to the data. + + bool haveControl = (GetRichTextCtrl() != NULL); + + wxRichTextAction* action = NULL; + + if (haveControl && withUndo) + { + action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(range); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); + } wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) @@ -1582,27 +2885,109 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); wxASSERT (para != NULL); - if (para) + if (para && para->GetChildCount() > 0) { // Stop searching if we're beyond the range of interest if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; + break; if (!para->GetRange().IsOutside(range)) { - wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); + // We'll be using a copy of the paragraph to make style changes, + // not updating the buffer directly. + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); - while (node2) + if (haveControl && withUndo) { - wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) + newPara = new wxRichTextParagraph(*para); + action->GetNewParagraphs().AppendChild(newPara); + + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + } + else + newPara = para; + + wxRichTextListStyleDefinition* defToUse = def; + if (!defToUse) + { + if (styleSheet && !newPara->GetAttributes().GetListStyleName().IsEmpty()) + defToUse = styleSheet->FindListStyle(newPara->GetAttributes().GetListStyleName()); + } + + if (defToUse) + { + int thisIndent = newPara->GetAttributes().GetLeftIndent(); + int thisLevel = defToUse->FindLevelForIndent(thisIndent); + + // If we've specified a level to apply to all, change the level. + if (specifiedLevel != -1) + thisLevel = specifiedLevel; + + // Do promotion if specified + if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange)) { - foundCount ++; - if (wxTextAttrEqPartial(child->GetAttributes(), style, style.GetFlags())) - matchingCount ++; + thisLevel = thisLevel - promoteBy; + if (thisLevel < 0) + thisLevel = 0; + if (thisLevel > 9) + thisLevel = 9; } - node2 = node2->GetNext(); + // Apply the overall list style, and item style for this level + wxTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); + + // OK, we've (re)applied the style, now let's get the numbering right. + + if (currentLevel == -1) + currentLevel = thisLevel; + + // Same level as before, do nothing except increment level's number afterwards + if (currentLevel == thisLevel) + { + } + // A deeper level: start renumbering all levels after current level + else if (thisLevel > currentLevel) + { + for (i = currentLevel+1; i <= thisLevel; i++) + { + levels[i] = 0; + } + currentLevel = thisLevel; + } + else if (thisLevel < currentLevel) + { + currentLevel = thisLevel; + } + + // Use the current numbering if -1 and we have a bullet number already + if (levels[currentLevel] == -1) + { + if (newPara->GetAttributes().HasBulletNumber()) + levels[currentLevel] = newPara->GetAttributes().GetBulletNumber(); + else + levels[currentLevel] = 1; + } + else + { + levels[currentLevel] ++; + } + + newPara->GetAttributes().SetBulletNumber(levels[currentLevel]); + + // Create the bullet text if an outline list + if (listStyle.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + wxString text; + for (i = 0; i <= currentLevel; i++) + { + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), levels[i]); + } + newPara->GetAttributes().SetBulletText(text); + } } } } @@ -1610,87 +2995,108 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& node = node->GetNext(); } - return foundCount == matchingCount; -} + // Do action, or delay it until end of batch. + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); -bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const -{ - wxRichTextAttr richStyle = style; - return HasCharacterAttributes(range, richStyle); + return true; } -/// Test if this whole range has paragraph attributes of the specified kind. If any -/// of the attributes are different within the range, the test fails. You -/// can use this to implement, for example, centering button updating. style must have -/// flags indicating which attributes are of interest. -bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const +bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) { - int foundCount = 0; - int matchingCount = 0; - - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) + if (GetStyleSheet()) { - wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (para != NULL); - - if (para) - { - // Stop searching if we're beyond the range of interest - if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; - - if (!para->GetRange().IsOutside(range)) - { - foundCount ++; - if (wxTextAttrEqPartial(para->GetAttributes(), style, style.GetFlags())) - matchingCount ++; - } - } - - node = node->GetNext(); + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return NumberList(range, def, flags, startFrom, specifiedLevel); } - return foundCount == matchingCount; + return false; } -bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const +/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1 +bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel) { - wxRichTextAttr richStyle = style; - return HasParagraphAttributes(range, richStyle); + // TODO + // One strategy is to first work out the range within which renumbering must occur. Then could pass these two ranges + // to NumberList with a flag indicating promotion is required within one of the ranges. + // Find first and last paragraphs in range. Then for first, calculate new indentation and look back until we find + // a paragraph that either has no list style, or has one that is different or whose indentation is less. + // We start renumbering from the para after that different para we found. We specify that the numbering of that + // list position will start from 1. + // Similarly, we look after the last para in the promote range for an indentation that is less (or no list style). + // We can end the renumbering at this point. + + // For now, only renumber within the promotion range. + + return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel); } -void wxRichTextParagraphLayoutBox::Clear() +bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel) { - DeleteChildren(); + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return PromoteList(promoteBy, range, def, flags, specifiedLevel); + } + return false; } -void wxRichTextParagraphLayoutBox::Reset() +/// Fills in the attributes for numbering a paragraph after previousParagraph. It also finds the +/// position of the paragraph that it had to start looking from. +bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxTextAttr& attr) const { - Clear(); + if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) + return false; - AddParagraph(wxT("")); -} + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); + if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty()) + { + wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName()); + if (def) + { + // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent(); + // int thisLevel = def->FindLevelForIndent(thisIndent); -/*! - * wxRichTextFragment class declaration - * This is a lind of paragraph layout box used for storing - * paragraphs for Undo/Redo, for example. - */ + bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0; -IMPLEMENT_DYNAMIC_CLASS(wxRichTextFragment, wxRichTextParagraphLayoutBox) + attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME)); + if (previousParagraph->GetAttributes().HasBulletName()) + attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName()); + attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle()); + attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName()); -/// Initialise -void wxRichTextFragment::Init() -{ - m_partialParagraph = false; -} + int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1; + attr.SetBulletNumber(nextNumber); -/// Copy -void wxRichTextFragment::Copy(const wxRichTextFragment& obj) -{ - wxRichTextParagraphLayoutBox::Copy(obj); + if (isOutline) + { + wxString text = previousParagraph->GetAttributes().GetBulletText(); + if (!text.IsEmpty()) + { + int pos = text.Find(wxT('.'), true); + if (pos != wxNOT_FOUND) + { + text = text.Mid(0, text.Length() - pos - 1); + } + else + text = wxEmptyString; + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), nextNumber); + attr.SetBulletText(text); + } + } - m_partialParagraph = obj.m_partialParagraph; + return true; + } + else + return false; + } + else + return false; } /*! @@ -1700,24 +3106,22 @@ void wxRichTextFragment::Copy(const wxRichTextFragment& obj) IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox) -wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style): +wxArrayInt wxRichTextParagraph::sm_defaultTabs; + +wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttr* style): wxRichTextBox(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); if (style) SetAttributes(*style); } -wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): +wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttr* paraStyle, wxTextAttr* charStyle): wxRichTextBox(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); - if (style) - SetAttributes(*style); + if (paraStyle) + SetAttributes(*paraStyle); - AppendChild(new wxRichTextPlainText(text, this)); + AppendChild(new wxRichTextPlainText(text, this, charStyle)); } wxRichTextParagraph::~wxRichTextParagraph() @@ -1726,138 +3130,191 @@ wxRichTextParagraph::~wxRichTextParagraph() } /// Draw the item -bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) +bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int style) { + wxTextAttr attr = GetCombinedAttributes(); + // Draw the bullet, if any - if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) + if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) { - if (GetAttributes().GetLeftSubIndent() != 0) + if (attr.GetLeftSubIndent() != 0) { - int spaceBeforePara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingBefore()); - // int spaceAfterPara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingAfter()); - int leftIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftIndent()); - // int leftSubIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftSubIndent()); - // int rightIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetRightIndent()); + int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); + int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); + + wxTextAttr bulletAttr(GetCombinedAttributes()); + + // Combine with the font of the first piece of content, if one is specified + if (GetChildren().GetCount() > 0) + { + wxRichTextObject* firstObj = (wxRichTextObject*) GetChildren().GetFirst()->GetData(); + if (firstObj->GetAttributes().HasFont()) + { + wxRichTextApplyStyle(bulletAttr, firstObj->GetAttributes()); + } + } + + // Get line height from first line, if any + wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; - if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) + wxPoint linePos; + int lineHeight wxDUMMY_INITIALIZE(0); + if (line) { - // TODO + lineHeight = line->GetSize().y; + linePos = line->GetPosition() + GetPosition(); + } + else + { + wxFont font; + if (bulletAttr.HasFont() && GetBuffer()) + font = GetBuffer()->GetFontTable().FindFont(bulletAttr); + else + font = (*wxNORMAL_FONT); + + wxCheckSetFont(dc, font); + + lineHeight = dc.GetCharHeight(); + linePos = GetPosition(); + linePos.y += spaceBeforePara; + } + + wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight); + + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) + { + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect); + } + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD) + { + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect); } else { wxString bulletText = GetBulletText(); - if (!bulletText.IsEmpty()) - { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); - - if (GetAttributes().GetTextColour().Ok()) - dc.SetTextForeground(GetAttributes().GetTextColour()); - - dc.SetBackgroundMode(wxTRANSPARENT); - - // Get line height from first line, if any - wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; - - wxPoint linePos; - int lineHeight = 0; - if (line) - { - lineHeight = line->GetSize().y; - linePos = line->GetPosition() + GetPosition(); - } - else - { - lineHeight = dc.GetCharHeight(); - linePos = GetPosition(); - linePos.y += spaceBeforePara; - } - - int charHeight = dc.GetCharHeight(); - - int x = GetPosition().x + leftIndent; - int y = linePos.y + (lineHeight - charHeight); - - dc.DrawText(bulletText, x, y); - } + + if (!bulletText.empty() && wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText); } } } - + // Draw the range for each line, one object at a time. wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); while (node) { wxRichTextLine* line = node->GetData(); - - int maxDescent = line->GetDescent(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); // Lines are specified relative to the paragraph wxPoint linePosition = line->GetPosition() + GetPosition(); - wxPoint objectPosition = linePosition; - // Loop through objects until we get to the one within range - wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - while (node2) + // Don't draw if off the screen + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) != 0) || ((linePosition.y + line->GetSize().y) >= rect.y && linePosition.y <= rect.y + rect.height)) { - wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(line->GetRange())) + wxPoint objectPosition = linePosition; + int maxDescent = line->GetDescent(); + + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); + + int i = 0; + while (node2) { - // Draw this part of the line at the correct position - wxRichTextRange objectRange(child->GetRange()); - objectRange.LimitTo(line->GetRange()); + wxRichTextObject* child = node2->GetData(); - wxSize objectSize; - int descent = 0; - child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED); + if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) + { + // Draw this part of the line at the correct position + wxRichTextRange objectRange(child->GetRange()); + objectRange.LimitTo(lineRange); - // Use the child object's width, but the whole line's height - wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); - child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); + wxSize objectSize; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (i < (int) line->GetObjectSizes().GetCount()) + { + objectSize.x = line->GetObjectSizes()[(size_t) i]; + } + else +#endif + { + int descent = 0; + child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); + } - objectPosition.x += objectSize.x; - } - else if (child->GetRange().GetStart() > line->GetRange().GetEnd()) - // Can break out of inner loop now since we've passed this line's range - break; + // Use the child object's width, but the whole line's height + wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); + child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); - node2 = node2->GetNext(); + objectPosition.x += objectSize.x; + i ++; + } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; + + node2 = node2->GetNext(); + } } node = node->GetNext(); - } + } return true; } +// Get the range width using partial extents calculated for the whole paragraph. +static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents) +{ + wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength()); + + if (partialExtents.GetCount() < (size_t) range.GetLength()) + return 0; + + int leftMostPos = 0; + if (range.GetStart() - para.GetRange().GetStart() > 0) + leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1]; + + int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()]; + + int w = rightMostPos - leftMostPos; + + return w; +} + /// Lay the item out bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { - ClearLines(); + wxTextAttr attr = GetCombinedAttributes(); + + // ClearLines(); // Increase the size of the paragraph due to spacing - int spaceBeforePara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingBefore()); - int spaceAfterPara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingAfter()); - int leftIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftIndent()); - int leftSubIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftSubIndent()); - int rightIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetRightIndent()); + int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); + int spaceAfterPara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingAfter()); + int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); + int leftSubIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftSubIndent()); + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); int lineSpacing = 0; // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc. - if (GetAttributes().GetLineSpacing() > 10 && GetAttributes().GetFont().Ok()) + if (attr.GetLineSpacing() != 10 && GetBuffer()) { - dc.SetFont(GetAttributes().GetFont()); - lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * GetAttributes().GetLineSpacing())/10; + wxFont font(GetBuffer()->GetFontTable().FindFont(attr)); + wxCheckSetFont(dc, font); + lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10; } // Available space for text on each line differs. int availableTextSpaceFirstLine = rect.GetWidth() - leftIndent - rightIndent; // Bullets start the text at the same position as subsequent lines - if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) + if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) availableTextSpaceFirstLine -= leftSubIndent; int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent; @@ -1868,12 +3325,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // If we have a bullet in this paragraph, the start position for the first line's text // is actually leftIndent + leftSubIndent. - if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) + if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) startPositionFirstLine = startPositionSubsequentLines; - //bool restrictWidth = wxRichTextHasStyle(style, wxRICHTEXT_FIXED_WIDTH); - //bool restrictHeight = wxRichTextHasStyle(style, wxRICHTEXT_FIXED_HEIGHT); - long lastEndPos = GetRange().GetStart()-1; long lastCompletedEndPos = lastEndPos; @@ -1887,17 +3341,48 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) int lineCount = 0; + wxRichTextObjectList::compatibility_iterator node; + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxUnusedVar(style); + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents); +#else + node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + + child->SetCachedSize(wxDefaultSize); + child->Layout(dc, rect, style); + + node = node->GetNext(); + } + +#endif + // Split up lines // We may need to go back to a previous child, in which case create the new line, // find the child corresponding to the start position of the string, and // continue. - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + node = m_children.GetFirst(); while (node) { wxRichTextObject* child = node->GetData(); + if (child->GetRange().GetLength() == 0) + { + node = node->GetNext(); + continue; + } + // If this is e.g. a composite text box, it will need to be laid out itself. // But if just a text fragment or image, for example, this will // do nothing. NB: won't we need to set the position after layout? @@ -1905,8 +3390,6 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // can't tell the position until the size is determined. So possibly introduce // another layout phase. - child->Layout(dc, rect, style); - // Available width depends on whether we're on the first or subsequent lines int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines); @@ -1916,23 +3399,45 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // and found a suitable point some way into the child. So get the size for the fragment // if necessary. + long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1); + long lastPosToUse = child->GetRange().GetEnd(); + bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd()); + + if (lineBreakInThisObject) + lastPosToUse = nextBreakPos; + wxSize childSize; int childDescent = 0; - if (lastEndPos == child->GetRange().GetStart() - 1) + + if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing { childSize = child->GetCachedSize(); childDescent = child->GetDescent(); } else - GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); + { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents); +#else + GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition()); +#endif + } - if (childSize.x + currentWidth > availableSpaceForText) + // Cases: + // 1) There was a line break BEFORE the natural break + // 2) There was a line break AFTER the natural break + // 3) The child still fits (carry on) + + if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableSpaceForText)) || + (childSize.x + currentWidth > availableSpaceForText)) { long wrapPosition = 0; // Find a place to wrap. This may walk back to previous children, // for example if a word spans several objects. - if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition)) + if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition, & partialExtents)) { // If the function failed, just cut it off at the end of this child. wrapPosition = child->GetRange().GetEnd(); @@ -1943,36 +3448,44 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd()); // wxLogDebug(wxT("Split at %ld"), wrapPosition); - + // Let's find the actual size of the current line now wxSize actualSize; wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition); + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents); +#else GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); +#endif + currentWidth = actualSize.x; lineHeight = wxMax(lineHeight, actualSize.y); maxDescent = wxMax(childDescent, maxDescent); - + // Add a new line - wxRichTextLine* line = new wxRichTextLine(this); - line->SetRange(actualRange); + wxRichTextLine* line = AllocateLine(lineCount); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); line->SetPosition(currentPosition); line->SetSize(wxSize(currentWidth, lineHeight)); line->SetDescent(maxDescent); - m_cachedLines.Append(line); - // Now move down a line. TODO: add margins, spacing currentPosition.y += lineHeight; currentPosition.y += lineSpacing; currentWidth = 0; maxDescent = 0; - maxWidth = wxMax(maxWidth, currentWidth); - + maxWidth = wxMax(maxWidth, currentWidth); + lineCount ++; // TODO: account for zero-length objects, such as fields wxASSERT(wrapPosition > lastCompletedEndPos); - + lastEndPos = wrapPosition; lastCompletedEndPos = lastEndPos; @@ -2005,15 +3518,19 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); - wxRichTextLine* line = new wxRichTextLine(this); - - line->SetRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); + wxRichTextLine* line = AllocateLine(lineCount); + + wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); + line->SetPosition(currentPosition); - if (lineHeight == 0) + if (lineHeight == 0 && GetBuffer()) { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + wxFont font(GetBuffer()->GetFontTable().FindFont(attr)); + wxCheckSetFont(dc, font); lineHeight = dc.GetCharHeight(); } if (maxDescent == 0) @@ -2027,24 +3544,67 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) currentPosition.y += lineHeight; currentPosition.y += lineSpacing; lineCount ++; - - m_cachedLines.Append(line); } + // Remove remaining unused line objects, if any + ClearUnusedLines(lineCount); + // Apply styles to wrapped lines - ApplyParagraphStyle(rect); + ApplyParagraphStyle(attr, rect, dc); SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara)); m_dirty = false; +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + // Use the text extents to calculate the size of each fragment in each line + wxRichTextLineList::compatibility_iterator lineNode = m_cachedLines.GetFirst(); + while (lineNode) + { + wxRichTextLine* line = lineNode->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); + + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); + + while (node2) + { + wxRichTextObject* child = node2->GetData(); + + if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange)) + { + wxRichTextRange rangeToUse = lineRange; + rangeToUse.LimitTo(child->GetRange()); + + // Find the size of the child from the text extents, and store in an array + // for drawing later + int left = 0; + if (rangeToUse.GetStart() > GetRange().GetStart()) + left = partialExtents[(rangeToUse.GetStart()-1) - GetRange().GetStart()]; + int right = partialExtents[rangeToUse.GetEnd() - GetRange().GetStart()]; + int sz = right - left; + line->GetObjectSizes().Add(sz); + } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; + + node2 = node2->GetNext(); + } + + lineNode = lineNode->GetNext(); + } +#endif +#endif + return true; } /// Apply paragraph styles, such as centering, to wrapped lines -void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect) +void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRect& rect, wxDC& dc) { - if (!GetAttributes().HasAlignment()) + if (!attr.HasAlignment()) return; wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); @@ -2056,14 +3616,16 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect) wxSize size = line->GetSize(); // centering, right-justification - if (GetAttributes().HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) + if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) { - pos.x = (rect.GetWidth() - size.x)/2 + pos.x; + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + pos.x = (rect.GetWidth() - (pos.x - rect.x) - rightIndent - size.x)/2 + pos.x; line->SetPosition(pos); } - else if (GetAttributes().HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) + else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) { - pos.x = rect.GetRight() - size.x; + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + pos.x = rect.x + rect.GetWidth() - size.x - rightIndent; line->SetPosition(pos); } @@ -2075,7 +3637,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect) bool wxRichTextParagraph::InsertText(long pos, const wxString& text) { wxRichTextObject* childToUse = NULL; - wxRichTextObjectList::compatibility_iterator nodeToUse = NULL; + wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator(); wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) @@ -2102,7 +3664,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text) text + textObject->GetText().Mid(posInString); textObject->SetText(newText); - int textLength = text.Length(); + int textLength = text.length(); textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(), textObject->GetRange().GetEnd() + textLength)); @@ -2116,7 +3678,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text) wxRichTextObject* child = node->GetData(); child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength, textObject->GetRange().GetEnd() + textLength)); - + node = node->GetNext(); } @@ -2154,7 +3716,7 @@ void wxRichTextParagraph::ClearLines() /// Get/set the object size for the given range. Returns false if the range /// is invalid for this object. -bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const +bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const { if (!range.IsWithin(GetRange())) return false; @@ -2166,24 +3728,67 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxSize sz; + wxArrayInt childExtents; + wxArrayInt* p; + if (partialExtents) + p = & childExtents; + else + p = NULL; + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { + wxRichTextObject* child = node->GetData(); if (!child->GetRange().IsOutside(range)) { wxSize childSize; - + wxRichTextRange rangeToUse = range; rangeToUse.LimitTo(child->GetRange()); int childDescent = 0; - - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags)) + + // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size, + // but it's only going to be used after caching has taken place. + if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0) + { + childDescent = child->GetDescent(); + childSize = child->GetCachedSize(); + + sz.y = wxMax(sz.y, childSize.y); + sz.x += childSize.x; + descent = wxMax(descent, childDescent); + } + else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p)) { sz.y = wxMax(sz.y, childSize.y); sz.x += childSize.x; descent = wxMax(descent, childDescent); + + if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange())) + { + child->SetCachedSize(childSize); + child->SetDescent(childDescent); + } + + if (partialExtents) + { + int lastSize; + if (partialExtents->GetCount() > 0) + lastSize = (*partialExtents)[partialExtents->GetCount()-1]; + else + lastSize = 0; + + size_t i; + for (i = 0; i < childExtents.GetCount(); i++) + { + partialExtents->Add(childExtents[i] + lastSize); + } + } } + + if (p) + p->Clear(); } node = node->GetNext(); @@ -2206,30 +3811,31 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz while (node) { wxRichTextLine* line = node->GetData(); - if (!line->GetRange().IsOutside(range)) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (!lineRange.IsOutside(range)) { wxSize lineSize; - + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); while (node2) { wxRichTextObject* child = node2->GetData(); - - if (!child->GetRange().IsOutside(line->GetRange())) + + if (!child->GetRange().IsOutside(lineRange)) { - wxRichTextRange rangeToUse = line->GetRange(); + wxRichTextRange rangeToUse = lineRange; rangeToUse.LimitTo(child->GetRange()); - + wxSize childSize; int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags)) + if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y))) { lineSize.y = wxMax(lineSize.y, childSize.y); lineSize.x += childSize.x; } descent = wxMax(descent, childDescent); } - + node2 = node2->GetNext(); } @@ -2260,8 +3866,6 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h if (line) pt = pt + line->GetPosition(); - *height = dc.GetCharHeight(); - return true; } @@ -2296,12 +3900,13 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h while (node) { wxRichTextLine* line = node->GetData(); - if (index >= line->GetRange().GetStart() && index <= line->GetRange().GetEnd()) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (index >= lineRange.GetStart() && index <= lineRange.GetEnd()) { // If this is the last point in the line, and we're forcing the // returned value to be the start of the next line, do the required // thing. - if (index == line->GetRange().GetEnd() && forceLineStart) + if (index == lineRange.GetEnd() && forceLineStart) { if (node->GetNext()) { @@ -2314,7 +3919,7 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h pt.y = line->GetPosition().y + GetPosition().y; - wxRichTextRange r(line->GetRange().GetStart(), index); + wxRichTextRange r(lineRange.GetStart(), index); wxSize rangeSize; int descent = 0; @@ -2322,7 +3927,7 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h // then we can add this size to the line start position and // paragraph start position to find the actual position. - if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED)) + if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition())) { pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x; *height = line->GetSize().y; @@ -2350,31 +3955,65 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition wxRichTextLine* line = node->GetData(); wxPoint linePos = paraPos + line->GetPosition(); wxSize lineSize = line->GetSize(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y) + if (pt.y <= linePos.y + lineSize.y) { if (pt.x < linePos.x) { - textPosition = line->GetRange().GetStart(); - return wxRICHTEXT_HITTEST_BEFORE; + textPosition = lineRange.GetStart(); + return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE; } else if (pt.x >= (linePos.x + lineSize.x)) { - textPosition = line->GetRange().GetEnd(); - return wxRICHTEXT_HITTEST_AFTER; + textPosition = lineRange.GetEnd(); + return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE; } else { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & partialExtents); + + int lastX = linePos.x; + size_t i; + for (i = 0; i < partialExtents.GetCount(); i++) + { + int nextX = partialExtents[i] + linePos.x; + + if (pt.x >= lastX && pt.x <= nextX) + { + textPosition = i + lineRange.GetStart(); // minus 1? + + // So now we know it's between i-1 and i. + // Let's see if we can be more precise about + // which side of the position it's on. + + int midPoint = (nextX - lastX)/2 + lastX; + if (pt.x >= midPoint) + return wxRICHTEXT_HITTEST_AFTER; + else + return wxRICHTEXT_HITTEST_BEFORE; + } + + lastX = nextX; + } +#else long i; int lastX = linePos.x; - for (i = line->GetRange().GetStart(); i <= line->GetRange().GetEnd(); i++) + for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++) { wxSize childSize; int descent = 0; - - wxRichTextRange rangeToUse(line->GetRange().GetStart(), i); - - GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED); + + wxRichTextRange rangeToUse(lineRange.GetStart(), i); + + GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos); int nextX = childSize.x + linePos.x; @@ -2397,9 +4036,10 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition lastX = nextX; } } +#endif } } - + node = node->GetNext(); } @@ -2418,7 +4058,12 @@ wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** prev if (pos == child->GetRange().GetStart()) { if (previousObject) - *previousObject = child; + { + if (node->GetPrevious()) + *previousObject = node->GetPrevious()->GetData(); + else + *previousObject = NULL; + } return child; } @@ -2478,7 +4123,7 @@ void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list) /// Add content back from list void wxRichTextParagraph::MoveFromList(wxList& list) { - for (wxNode* node = list.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { AppendChild((wxRichTextObject*) node->GetData()); } @@ -2504,7 +4149,7 @@ wxRichTextObject* wxRichTextParagraph::FindObjectAtPosition(long position) wxRichTextObject* obj = node->GetData(); if (obj->GetRange().Contains(position)) return obj; - + node = node->GetNext(); } return NULL; @@ -2530,7 +4175,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text += textObj->GetTextForRange(range); } else - return true; + { + text += wxT(" "); + } } node = node->GetNext(); @@ -2550,7 +4197,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text = textObj->GetTextForRange(range) + text; } else - return true; + { + text = wxT(" ") + text; + } } node = node->GetPrevious(); @@ -2561,21 +4210,85 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex } /// Find a suitable wrap position. -bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition) +bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents) { + if (range.GetLength() <= 0) + return false; + // Find the first position where the line exceeds the available space. wxSize sz; - long i; long breakPosition = range.GetEnd(); - for (i = range.GetStart(); i <= range.GetEnd(); i++) + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (partialExtents && partialExtents->GetCount() >= (size_t) (GetRange().GetLength()-1)) // the final position in a paragraph is the newline { - int descent = 0; - GetRangeSize(wxRichTextRange(range.GetStart(), i), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + int widthBefore; + + if (range.GetStart() > GetRange().GetStart()) + widthBefore = (*partialExtents)[range.GetStart() - GetRange().GetStart() - 1]; + else + widthBefore = 0; - if (sz.x > availableSpace) + size_t i; + for (i = (size_t) range.GetStart(); i <= (size_t) range.GetEnd(); i++) { - breakPosition = i-1; - break; + int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore; + + if (widthFromStartOfThisRange > availableSpace) + { + breakPosition = i-1; + break; + } + } + } + else +#endif + { + // Binary chop for speed + long minPos = range.GetStart(); + long maxPos = range.GetEnd(); + while (true) + { + if (minPos == maxPos) + { + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + breakPosition = minPos - 1; + break; + } + else if ((maxPos - minPos) == 1) + { + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + breakPosition = minPos - 1; + else + { + GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + if (sz.x > availableSpace) + breakPosition = maxPos-1; + } + break; + } + else + { + long nextPos = minPos + ((maxPos - minPos) / 2); + + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + { + maxPos = nextPos; + } + else + { + minPos = nextPos; + } + } } } @@ -2585,11 +4298,21 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d wxString plainText; if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false)) { - int spacePos = plainText.Find(wxT(' '), true); - if (spacePos != wxNOT_FOUND) + int newLinePos = plainText.Find(wxRichTextLineBreakChar); + if (newLinePos != wxNOT_FOUND) + { + breakPosition = wxMax(0, range.GetStart() + newLinePos); + } + else { - int positionsFromEndOfString = plainText.Length() - spacePos - 1; - breakPosition = breakPosition - positionsFromEndOfString; + int spacePos = plainText.Find(wxT(' '), true); + int tabPos = plainText.Find(wxT('\t'), true); + int pos = wxMax(spacePos, tabPos); + if (pos != wxNOT_FOUND) + { + int positionsFromEndOfString = plainText.length() - pos - 1; + breakPosition = breakPosition - positionsFromEndOfString; + } } } @@ -2608,7 +4331,7 @@ wxString wxRichTextParagraph::GetBulletText() int number = GetAttributes().GetBulletNumber(); wxString text; - if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) + if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)) { text.Printf(wxT("%d"), number); } @@ -2624,41 +4347,37 @@ wxString wxRichTextParagraph::GetBulletText() } else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER) { - // TODO: convert from number to roman numeral - if (number == 1) - text = wxT("I"); - else if (number == 2) - text = wxT("II"); - else if (number == 3) - text = wxT("III"); - else if (number == 4) - text = wxT("IV"); - else - text = wxT("TODO"); + text = wxRichTextDecimalToRoman(number); } else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER) { - // TODO: convert from number to roman numeral - if (number == 1) - text = wxT("i"); - else if (number == 2) - text = wxT("ii"); - else if (number == 3) - text = wxT("iii"); - else if (number == 4) - text = wxT("iv"); - else - text = wxT("TODO"); + text = wxRichTextDecimalToRoman(number); + text.MakeLower(); } else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) { - text = GetAttributes().GetBulletSymbol(); + text = GetAttributes().GetBulletText(); + } + + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + // The outline style relies on the text being computed statically, + // since it depends on other levels points (e.g. 1.2.1.1). So normally the bullet text + // should be stored in the attributes; if not, just use the number for this + // level, as previously computed. + if (!GetAttributes().GetBulletText().IsEmpty()) + text = GetAttributes().GetBulletText(); } if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES) { text = wxT("(") + text + wxT(")"); } + else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS) + { + text = text + wxT(")"); + } + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD) { text += wxT("."); @@ -2667,6 +4386,111 @@ wxString wxRichTextParagraph::GetBulletText() return text; } +/// Allocate or reuse a line object +wxRichTextLine* wxRichTextParagraph::AllocateLine(int pos) +{ + if (pos < (int) m_cachedLines.GetCount()) + { + wxRichTextLine* line = m_cachedLines.Item(pos)->GetData(); + line->Init(this); + return line; + } + else + { + wxRichTextLine* line = new wxRichTextLine(this); + m_cachedLines.Append(line); + return line; + } +} + +/// Clear remaining unused line objects, if any +bool wxRichTextParagraph::ClearUnusedLines(int lineCount) +{ + int cachedLineCount = m_cachedLines.GetCount(); + if ((int) cachedLineCount > lineCount) + { + for (int i = 0; i < (int) (cachedLineCount - lineCount); i ++) + { + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetLast(); + wxRichTextLine* line = node->GetData(); + m_cachedLines.Erase(node); + delete line; + } + } + return true; +} + +/// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically +/// retrieve the actual style. +wxTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxTextAttr& contentStyle) const +{ + wxTextAttr attr; + wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); + if (buf) + { + attr = buf->GetBasicStyle(); + wxRichTextApplyStyle(attr, GetAttributes()); + } + else + attr = GetAttributes(); + + wxRichTextApplyStyle(attr, contentStyle); + return attr; +} + +/// Get combined attributes of the base style and paragraph style. +wxTextAttr wxRichTextParagraph::GetCombinedAttributes() const +{ + wxTextAttr attr; + wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); + if (buf) + { + attr = buf->GetBasicStyle(); + wxRichTextApplyStyle(attr, GetAttributes()); + } + else + attr = GetAttributes(); + + return attr; +} + +/// Create default tabstop array +void wxRichTextParagraph::InitDefaultTabs() +{ + // create a default tab list at 10 mm each. + for (int i = 0; i < 20; ++i) + { + sm_defaultTabs.Add(i*100); + } +} + +/// Clear default tabstop array +void wxRichTextParagraph::ClearDefaultTabs() +{ + sm_defaultTabs.Clear(); +} + +/// Get the first position from pos that has a line break character. +long wxRichTextParagraph::GetFirstLineBreakPosition(long pos) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* obj = node->GetData(); + if (pos >= obj->GetRange().GetStart() && pos <= obj->GetRange().GetEnd()) + { + wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); + if (textObj) + { + long breakPos = textObj->GetFirstLineBreakPosition(pos); + if (breakPos > -1) + return breakPos; + } + } + node = node->GetNext(); + } + return -1; +} /*! * wxRichTextLine @@ -2677,22 +4501,29 @@ wxString wxRichTextParagraph::GetBulletText() wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent) { - Init(); - - m_parent = parent; + Init(parent); } /// Initialisation -void wxRichTextLine::Init() +void wxRichTextLine::Init(wxRichTextParagraph* parent) { - m_parent = NULL; + m_parent = parent; + m_range.SetRange(-1, -1); + m_pos = wxPoint(0, 0); + m_size = wxSize(0, 0); m_descent = 0; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + m_objectSizes.Clear(); +#endif } /// Copy void wxRichTextLine::Copy(const wxRichTextLine& obj) { m_range = obj.m_range; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + m_objectSizes = obj.m_objectSizes; +#endif } /// Get the absolute object position @@ -2701,6 +4532,14 @@ wxPoint wxRichTextLine::GetAbsolutePosition() const return m_parent->GetPosition() + m_pos; } +/// Get the absolute range +wxRichTextRange wxRichTextLine::GetAbsoluteRange() const +{ + wxRichTextRange range(m_range.GetStart() + m_parent->GetRange().GetStart(), 0); + range.SetEnd(range.GetStart() + m_range.GetLength()-1); + return range; +} + /*! * wxRichTextPlainText * This object represents a single piece of text. @@ -2708,65 +4547,97 @@ wxPoint wxRichTextLine::GetAbsolutePosition() const IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject) -wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): +wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttr* style): wxRichTextObject(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); if (style) SetAttributes(*style); m_text = text; } +#define USE_KERNING_FIX 1 + +// If insufficient tabs are defined, this is the tab width used +#define WIDTH_FOR_DEFAULT_TABS 50 + /// Draw the item bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style)) { - int offset = GetRange().GetStart(); + wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); + wxASSERT (para != NULL); - long len = range.GetLength(); - wxString stringChunk = m_text.Mid(range.GetStart() - offset, (size_t) len); + wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); - int charHeight = dc.GetCharHeight(); + int offset = GetRange().GetStart(); - int x = rect.x; - int y = rect.y + (rect.height - charHeight - (descent - m_descent)); + // Replace line break characters with spaces + wxString str = m_text; + wxString toRemove = wxRichTextLineBreakChar; + str.Replace(toRemove, wxT(" ")); + if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) + str.MakeUpper(); + + long len = range.GetLength(); + wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len); // Test for the optimized situations where all is selected, or none // is selected. - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr)); + wxCheckSetFont(dc, textFont); + int charHeight = dc.GetCharHeight(); + + int x, y; + if ( textFont.Ok() ) + { + if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + y = rect.y; + wxCheckSetFont(dc, textFont); + } + else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + int sub_height = static_cast( static_cast(charHeight) / wxSCRIPT_MUL_FACTOR); + y = rect.y + (rect.height - sub_height + (descent - m_descent)); + wxCheckSetFont(dc, textFont); + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } // (a) All selected. if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd()) { - // Draw all selected - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - wxCoord w, h; - dc.GetTextExtent(stringChunk, & w, & h); - wxRect selRect(x, rect.y, w, rect.GetHeight()); - dc.DrawRectangle(selRect); - dc.SetTextForeground(*wxWHITE); - dc.SetBackgroundMode(wxTRANSPARENT); - dc.DrawText(stringChunk, x, y); + DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, true); } // (b) None selected. else if (selectionRange.GetEnd() < range.GetStart() || selectionRange.GetStart() > range.GetEnd()) { // Draw all unselected - dc.SetTextForeground(GetAttributes().GetTextColour()); - dc.SetBackgroundMode(wxTRANSPARENT); - dc.DrawText(stringChunk, x, y); + DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, false); } else { // (c) Part selected, part not // Let's draw unselected chunk, selected chunk, then unselected chunk. - dc.SetBackgroundMode(wxTRANSPARENT); - + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + // 1. Initial unselected chunk, if any, up until start of selection. if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd()) { @@ -2775,14 +4646,26 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = s1 - r1 + 1; if (fragmentLen < 0) wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen); - wxString stringFragment = m_text.Mid(r1 - offset, fragmentLen); + wxString stringFragment = str.Mid(r1 - offset, fragmentLen); + + DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); + +#if USE_KERNING_FIX + if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND) + { + // Compensate for kerning difference + wxString stringFragment2(str.Mid(r1 - offset, fragmentLen+1)); + wxString stringFragment3(str.Mid(r1 - offset + fragmentLen, 1)); - dc.SetTextForeground(GetAttributes().GetTextColour()); - dc.DrawText(stringFragment, x, y); + wxCoord w1, h1, w2, h2, w3, h3; + dc.GetTextExtent(stringFragment, & w1, & h1); + dc.GetTextExtent(stringFragment2, & w2, & h2); + dc.GetTextExtent(stringFragment3, & w3, & h3); - wxCoord w, h; - dc.GetTextExtent(stringFragment, & w, & h); - x += w; + int kerningDiff = (w1 + w3) - w2; + x = x - kerningDiff; + } +#endif } // 2. Selected chunk, if any. @@ -2794,19 +4677,26 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = s2 - s1 + 1; if (fragmentLen < 0) wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen); - wxString stringFragment = m_text.Mid(s1 - offset, fragmentLen); + wxString stringFragment = str.Mid(s1 - offset, fragmentLen); - wxCoord w, h; - dc.GetTextExtent(stringFragment, & w, & h); - wxRect selRect(x, rect.y, w, rect.GetHeight()); + DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true); - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.DrawRectangle(selRect); - dc.SetTextForeground(*wxWHITE); - dc.DrawText(stringFragment, x, y); +#if USE_KERNING_FIX + if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND) + { + // Compensate for kerning difference + wxString stringFragment2(str.Mid(s1 - offset, fragmentLen+1)); + wxString stringFragment3(str.Mid(s1 - offset + fragmentLen, 1)); + + wxCoord w1, h1, w2, h2, w3, h3; + dc.GetTextExtent(stringFragment, & w1, & h1); + dc.GetTextExtent(stringFragment2, & w2, & h2); + dc.GetTextExtent(stringFragment3, & w3, & h3); - x += w; + int kerningDiff = (w1 + w3) - w2; + x = x - kerningDiff; + } +#endif } // 3. Remaining unselected chunk, if any @@ -2818,25 +4708,143 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = r2 - s2 + 1; if (fragmentLen < 0) wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen); - wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen); + wxString stringFragment = str.Mid(s2 - offset, fragmentLen); - dc.SetTextForeground(GetAttributes().GetTextColour()); - dc.DrawText(stringFragment, x, y); - } + DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); + } } return true; } -/// Lay the item out -bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style)) +bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected) { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND); + + wxArrayInt tabArray; + int tabCount; + if (hasTabs) + { + if (attr.GetTabs().IsEmpty()) + tabArray = wxRichTextParagraph::GetDefaultTabs(); + else + tabArray = attr.GetTabs(); + tabCount = tabArray.GetCount(); + + for (int i = 0; i < tabCount; ++i) + { + int pos = tabArray[i]; + pos = ConvertTenthsMMToPixels(dc, pos); + tabArray[i] = pos; + } + } + else + tabCount = 0; + int nextTabPos = -1; + int tabPos = -1; wxCoord w, h; - dc.GetTextExtent(m_text, & w, & h, & m_descent); - m_size = wxSize(w, dc.GetCharHeight()); + + if (selected) + { + wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); + wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + + wxCheckSetBrush(dc, wxBrush(highlightColour)); + wxCheckSetPen(dc, wxPen(highlightColour)); + dc.SetTextForeground(highlightTextColour); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + } + else + { + dc.SetTextForeground(attr.GetTextColour()); + + if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk()) + { + dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); + dc.SetTextBackground(attr.GetBackgroundColour()); + } + else + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + } + + while (hasTabs) + { + // the string has a tab + // break up the string at the Tab + wxString stringChunk = str.BeforeFirst(wxT('\t')); + str = str.AfterFirst(wxT('\t')); + dc.GetTextExtent(stringChunk, & w, & h); + tabPos = x + w; + bool not_found = true; + for (int i = 0; i < tabCount && not_found; ++i) + { + nextTabPos = tabArray.Item(i); + + // Find the next tab position. + // Even if we're at the end of the tab array, we must still draw the chunk. + + if (nextTabPos > tabPos || (i == (tabCount - 1))) + { + if (nextTabPos <= tabPos) + { + int defaultTabWidth = ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS); + nextTabPos = tabPos + defaultTabWidth; + } + + not_found = false; + if (selected) + { + w = nextTabPos - x; + wxRect selRect(x, rect.y, w, rect.GetHeight()); + dc.DrawRectangle(selRect); + } + dc.DrawText(stringChunk, x, y); + + if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)) + { + wxPen oldPen = dc.GetPen(); + wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1)); + dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5)); + wxCheckSetPen(dc, oldPen); + } + + x = nextTabPos; + } + } + hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND); + } + + if (!str.IsEmpty()) + { + dc.GetTextExtent(str, & w, & h); + if (selected) + { + wxRect selRect(x, rect.y, w, rect.GetHeight()); + dc.DrawRectangle(selRect); + } + dc.DrawText(str, x, y); + + if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)) + { + wxPen oldPen = dc.GetPen(); + wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1)); + dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5)); + wxCheckSetPen(dc, oldPen); + } + + x += w; + } + return true; + +} + +/// Lay the item out +bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style)) +{ + // Only lay out if we haven't already cached the size + if (m_size.x == -1) + GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0)); return true; } @@ -2851,24 +4859,181 @@ void wxRichTextPlainText::Copy(const wxRichTextPlainText& obj) /// Get/set the object size for the given range. Returns false if the range /// is invalid for this object. -bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags)) const +bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const { if (!range.IsWithin(GetRange())) return false; + wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); + wxASSERT (para != NULL); + + wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); + // Always assume unformatted text, since at this level we have no knowledge // of line breaks - and we don't need it, since we'll calculate size within // formatted text by doing it in chunks according to the line ranges - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + bool bScript(false); + wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr)); + if (font.Ok()) + { + if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) ) + { + wxFont textFont = font; + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + wxCheckSetFont(dc, textFont); + bScript = true; + } + else + { + wxCheckSetFont(dc, font); + } + } + bool haveDescent = false; int startPos = range.GetStart() - GetRange().GetStart(); long len = range.GetLength(); - wxString stringChunk = m_text.Mid(startPos, (size_t) len); + + wxString str(m_text); + wxString toReplace = wxRichTextLineBreakChar; + str.Replace(toReplace, wxT(" ")); + + wxString stringChunk = str.Mid(startPos, (size_t) len); + + if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) + stringChunk.MakeUpper(); + wxCoord w, h; - dc.GetTextExtent(stringChunk, & w, & h, & descent); - size = wxSize(w, dc.GetCharHeight()); + int width = 0; + if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND) + { + // the string has a tab + wxArrayInt tabArray; + if (textAttr.GetTabs().IsEmpty()) + tabArray = wxRichTextParagraph::GetDefaultTabs(); + else + tabArray = textAttr.GetTabs(); + + int tabCount = tabArray.GetCount(); + + for (int i = 0; i < tabCount; ++i) + { + int pos = tabArray[i]; + pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos); + tabArray[i] = pos; + } + + int nextTabPos = -1; + + while (stringChunk.Find(wxT('\t')) >= 0) + { + int absoluteWidth = 0; + + // the string has a tab + // break up the string at the Tab + wxString stringFragment = stringChunk.BeforeFirst(wxT('\t')); + stringChunk = stringChunk.AfterFirst(wxT('\t')); + + if (partialExtents) + { + int oldWidth; + if (partialExtents->GetCount() > 0) + oldWidth = (*partialExtents)[partialExtents->GetCount()-1]; + else + oldWidth = 0; + + // Add these partial extents + wxArrayInt p; + dc.GetPartialTextExtents(stringFragment, p); + size_t j; + for (j = 0; j < p.GetCount(); j++) + partialExtents->Add(oldWidth + p[j]); + + if (partialExtents->GetCount() > 0) + absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + position.x; + else + absoluteWidth = position.x; + } + else + { + dc.GetTextExtent(stringFragment, & w, & h); + width += w; + absoluteWidth = width + position.x; + haveDescent = true; + } + + bool notFound = true; + for (int i = 0; i < tabCount && notFound; ++i) + { + nextTabPos = tabArray.Item(i); + + // Find the next tab position. + // Even if we're at the end of the tab array, we must still process the chunk. + + if (nextTabPos > absoluteWidth || (i == (tabCount - 1))) + { + if (nextTabPos <= absoluteWidth) + { + int defaultTabWidth = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS); + nextTabPos = absoluteWidth + defaultTabWidth; + } + + notFound = false; + width = nextTabPos - position.x; + + if (partialExtents) + partialExtents->Add(width); + } + } + } + } + + if (!stringChunk.IsEmpty()) + { + if (partialExtents) + { + int oldWidth; + if (partialExtents->GetCount() > 0) + oldWidth = (*partialExtents)[partialExtents->GetCount()-1]; + else + oldWidth = 0; + + // Add these partial extents + wxArrayInt p; + dc.GetPartialTextExtents(stringChunk, p); + size_t j; + for (j = 0; j < p.GetCount(); j++) + partialExtents->Add(oldWidth + p[j]); + } + else + { + dc.GetTextExtent(stringChunk, & w, & h, & descent); + width += w; + haveDescent = true; + } + } + + if (partialExtents) + { + int charHeight = dc.GetCharHeight(); + if ((*partialExtents).GetCount() > 0) + w = (*partialExtents)[partialExtents->GetCount()-1]; + else + w = 0; + size = wxSize(w, charHeight); + } + else + { + size = wxSize(width, dc.GetCharHeight()); + } + + if (!haveDescent) + dc.GetTextExtent(wxT("X"), & w, & h, & descent); + + if ( bScript ) + dc.SetFont(font); return true; } @@ -2877,8 +5042,9 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz /// the first part in 'this'. wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) { - int index = pos - GetRange().GetStart(); - if (index < 0 || index >= (int) m_text.Length()) + long index = pos - GetRange().GetStart(); + + if (index < 0 || index >= (int) m_text.length()) return NULL; wxString firstPart = m_text.Mid(0, index); @@ -2898,7 +5064,7 @@ wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) /// Calculate range void wxRichTextPlainText::CalculateRange(long start, long& end) { - end = start + m_text.Length() - 1; + end = start + m_text.length() - 1; m_range.SetRange(start, end); } @@ -2939,7 +5105,7 @@ wxString wxRichTextPlainText::GetTextForRange(const wxRichTextRange& range) cons bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const { return object->GetClassInfo() == CLASSINFO(wxRichTextPlainText) && - (m_text.IsEmpty() || wxTextAttrEq(GetAttributes(), object->GetAttributes())); + (m_text.empty() || wxTextAttrEq(GetAttributes(), object->GetAttributes())); } /// Returns true if this object merged itself with the given one. @@ -2952,6 +5118,7 @@ bool wxRichTextPlainText::Merge(wxRichTextObject* object) if (textObject) { m_text += textObject->GetText(); + wxRichTextApplyStyle(m_attributes, textObject->GetAttributes()); return true; } else @@ -2965,6 +5132,23 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream) stream << m_text << wxT("\n"); } +/// Get the first position from pos that has a line break character. +long wxRichTextPlainText::GetFirstLineBreakPosition(long pos) +{ + int i; + int len = m_text.length(); + int startPos = pos - m_range.GetStart(); + for (i = startPos; i < len; i++) + { + wxChar ch = m_text[i]; + if (ch == wxRichTextLineBreakChar) + { + return i + m_range.GetStart(); + } + } + return -1; +} + /*! * wxRichTextBuffer * This is a kind of box, used to represent the whole buffer @@ -2972,7 +5156,10 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox) -wxList wxRichTextBuffer::sm_handlers; +wxList wxRichTextBuffer::sm_handlers; +wxRichTextRenderer* wxRichTextBuffer::sm_renderer = NULL; +int wxRichTextBuffer::sm_bulletRightMargin = 20; +float wxRichTextBuffer::sm_bulletProportion = (float) 0.3; /// Initialisation void wxRichTextBuffer::Init() @@ -2983,6 +5170,8 @@ void wxRichTextBuffer::Init() m_batchedCommandDepth = 0; m_batchedCommand = NULL; m_suppressUndo = 0; + m_handlerFlags = 0; + m_scale = 1.0; } /// Initialisation @@ -2992,73 +5181,230 @@ wxRichTextBuffer::~wxRichTextBuffer() delete m_batchedCommand; ClearStyleStack(); + ClearEventHandlers(); } -void wxRichTextBuffer::Clear() +void wxRichTextBuffer::ResetAndClearCommands() { - DeleteChildren(); + Reset(); + GetCommandProcessor()->ClearCommands(); + Modify(false); + Invalidate(wxRICHTEXT_ALL); } -void wxRichTextBuffer::Reset() +void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj) { - DeleteChildren(); - AddParagraph(wxT("")); - GetCommandProcessor()->ClearCommands(); - Modify(false); + wxRichTextParagraphLayoutBox::Copy(obj); + + m_styleSheet = obj.m_styleSheet; + m_modified = obj.m_modified; + m_batchedCommandDepth = obj.m_batchedCommandDepth; + m_batchedCommand = obj.m_batchedCommand; + m_suppressUndo = obj.m_suppressUndo; +} + +/// Push style sheet to top of stack +bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet) +{ + if (m_styleSheet) + styleSheet->InsertSheet(m_styleSheet); + + SetStyleSheet(styleSheet); + + return true; +} + +/// Pop style sheet from top of stack +wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet() +{ + if (m_styleSheet) + { + wxRichTextStyleSheet* oldSheet = m_styleSheet; + m_styleSheet = oldSheet->GetNextSheet(); + oldSheet->Unlink(); + + return oldSheet; + } + else + return NULL; +} + +/// Submit command to insert paragraphs +bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags) +{ + wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); + + wxTextAttr attr(GetDefaultStyle()); + + wxTextAttr* p = NULL; + wxTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + else + p = & attr; + + action->GetNewParagraphs() = paragraphs; + + if (p && !p->IsDefault()) + { + for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxRichTextObject* child = node->GetData(); + child->SetAttributes(*p); + } + } + + action->SetPosition(pos); + + wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1); + if (!paragraphs.GetPartialParagraph()) + range.SetEnd(range.GetEnd()+1); + + // Set the range we'll need to delete in Undo + action->SetRange(range); + + SubmitAction(action); + + return true; } /// Submit command to insert the given text -bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl) +bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - action->GetNewParagraphs().AddParagraphs(text); - if (action->GetNewParagraphs().GetChildCount() == 1) + wxTextAttr* p = NULL; + wxTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + // Get appropriate paragraph style + paraAttr = GetStyleForNewParagraph(pos, false, false); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + + action->GetNewParagraphs().AddParagraphs(text, p); + + int length = action->GetNewParagraphs().GetRange().GetLength(); + + if (text.length() > 0 && text.Last() != wxT('\n')) + { + // Don't count the newline when undoing + length --; action->GetNewParagraphs().SetPartialParagraph(true); + } + else if (text.length() > 0 && text.Last() == wxT('\n')) + length --; action->SetPosition(pos); // Set the range we'll need to delete in Undo - action->SetRange(wxRichTextRange(pos, pos + text.Length() - 1)); - + action->SetRange(wxRichTextRange(pos, pos + length - 1)); + SubmitAction(action); - + return true; } /// Submit command to insert the given text -bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl) +bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); - - wxRichTextParagraph* newPara = new wxRichTextParagraph(wxT(""), this, & attr); + wxTextAttr* p = NULL; + wxTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + + wxTextAttr attr(GetDefaultStyle()); + + wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr); action->GetNewParagraphs().AppendChild(newPara); action->GetNewParagraphs().UpdateRanges(); action->GetNewParagraphs().SetPartialParagraph(false); + wxRichTextParagraph* para = GetParagraphAtPosition(pos, false); + long pos1 = pos; + + if (p) + newPara->SetAttributes(*p); + + if (flags & wxRICHTEXT_INSERT_INTERACTIVE) + { + if (para && para->GetRange().GetEnd() == pos) + pos1 ++; + + // Now see if we need to number the paragraph. + if (newPara->GetAttributes().HasBulletNumber()) + { + wxRichTextAttr numberingAttr; + if (FindNextParagraphNumber(para, numberingAttr)) + wxRichTextApplyStyle(newPara->GetAttributes(), (const wxRichTextAttr&) numberingAttr); + } + } + action->SetPosition(pos); + // Use the default character style + // Use the default character style + if (!GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst()) + { + // Check whether the default style merely reflects the paragraph/basic style, + // in which case don't apply it. + wxTextAttrEx defaultStyle(GetDefaultStyle()); + wxTextAttrEx toApply; + if (para) + { + wxRichTextAttr combinedAttr = para->GetCombinedAttributes(); + wxTextAttrEx newAttr; + // This filters out attributes that are accounted for by the current + // paragraph/basic style + wxRichTextApplyStyle(toApply, defaultStyle, & combinedAttr); + } + else + toApply = defaultStyle; + + if (!toApply.IsDefault()) + newPara->GetChildren().GetFirst()->GetData()->SetAttributes(toApply); + } + // Set the range we'll need to delete in Undo - action->SetRange(wxRichTextRange(pos, pos)); - + action->SetRange(wxRichTextRange(pos1, pos1)); + SubmitAction(action); - + return true; } /// Submit command to insert the given image -bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl) +bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); - + wxTextAttr* p = NULL; + wxTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + + wxTextAttr attr(GetDefaultStyle()); + wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); + if (p) + newPara->SetAttributes(*p); + wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara); newPara->AppendChild(imageObject); action->GetNewParagraphs().AppendChild(newPara); @@ -3070,47 +5416,116 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& // Set the range we'll need to delete in Undo action->SetRange(wxRichTextRange(pos, pos)); - + SubmitAction(action); - + return true; } +/// Get the style that is appropriate for a new paragraph at this position. +/// If the previous paragraph has a paragraph style name, look up the next-paragraph +/// style. +wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const +{ + wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); + if (para) + { + wxTextAttr attr; + bool foundAttributes = false; + + // Look for a matching paragraph style + if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + if (paraDef) + { + // If we're not at the end of the paragraph, then we apply THIS style, and not the designated next style. + if (para->GetRange().GetEnd() == pos && !paraDef->GetNextStyle().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); + if (nextParaDef) + { + foundAttributes = true; + attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet()); + } + } + + // If we didn't find the 'next style', use this style instead. + if (!foundAttributes) + { + foundAttributes = true; + attr = paraDef->GetStyleMergedWithBase(GetStyleSheet()); + } + } + } + + // Also apply list style if present + if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet()) + { + wxRichTextListStyleDefinition* listDef = GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName()); + if (listDef) + { + int thisIndent = para->GetAttributes().GetLeftIndent(); + int thisLevel = para->GetAttributes().HasOutlineLevel() ? para->GetAttributes().GetOutlineLevel() : listDef->FindLevelForIndent(thisIndent); + + // Apply the overall list style, and item style for this level + wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, GetStyleSheet())); + wxRichTextApplyStyle(attr, listStyle); + attr.SetOutlineLevel(thisLevel); + if (para->GetAttributes().HasBulletNumber()) + attr.SetBulletNumber(para->GetAttributes().GetBulletNumber()); + } + } + + if (!foundAttributes) + { + attr = para->GetAttributes(); + int flags = attr.GetFlags(); + + // Eliminate character styles + flags &= ( (~ wxTEXT_ATTR_FONT) | + (~ wxTEXT_ATTR_TEXT_COLOUR) | + (~ wxTEXT_ATTR_BACKGROUND_COLOUR) ); + attr.SetFlags(flags); + } + + return attr; + } + else + return wxTextAttr(); +} + /// Submit command to delete this range -bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl) +bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl); - - action->SetPosition(initialCaretPosition); + + action->SetPosition(ctrl->GetCaretPosition()); // Set the range to delete action->SetRange(range); - + // Copy the fragment that we'll need to restore in Undo CopyFragment(range, action->GetOldParagraphs()); - // Special case: if there is only one (non-partial) paragraph, - // we must save the *next* paragraph's style, because that - // is the style we must apply when inserting the content back - // when undoing the delete. (This is because we're merging the - // paragraph with the previous paragraph and throwing away - // the style, and we need to restore it.) - if (!action->GetOldParagraphs().GetPartialParagraph() && action->GetOldParagraphs().GetChildCount() == 1) + // See if we're deleting a paragraph marker, in which case we need to + // make a note not to copy the attributes from the 2nd paragraph to the 1st. + if (range.GetStart() == range.GetEnd()) { - wxRichTextParagraph* lastPara = GetParagraphAtPosition(range.GetStart()); - if (lastPara) + wxRichTextParagraph* para = GetParagraphAtPosition(range.GetStart()); + if (para && para->GetRange().GetEnd() == range.GetEnd()) { - wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetEnd()+1); - if (nextPara) + wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetStart()+1); + if (nextPara && nextPara != para) { - wxRichTextParagraph* para = (wxRichTextParagraph*) action->GetOldParagraphs().GetChild(0); - para->SetAttributes(nextPara->GetAttributes()); + action->GetOldParagraphs().GetChildren().GetFirst()->GetData()->SetAttributes(nextPara->GetAttributes()); + action->GetOldParagraphs().GetAttributes().SetFlags(action->GetOldParagraphs().GetAttributes().GetFlags() | wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE); } } } SubmitAction(action); - + return true; } @@ -3122,12 +5537,12 @@ bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName) wxASSERT(m_batchedCommand == NULL); if (m_batchedCommand) { - GetCommandProcessor()->Submit(m_batchedCommand); + GetCommandProcessor()->Store(m_batchedCommand); } m_batchedCommand = new wxRichTextCommand(cmdName); } - m_batchedCommandDepth ++; + m_batchedCommandDepth ++; return true; } @@ -3142,7 +5557,7 @@ bool wxRichTextBuffer::EndBatchUndo() if (m_batchedCommandDepth == 0) { - GetCommandProcessor()->Submit(m_batchedCommand); + GetCommandProcessor()->Store(m_batchedCommand); m_batchedCommand = NULL; } @@ -3153,7 +5568,15 @@ bool wxRichTextBuffer::EndBatchUndo() bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action) { if (BatchingUndo() && m_batchedCommand && !SuppressingUndo()) + { + wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName()); + cmd->AddAction(action); + cmd->Do(); + cmd->GetActions().Clear(); + delete cmd; + m_batchedCommand->AddAction(action); + } else { wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName()); @@ -3169,7 +5592,7 @@ bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action) /// Begin suppressing undo/redo commands. bool wxRichTextBuffer::BeginSuppressUndo() { - m_suppressUndo ++; + m_suppressUndo ++; return true; } @@ -3177,41 +5600,39 @@ bool wxRichTextBuffer::BeginSuppressUndo() /// End suppressing undo/redo commands. bool wxRichTextBuffer::EndSuppressUndo() { - m_suppressUndo --; + m_suppressUndo --; return true; } /// Begin using a style -bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style) +bool wxRichTextBuffer::BeginStyle(const wxTextAttr& style) { - wxTextAttrEx newStyle(GetDefaultStyle()); + wxTextAttr newStyle(GetDefaultStyle()); // Save the old default style - m_attributeStack.Append((wxObject*) new wxTextAttrEx(GetDefaultStyle())); + m_attributeStack.Append((wxObject*) new wxTextAttr(GetDefaultStyle())); wxRichTextApplyStyle(newStyle, style); newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags()); SetDefaultStyle(newStyle); - // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize()); - return true; } /// End the style bool wxRichTextBuffer::EndStyle() { - if (m_attributeStack.GetFirst() == NULL) + if (!m_attributeStack.GetFirst()) { wxLogDebug(_("Too many EndStyle calls!")); return false; } - wxNode* node = m_attributeStack.GetLast(); - wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData(); - delete node; + wxList::compatibility_iterator node = m_attributeStack.GetLast(); + wxTextAttr* attr = (wxTextAttr*)node->GetData(); + m_attributeStack.Erase(node); SetDefaultStyle(*attr); @@ -3230,106 +5651,93 @@ bool wxRichTextBuffer::EndAllStyles() /// Clear the style stack void wxRichTextBuffer::ClearStyleStack() { - for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext()) - delete (wxTextAttrEx*) node->GetData(); + for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext()) + delete (wxTextAttr*) node->GetData(); m_attributeStack.Clear(); } /// Begin using bold bool wxRichTextBuffer::BeginBold() { - wxFont font(GetBasicStyle().GetFont()); - font.SetWeight(wxBOLD); + wxTextAttr attr; + attr.SetFontWeight(wxBOLD); - wxTextAttrEx attr; - attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT); - return BeginStyle(attr); } /// Begin using italic bool wxRichTextBuffer::BeginItalic() { - wxFont font(GetBasicStyle().GetFont()); - font.SetStyle(wxITALIC); + wxTextAttr attr; + attr.SetFontStyle(wxITALIC); - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC); - return BeginStyle(attr); } /// Begin using underline bool wxRichTextBuffer::BeginUnderline() { - wxFont font(GetBasicStyle().GetFont()); - font.SetUnderlined(true); + wxTextAttr attr; + attr.SetFontUnderlined(true); - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE); - return BeginStyle(attr); } /// Begin using point size bool wxRichTextBuffer::BeginFontSize(int pointSize) { - wxFont font(GetBasicStyle().GetFont()); - font.SetPointSize(pointSize); + wxTextAttr attr; + attr.SetFontSize(pointSize); - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE); - return BeginStyle(attr); } /// Begin using this font bool wxRichTextBuffer::BeginFont(const wxFont& font) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_FONT); + wxTextAttr attr; attr.SetFont(font); - + return BeginStyle(attr); } /// Begin using this colour bool wxRichTextBuffer::BeginTextColour(const wxColour& colour) { - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR); attr.SetTextColour(colour); - + return BeginStyle(attr); } /// Begin using alignment bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment) { - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(wxTEXT_ATTR_ALIGNMENT); attr.SetAlignment(alignment); - + return BeginStyle(attr); } /// Begin left indent bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent) { - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); attr.SetLeftIndent(leftIndent, leftSubIndent); - + return BeginStyle(attr); } /// Begin right indent bool wxRichTextBuffer::BeginRightIndent(int rightIndent) { - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT); attr.SetRightIndent(rightIndent); - + return BeginStyle(attr); } @@ -3342,45 +5750,57 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after) if (after != 0) flags |= wxTEXT_ATTR_PARA_SPACING_AFTER; - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(flags); attr.SetParagraphSpacingBefore(before); attr.SetParagraphSpacingAfter(after); - + return BeginStyle(attr); } /// Begin line spacing bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) { - wxTextAttrEx attr; + wxTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(lineSpacing); - + return BeginStyle(attr); } /// Begin numbered bullet bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_LEFT_INDENT); + wxTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetBulletNumber(bulletNumber); attr.SetLeftIndent(leftIndent, leftSubIndent); - + return BeginStyle(attr); } /// Begin symbol bullet -bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle) +bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle) +{ + wxTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); + attr.SetBulletStyle(bulletStyle); + attr.SetLeftIndent(leftIndent, leftSubIndent); + attr.SetBulletText(symbol); + + return BeginStyle(attr); +} + +/// Begin standard bullet +bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT); + wxTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); - attr.SetBulletSymbol(symbol); - + attr.SetBulletName(bulletName); + return BeginStyle(attr); } @@ -3392,8 +5812,7 @@ bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle) wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); if (def) { - wxTextAttrEx attr; - def->GetStyle().CopyTo(attr); + wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); return BeginStyle(attr); } } @@ -3408,14 +5827,49 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle) wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle); if (def) { - wxTextAttrEx attr; - def->GetStyle().CopyTo(attr); + wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); + return BeginStyle(attr); + } + } + return false; +} + +/// Begin named list style +bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number) +{ + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle); + if (def) + { + wxTextAttr attr(def->GetCombinedStyleForLevel(level)); + + attr.SetBulletNumber(number); + return BeginStyle(attr); } } return false; } +/// Begin URL +bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle) +{ + wxTextAttr attr; + + if (!characterStyle.IsEmpty() && GetStyleSheet()) + { + wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); + if (def) + { + attr = def->GetStyleMergedWithBase(GetStyleSheet()); + } + } + attr.SetURL(url); + + return BeginStyle(attr); +} + /// Adds a handler to the end void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler) { @@ -3443,16 +5897,19 @@ bool wxRichTextBuffer::RemoveHandler(const wxString& name) } /// Finds a handler by filename or, if supplied, type -wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType) +wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, + wxRichTextFileType imageType) { if (imageType != wxRICHTEXT_TYPE_ANY) return FindHandler(imageType); - else + else if (!filename.IsEmpty()) { wxString path, file, ext; wxSplitPath(filename, & path, & file, & ext); return FindHandler(ext, imageType); } + else + return NULL; } @@ -3471,7 +5928,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name) } /// Finds a handler by extension and type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -3486,7 +5943,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, } /// Finds a handler by type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -3518,8 +5975,11 @@ void wxRichTextBuffer::CleanUpHandlers() sm_handlers.Clear(); } -wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) +wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* types) { + if (types) + types->Clear(); + wxString wildcard; wxList::compatibility_iterator node = GetHandlers().GetFirst(); @@ -3527,7 +5987,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) while (node) { wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData(); - if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad())) + if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad()))) { if (combine) { @@ -3546,6 +6006,8 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) wildcard += handler->GetExtension(); wildcard += wxT(")|*."); wildcard += handler->GetExtension(); + if (types) + types->Add(handler->GetType()); } count ++; } @@ -3559,41 +6021,59 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) } /// Load a file -bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) +bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) - return handler->LoadFile(this, filename); + { + SetDefaultStyle(wxTextAttr()); + handler->SetFlags(GetHandlerFlags()); + bool success = handler->LoadFile(this, filename); + Invalidate(wxRICHTEXT_ALL); + return success; + } else return false; } /// Save a file -bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) +bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, filename); + } else return false; } /// Load from a stream -bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) +bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) - return handler->LoadFile(this, stream); + { + SetDefaultStyle(wxTextAttr()); + handler->SetFlags(GetHandlerFlags()); + bool success = handler->LoadFile(this, stream); + Invalidate(wxRICHTEXT_ALL); + return success; + } else return false; } /// Save to a stream -bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) +bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, stream); + } else return false; } @@ -3602,12 +6082,45 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range) { bool success = false; - wxString text = GetTextForRange(range); - if (wxTheClipboard->Open()) - { - success = wxTheClipboard->SetData(new wxTextDataObject(text)); +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ + + if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open()) + { + wxTheClipboard->Clear(); + + // Add composite object + + wxDataObjectComposite* compositeObject = new wxDataObjectComposite(); + + { + wxString text = GetTextForRange(range); + +#ifdef __WXMSW__ + text = wxTextFile::Translate(text, wxTextFileType_Dos); +#endif + + compositeObject->Add(new wxTextDataObject(text), false /* not preferred */); + } + + // Add rich text buffer data object. This needs the XML handler to be present. + + if (FindHandler(wxRICHTEXT_TYPE_XML)) + { + wxRichTextBuffer* richTextBuf = new wxRichTextBuffer; + CopyFragment(range, *richTextBuf); + + compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */); + } + + if (wxTheClipboard->SetData(compositeObject)) + success = true; + wxTheClipboard->Close(); } + +#else + wxUnusedVar(range); +#endif return success; } @@ -3615,18 +6128,47 @@ bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range) bool wxRichTextBuffer::PasteFromClipboard(long position) { bool success = false; +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ if (CanPasteFromClipboard()) { if (wxTheClipboard->Open()) { - if (wxTheClipboard->IsSupported(wxDF_TEXT)) + if (wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId()))) + { + wxRichTextBufferDataObject data; + wxTheClipboard->GetData(data); + wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer(); + if (richTextBuffer) + { + InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0); + if (GetRichTextCtrl()) + GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd()); + delete richTextBuffer; + } + } + else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)) { wxTextDataObject data; wxTheClipboard->GetData(data); wxString text(data.GetText()); +#ifdef __WXMSW__ + wxString text2; + text2.Alloc(text.Length()+1); + size_t i; + for (i = 0; i < text.Length(); i++) + { + wxChar ch = text[i]; + if (ch != wxT('\r')) + text2 += ch; + } +#else + wxString text2 = text; +#endif + InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + + if (GetRichTextCtrl()) + GetRichTextCtrl()->ShowPosition(position + text2.Length()); - InsertTextWithUndo(position+1, text, GetRichTextCtrl()); - success = true; } else if (wxTheClipboard->IsSupported(wxDF_BITMAP)) @@ -3637,17 +6179,17 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxImage image(bitmap.ConvertToImage()); wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, GetRichTextCtrl(), false); - + action->GetNewParagraphs().AddImage(image); if (action->GetNewParagraphs().GetChildCount() == 1) action->GetNewParagraphs().SetPartialParagraph(true); - - action->SetPosition(position); - + + action->SetPosition(position+1); + // Set the range we'll need to delete in Undo - action->SetRange(wxRichTextRange(position, position)); - + action->SetRange(wxRichTextRange(position+1, position+1)); + SubmitAction(action); success = true; @@ -3655,21 +6197,28 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxTheClipboard->Close(); } } +#else + wxUnusedVar(position); +#endif return success; } /// Can we paste from the clipboard? bool wxRichTextBuffer::CanPasteFromClipboard() const { - bool canPaste = FALSE; - if (wxTheClipboard->Open()) + bool canPaste = false; +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ + if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open()) { - if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_BITMAP)) + if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT) || + wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) || + wxTheClipboard->IsSupported(wxDF_BITMAP)) { - canPaste = TRUE; + canPaste = true; } wxTheClipboard->Close(); } +#endif return canPaste; } @@ -3686,6 +6235,240 @@ void wxRichTextBuffer::Dump() wxLogDebug(text); } +/// Add an event handler +bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler) +{ + m_eventHandlers.Append(handler); + return true; +} + +/// Remove an event handler +bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler) +{ + wxList::compatibility_iterator node = m_eventHandlers.Find(handler); + if (node) + { + m_eventHandlers.Erase(node); + if (deleteHandler) + delete handler; + + return true; + } + else + return false; +} + +/// Clear event handlers +void wxRichTextBuffer::ClearEventHandlers() +{ + m_eventHandlers.Clear(); +} + +/// Send event to event handlers. If sendToAll is true, will send to all event handlers, +/// otherwise will stop at the first successful one. +bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll) +{ + bool success = false; + for (wxList::compatibility_iterator node = m_eventHandlers.GetFirst(); node; node = node->GetNext()) + { + wxEvtHandler* handler = (wxEvtHandler*) node->GetData(); + if (handler->ProcessEvent(event)) + { + success = true; + if (!sendToAll) + return true; + } + } + return success; +} + +/// Set style sheet and notify of the change +bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet) +{ + wxRichTextStyleSheet* oldSheet = GetStyleSheet(); + + wxWindowID id = wxID_ANY; + if (GetRichTextCtrl()) + id = GetRichTextCtrl()->GetId(); + + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id); + event.SetEventObject(GetRichTextCtrl()); + event.SetOldStyleSheet(oldSheet); + event.SetNewStyleSheet(sheet); + event.Allow(); + + if (SendEvent(event) && !event.IsAllowed()) + { + if (sheet != oldSheet) + delete sheet; + + return false; + } + + if (oldSheet && oldSheet != sheet) + delete oldSheet; + + SetStyleSheet(sheet); + + event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED); + event.SetOldStyleSheet(NULL); + event.Allow(); + + return SendEvent(event); +} + +/// Set renderer, deleting old one +void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer) +{ + if (sm_renderer) + delete sm_renderer; + sm_renderer = renderer; +} + +bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& bulletAttr, const wxRect& rect) +{ + if (bulletAttr.GetTextColour().Ok()) + { + wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour())); + wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour())); + } + else + { + wxCheckSetPen(dc, *wxBLACK_PEN); + wxCheckSetBrush(dc, *wxBLACK_BRUSH); + } + + wxFont font; + if (bulletAttr.HasFont()) + { + font = paragraph->GetBuffer()->GetFontTable().FindFont(bulletAttr); + } + else + font = (*wxNORMAL_FONT); + + wxCheckSetFont(dc, font); + + int charHeight = dc.GetCharHeight(); + + int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion()); + int bulletHeight = bulletWidth; + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // Calculate where the bullet should be positioned + y = y + (charHeight+1)/2 - (bulletHeight+1)/2; + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = rect.x + rect.width - bulletWidth - margin; + else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - bulletWidth/2; + + if (bulletAttr.GetBulletName() == wxT("standard/square")) + { + dc.DrawRectangle(x, y, bulletWidth, bulletHeight); + } + else if (bulletAttr.GetBulletName() == wxT("standard/diamond")) + { + wxPoint pts[5]; + pts[0].x = x; pts[0].y = y + bulletHeight/2; + pts[1].x = x + bulletWidth/2; pts[1].y = y; + pts[2].x = x + bulletWidth; pts[2].y = y + bulletHeight/2; + pts[3].x = x + bulletWidth/2; pts[3].y = y + bulletHeight; + + dc.DrawPolygon(4, pts); + } + else if (bulletAttr.GetBulletName() == wxT("standard/triangle")) + { + wxPoint pts[3]; + pts[0].x = x; pts[0].y = y; + pts[1].x = x + bulletWidth; pts[1].y = y + bulletHeight/2; + pts[2].x = x; pts[2].y = y + bulletHeight; + + dc.DrawPolygon(3, pts); + } + else // "standard/circle", and catch-all + { + dc.DrawEllipse(x, y, bulletWidth, bulletHeight); + } + + return true; +} + +bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& attr, const wxRect& rect, const wxString& text) +{ + if (!text.empty()) + { + wxFont font; + if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont()) + { + wxTextAttr fontAttr; + fontAttr.SetFontSize(attr.GetFontSize()); + fontAttr.SetFontStyle(attr.GetFontStyle()); + fontAttr.SetFontWeight(attr.GetFontWeight()); + fontAttr.SetFontUnderlined(attr.GetFontUnderlined()); + fontAttr.SetFontFaceName(attr.GetBulletFont()); + font = paragraph->GetBuffer()->GetFontTable().FindFont(fontAttr); + } + else if (attr.HasFont()) + font = paragraph->GetBuffer()->GetFontTable().FindFont(attr); + else + font = (*wxNORMAL_FONT); + + wxCheckSetFont(dc, font); + + if (attr.GetTextColour().Ok()) + dc.SetTextForeground(attr.GetTextColour()); + + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + + int charHeight = dc.GetCharHeight(); + wxCoord tw, th; + dc.GetTextExtent(text, & tw, & th); + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = (rect.x + rect.width) - tw - margin; + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - tw/2; + + dc.DrawText(text, x, y); + + return true; + } + else + return false; +} + +bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttr& WXUNUSED(attr), const wxRect& WXUNUSED(rect)) +{ + // Currently unimplemented. The intention is to store bitmaps by name in a media store associated + // with the buffer. The store will allow retrieval from memory, disk or other means. + return false; +} + +/// Enumerate the standard bullet names currently supported +bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames) +{ + bulletNames.Add(wxT("standard/circle")); + bulletNames.Add(wxT("standard/square")); + bulletNames.Add(wxT("standard/diamond")); + bulletNames.Add(wxT("standard/triangle")); + + return true; +} /* * Module to initialise and clean up handlers @@ -3696,25 +6479,49 @@ class wxRichTextModule: public wxModule DECLARE_DYNAMIC_CLASS(wxRichTextModule) public: wxRichTextModule() {} - bool OnInit() { wxRichTextBuffer::InitStandardHandlers(); return true; }; - void OnExit() { wxRichTextBuffer::CleanUpHandlers(); }; + bool OnInit() + { + wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer); + wxRichTextBuffer::InitStandardHandlers(); + wxRichTextParagraph::InitDefaultTabs(); + return true; + } + void OnExit() + { + wxRichTextBuffer::CleanUpHandlers(); + wxRichTextDecimalToRoman(-1); + wxRichTextParagraph::ClearDefaultTabs(); + wxRichTextCtrl::ClearAvailableFontNames(); + wxRichTextBuffer::SetRenderer(NULL); + } }; IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule) +// If the richtext lib is dynamically loaded after the app has already started +// (such as from wxPython) then the built-in module system will not init this +// module. Provide this function to do it manually. +void wxRichTextModuleInit() +{ + wxModule* module = new wxRichTextModule; + module->Init(); + wxModule::RegisterModule(module); +} + + /*! * Commands for undo/redo * */ wxRichTextCommand::wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer, - wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(TRUE, name) + wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name) { /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, ctrl, ignoreFirstTime); } -wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(TRUE, name) +wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(true, name) { } @@ -3731,7 +6538,7 @@ void wxRichTextCommand::AddAction(wxRichTextAction* action) bool wxRichTextCommand::Do() { - for (wxNode* node = m_actions.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext()) { wxRichTextAction* action = (wxRichTextAction*) node->GetData(); action->Do(); @@ -3742,7 +6549,7 @@ bool wxRichTextCommand::Do() bool wxRichTextCommand::Undo() { - for (wxNode* node = m_actions.GetLast(); node; node = node->GetPrevious()) + for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious()) { wxRichTextAction* action = (wxRichTextAction*) node->GetData(); action->Undo(); @@ -3780,6 +6587,58 @@ wxRichTextAction::~wxRichTextAction() { } +void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions) +{ + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // NOTE: we're assuming that the buffer is laid out correctly at this point. + // If we had several actions, which only invalidate and leave layout until the + // paint handler is called, then this might not be true. So we may need to switch + // optimisation on only when we're simply adding text and not simultaneously + // deleting a selection, for example. Or, we make sure the buffer is laid out correctly + // first, but of course this means we'll be doing it twice. + if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly + { + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + int lastY = firstVisiblePt.y + clientSize.y; + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart()); + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + if (pt.y > lastY) + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) + { + optimizationLineCharPositions.Add(range.GetStart()); + optimizationLineYPositions.Add(pt.y); + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + } +#endif +} + bool wxRichTextAction::Do() { m_buffer->Modify(true); @@ -3788,32 +6647,96 @@ bool wxRichTextAction::Do() { case wxRICHTEXT_INSERT: { - m_buffer->InsertFragment(GetPosition(), m_newParagraphs); + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + + m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs); m_buffer->UpdateRanges(); + m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd())); + + long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength(); + + // Character position to caret position + newCaretPosition --; + + // Don't take into account the last newline + if (m_newParagraphs.GetPartialParagraph()) + newCaretPosition --; + else + if (m_newParagraphs.GetChildren().GetCount() > 1) + { + wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData(); + if (p->GetRange().GetLength() == 1) + newCaretPosition --; + } - long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength() - 1; - if (m_newParagraphs.GetPartialParagraph()) - newCaretPosition --; + newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); + + UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); - UpdateAppearance(newCaretPosition, true /* send update event */); + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); + m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); + + long caretPos = GetRange().GetStart()-1; + if (caretPos >= m_buffer->GetRange().GetEnd()) + caretPos --; - UpdateAppearance(GetRange().GetStart()-1, true /* send update event */); + UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_CHANGE_STYLE: { ApplyParagraphs(GetNewParagraphs()); + m_buffer->Invalidate(GetRange()); UpdateAppearance(GetPosition()); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); + break; } default: @@ -3831,32 +6754,74 @@ bool wxRichTextAction::Undo() { case wxRICHTEXT_INSERT: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); + m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); long newCaretPosition = GetPosition() - 1; - // if (m_newParagraphs.GetPartialParagraph()) - // newCaretPosition --; - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs); m_buffer->UpdateRanges(); + m_buffer->Invalidate(GetRange()); - UpdateAppearance(GetPosition(), true /* send update event */); + UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_CHANGE_STYLE: { ApplyParagraphs(GetOldParagraphs()); + m_buffer->Invalidate(GetRange()); UpdateAppearance(GetPosition()); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); + break; } default: @@ -3867,25 +6832,161 @@ bool wxRichTextAction::Undo() } /// Update the control appearance -void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent) +void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions, bool isDoCmd) { if (m_ctrl) { m_ctrl->SetCaretPosition(caretPosition); if (!m_ctrl->IsFrozen()) { - m_ctrl->Layout(); - m_ctrl->PositionCaret(); - m_ctrl->Refresh(); + m_ctrl->LayoutContent(); + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // Find refresh rectangle if we are in a position to optimise refresh + if ((m_cmdId == wxRICHTEXT_INSERT || m_cmdId == wxRICHTEXT_DELETE) && optimizationLineCharPositions) + { + size_t i; + + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + + // Start/end positions + int firstY = 0; + int lastY = firstVisiblePt.y + clientSize.y; + + bool foundEnd = false; + + // position offset - how many characters were inserted + int positionOffset = GetRange().GetLength(); + + // Determine whether this is Do or Undo, and adjust positionOffset accordingly + if ((m_cmdId == wxRICHTEXT_DELETE && isDoCmd) || (m_cmdId == wxRICHTEXT_INSERT && !isDoCmd)) + positionOffset = - positionOffset; + + // find the first line which is being drawn at the same position as it was + // before. Since we're talking about a simple insertion, we can assume + // that the rest of the window does not need to be redrawn. + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition()); + if (para) + { + // Find line containing GetPosition(). + wxRichTextLine* line = NULL; + wxRichTextLineList::compatibility_iterator node2 = para->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* l = node2->GetData(); + wxRichTextRange range = l->GetAbsoluteRange(); + if (range.Contains(GetRange().GetStart()-1)) + { + line = l; + break; + } + node2 = node2->GetNext(); + } + + if (line) + { + // Step back a couple of lines to where we can be sure of reformatting correctly + wxRichTextLineList::compatibility_iterator lineNode = para->GetLines().Find(line); + if (lineNode) + { + lineNode = lineNode->GetPrevious(); + if (lineNode) + { + line = (wxRichTextLine*) lineNode->GetData(); + lineNode = lineNode->GetPrevious(); + if (lineNode) + line = (wxRichTextLine*) lineNode->GetData(); + } + } + + firstY = line->GetAbsolutePosition().y; + } + } + + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + // we want to find the first line that is in the same position + // as before. This will mean we're at the end of the changed text. + + if (pt.y > lastY) // going past the end of the window, no more info + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + // Detect last line in the buffer + else if (!node2->GetNext() && para->GetRange().Contains(m_buffer->GetRange().GetEnd())) + { + foundEnd = true; + lastY = pt.y + line->GetSize().y; + + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + + break; + } + else + { + // search for this line being at the same position as before + for (i = 0; i < optimizationLineCharPositions->GetCount(); i++) + { + if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) && + ((*optimizationLineYPositions)[i] == pt.y)) + { + // Stop, we're now the same as we were + foundEnd = true; + + lastY = pt.y; + + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + + break; + } + } + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + + firstY = wxMax(firstVisiblePt.y, firstY); + if (!foundEnd) + lastY = firstVisiblePt.y + clientSize.y; + + // Convert to device coordinates + wxRect rect(m_ctrl->GetPhysicalPoint(wxPoint(firstVisiblePt.x, firstY)), wxSize(clientSize.x, lastY - firstY)); + m_ctrl->RefreshRect(rect); + } + else +#endif + m_ctrl->Refresh(false); +#if wxRICHTEXT_USE_OWN_CARET + m_ctrl->PositionCaret(); +#endif if (sendUpdateEvent) - m_ctrl->SendUpdateEvent(); + wxTextCtrl::SendTextUpdatedEvent(m_ctrl); } - } + } } /// Replace the buffer paragraphs with the new ones. -void wxRichTextAction::ApplyParagraphs(const wxRichTextFragment& fragment) +void wxRichTextAction::ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment) { wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst(); while (node) @@ -3941,17 +7042,21 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range) IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject) -wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent): +wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttr* charStyle): wxRichTextObject(parent) { m_image = image; + if (charStyle) + SetAttributes(*charStyle); } -wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent): +wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttr* charStyle): wxRichTextObject(parent) { m_imageBlock = imageBlock; m_imageBlock.Load(m_image); + if (charStyle) + SetAttributes(*charStyle); } /// Load wxImage from the block @@ -3961,659 +7066,210 @@ bool wxRichTextImage::LoadFromBlock() return m_imageBlock.Ok(); } -/// Make block from the wxImage -bool wxRichTextImage::MakeBlock() -{ - if (m_imageBlock.GetImageType() == wxBITMAP_TYPE_ANY || m_imageBlock.GetImageType() == -1) - m_imageBlock.SetImageType(wxBITMAP_TYPE_PNG); - - m_imageBlock.MakeImageBlock(m_image, m_imageBlock.GetImageType()); - return m_imageBlock.Ok(); -} - - -/// Draw the item -bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style)) -{ - if (!m_image.Ok() && m_imageBlock.Ok()) - LoadFromBlock(); - - if (!m_image.Ok()) - return false; - - if (m_image.Ok() && !m_bitmap.Ok()) - m_bitmap = wxBitmap(m_image); - - int y = rect.y + (rect.height - m_image.GetHeight()); - - if (m_bitmap.Ok()) - dc.DrawBitmap(m_bitmap, rect.x, y, true); - - if (selectionRange.Contains(range.GetStart())) - { - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.SetLogicalFunction(wxINVERT); - dc.DrawRectangle(rect); - dc.SetLogicalFunction(wxCOPY); - } - - return true; -} - -/// Lay the item out -bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style)) -{ - if (!m_image.Ok()) - LoadFromBlock(); - - if (m_image.Ok()) - { - SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight())); - SetPosition(rect.GetPosition()); - } - - return true; -} - -/// Get/set the object size for the given range. Returns false if the range -/// is invalid for this object. -bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags)) const -{ - if (!range.IsWithin(GetRange())) - return false; - - if (!m_image.Ok()) - return false; - - size.x = m_image.GetWidth(); - size.y = m_image.GetHeight(); - - return true; -} - -/// Copy -void wxRichTextImage::Copy(const wxRichTextImage& obj) -{ - m_image = obj.m_image; - m_imageBlock = obj.m_imageBlock; -} - -/*! - * Utilities - * - */ - -/// Compare two attribute objects -bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2) -{ - return ( - attr1.GetTextColour() == attr2.GetTextColour() && - attr1.GetBackgroundColour() == attr2.GetBackgroundColour() && - attr1.GetFont() == attr2.GetFont() && - attr1.GetAlignment() == attr2.GetAlignment() && - attr1.GetLeftIndent() == attr2.GetLeftIndent() && - attr1.GetRightIndent() == attr2.GetRightIndent() && - attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() && - attr1.GetTabs().GetCount() == attr2.GetTabs().GetCount() && // heuristic - attr1.GetLineSpacing() == attr2.GetLineSpacing() && - attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() && - attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() && - attr1.GetBulletStyle() == attr2.GetBulletStyle() && - attr1.GetBulletNumber() == attr2.GetBulletNumber() && - attr1.GetBulletSymbol() == attr2.GetBulletSymbol() && - attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && - attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName()); -} - -bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2) -{ - return ( - attr1.GetTextColour() == attr2.GetTextColour() && - attr1.GetBackgroundColour() == attr2.GetBackgroundColour() && - attr1.GetFont().GetPointSize() == attr2.GetFontSize() && - attr1.GetFont().GetStyle() == attr2.GetFontStyle() && - attr1.GetFont().GetWeight() == attr2.GetFontWeight() && - attr1.GetFont().GetFaceName() == attr2.GetFontFaceName() && - attr1.GetFont().GetUnderlined() == attr2.GetFontUnderlined() && - attr1.GetAlignment() == attr2.GetAlignment() && - attr1.GetLeftIndent() == attr2.GetLeftIndent() && - attr1.GetRightIndent() == attr2.GetRightIndent() && - attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() && - attr1.GetTabs().GetCount() == attr2.GetTabs().GetCount() && // heuristic - attr1.GetLineSpacing() == attr2.GetLineSpacing() && - attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() && - attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() && - attr1.GetBulletStyle() == attr2.GetBulletStyle() && - attr1.GetBulletNumber() == attr2.GetBulletNumber() && - attr1.GetBulletSymbol() == attr2.GetBulletSymbol() && - attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && - attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName()); -} - -/// Compare two attribute objects, but take into account the flags -/// specifying attributes of interest. -bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, int flags) -{ - if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour()) - return false; - - if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetFaceName() != attr2.GetFont().GetFaceName()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetPointSize() != attr2.GetFont().GetPointSize()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetWeight() != attr2.GetFont().GetWeight()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetStyle() != attr2.GetFont().GetStyle()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined()) - return false; - - if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment()) - return false; - - if ((flags & wxTEXT_ATTR_LEFT_INDENT) && - ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent()))) - return false; - - if ((flags & wxTEXT_ATTR_RIGHT_INDENT) && - (attr1.GetRightIndent() != attr2.GetRightIndent())) - return false; - - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && - (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) - return false; - - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && - (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) - return false; - - if ((flags && wxTEXT_ATTR_LINE_SPACING) && - (attr1.GetLineSpacing() != attr2.GetLineSpacing())) - return false; - - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && - (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) - return false; - - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && - (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_STYLE) && - (attr1.GetBulletStyle() != attr2.GetBulletStyle())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_NUMBER) && - (attr1.GetBulletNumber() != attr2.GetBulletNumber())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) - return false; - -/* TODO - if ((flags & wxTEXT_ATTR_TABS) && - return false; -*/ - - return true; -} - -bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, int flags) -{ - if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour()) - return false; - - if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour()) - return false; - - if ((flags & (wxTEXT_ATTR_FONT)) && !attr1.GetFont().Ok()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && - attr1.GetFont().GetFaceName() != attr2.GetFontFaceName()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && - attr1.GetFont().GetPointSize() != attr2.GetFontSize()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && - attr1.GetFont().GetWeight() != attr2.GetFontWeight()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && - attr1.GetFont().GetStyle() != attr2.GetFontStyle()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && - attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined()) - return false; - - if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment()) - return false; - - if ((flags & wxTEXT_ATTR_LEFT_INDENT) && - ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent()))) - return false; - - if ((flags & wxTEXT_ATTR_RIGHT_INDENT) && - (attr1.GetRightIndent() != attr2.GetRightIndent())) - return false; - - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && - (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) - return false; - - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && - (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) - return false; - - if ((flags && wxTEXT_ATTR_LINE_SPACING) && - (attr1.GetLineSpacing() != attr2.GetLineSpacing())) - return false; - - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && - (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) - return false; - - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && - (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_STYLE) && - (attr1.GetBulletStyle() != attr2.GetBulletStyle())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_NUMBER) && - (attr1.GetBulletNumber() != attr2.GetBulletNumber())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) - return false; - -/* TODO - if ((flags & wxTEXT_ATTR_TABS) && - return false; -*/ - - return true; -} - - -/// Apply one style to another -bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style) -{ - // Whole font - if (style.GetFont().Ok() && ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT))) - destStyle.SetFont(style.GetFont()); - else if (style.GetFont().Ok()) - { - wxFont font = destStyle.GetFont(); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) - font.SetFaceName(style.GetFont().GetFaceName()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) - font.SetPointSize(style.GetFont().GetPointSize()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) - font.SetStyle(style.GetFont().GetStyle()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) - font.SetWeight(style.GetFont().GetWeight()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) - font.SetUnderlined(style.GetFont().GetUnderlined()); - - if (font != destStyle.GetFont()) - destStyle.SetFont(font); - } - - if ( style.GetTextColour().Ok() && style.HasTextColour()) - destStyle.SetTextColour(style.GetTextColour()); - - if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); - - if (style.HasAlignment()) - destStyle.SetAlignment(style.GetAlignment()); - - if (style.HasTabs()) - destStyle.SetTabs(style.GetTabs()); +/// Make block from the wxImage +bool wxRichTextImage::MakeBlock() +{ + wxBitmapType type = m_imageBlock.GetImageType(); + if ( type == wxBITMAP_TYPE_ANY || type == wxBITMAP_TYPE_INVALID ) + m_imageBlock.SetImageType(type = wxBITMAP_TYPE_PNG); - if (style.HasLeftIndent()) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); + m_imageBlock.MakeImageBlock(m_image, type); + return m_imageBlock.Ok(); +} - if (style.HasRightIndent()) - destStyle.SetRightIndent(style.GetRightIndent()); - if (style.HasParagraphSpacingAfter()) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); +/// Draw the item +bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style)) +{ + if (!m_image.Ok() && m_imageBlock.Ok()) + LoadFromBlock(); - if (style.HasParagraphSpacingBefore()) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); + if (!m_image.Ok()) + return false; - if (style.HasLineSpacing()) - destStyle.SetLineSpacing(style.GetLineSpacing()); + if (m_image.Ok() && !m_bitmap.Ok()) + m_bitmap = wxBitmap(m_image); - if (style.HasCharacterStyleName()) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); + int y = rect.y + (rect.height - m_image.GetHeight()); - if (style.HasParagraphStyleName()) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + if (m_bitmap.Ok()) + dc.DrawBitmap(m_bitmap, rect.x, y, true); - if (style.HasBulletStyle()) + if (selectionRange.Contains(range.GetStart())) { - destStyle.SetBulletStyle(style.GetBulletStyle()); - destStyle.SetBulletSymbol(style.GetBulletSymbol()); + wxCheckSetBrush(dc, *wxBLACK_BRUSH); + wxCheckSetPen(dc, *wxBLACK_PEN); + dc.SetLogicalFunction(wxINVERT); + dc.DrawRectangle(rect); + dc.SetLogicalFunction(wxCOPY); } - if (style.HasBulletNumber()) - destStyle.SetBulletNumber(style.GetBulletNumber()); - return true; } -bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style) +/// Lay the item out +bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style)) { - wxTextAttrEx destStyle2; - destStyle.CopyTo(destStyle2); - wxRichTextApplyStyle(destStyle2, style); - destStyle = destStyle2; - return true; -} + if (!m_image.Ok()) + LoadFromBlock(); -bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style) -{ - - // Whole font. Avoiding setting individual attributes if possible, since - // it recreates the font each time. - if ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) - { - destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT, - style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName())); - } - else if (style.GetFlags() & (wxTEXT_ATTR_FONT)) + if (m_image.Ok()) { - wxFont font = destStyle.GetFont(); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) - font.SetFaceName(style.GetFontFaceName()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) - font.SetPointSize(style.GetFontSize()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) - font.SetStyle(style.GetFontStyle()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) - font.SetWeight(style.GetFontWeight()); - - if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) - font.SetUnderlined(style.GetFontUnderlined()); - - if (font != destStyle.GetFont()) - destStyle.SetFont(font); + SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight())); + SetPosition(rect.GetPosition()); } - if ( style.GetTextColour().Ok() && style.HasTextColour()) - destStyle.SetTextColour(style.GetTextColour()); - - if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); - - if (style.HasAlignment()) - destStyle.SetAlignment(style.GetAlignment()); - - if (style.HasTabs()) - destStyle.SetTabs(style.GetTabs()); - - if (style.HasLeftIndent()) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); - - if (style.HasRightIndent()) - destStyle.SetRightIndent(style.GetRightIndent()); - - if (style.HasParagraphSpacingAfter()) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); - - if (style.HasParagraphSpacingBefore()) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); - - if (style.HasLineSpacing()) - destStyle.SetLineSpacing(style.GetLineSpacing()); + return true; +} - if (style.HasCharacterStyleName()) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); +/// Get/set the object size for the given range. Returns false if the range +/// is invalid for this object. +bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const +{ + if (!range.IsWithin(GetRange())) + return false; - if (style.HasParagraphStyleName()) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + if (!m_image.Ok()) + ((wxRichTextImage*) this)->LoadFromBlock(); - if (style.HasBulletStyle()) + if (partialExtents) { - destStyle.SetBulletStyle(style.GetBulletStyle()); - destStyle.SetBulletSymbol(style.GetBulletSymbol()); + if (m_image.Ok()) + partialExtents->Add(m_image.GetWidth()); + else + partialExtents->Add(0); } - if (style.HasBulletNumber()) - destStyle.SetBulletNumber(style.GetBulletNumber()); + if (!m_image.Ok()) + return false; + + size.x = m_image.GetWidth(); + size.y = m_image.GetHeight(); return true; } +/// Copy +void wxRichTextImage::Copy(const wxRichTextImage& obj) +{ + wxRichTextObject::Copy(obj); + + m_image = obj.m_image; + m_imageBlock = obj.m_imageBlock; +} /*! - * wxRichTextAttr stores attributes without a wxFont object, so is a much more - * efficient way to query styles. + * Utilities + * */ -// ctors -wxRichTextAttr::wxRichTextAttr(const wxColour& colText, - const wxColour& colBack, - wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack) +/// Compare two attribute objects +bool wxTextAttrEq(const wxTextAttr& attr1, const wxTextAttr& attr2) { - Init(); - - if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; - if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; - if (alignment != wxTEXT_ALIGNMENT_DEFAULT) - m_flags |= wxTEXT_ATTR_ALIGNMENT; + return (attr1 == attr2); } -wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr) +// Partial equality test taking flags into account +bool wxTextAttrEqPartial(const wxTextAttr& attr1, const wxTextAttr& attr2, int flags) { - Init(); - - (*this) = attr; -} - -// operations -void wxRichTextAttr::Init() -{ - m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT; - m_flags = 0; - m_leftIndent = 0; - m_leftSubIndent = 0; - m_rightIndent = 0; - - m_fontSize = 12; - m_fontStyle = wxNORMAL; - m_fontWeight = wxNORMAL; - m_fontUnderlined = false; - - m_paragraphSpacingAfter = 0; - m_paragraphSpacingBefore = 0; - m_lineSpacing = 0; - m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; - m_bulletNumber = 0; - m_bulletSymbol = wxT('*'); -} - -// operators -void wxRichTextAttr::operator= (const wxRichTextAttr& attr) -{ - m_colText = attr.m_colText; - m_colBack = attr.m_colBack; - m_textAlignment = attr.m_textAlignment; - m_leftIndent = attr.m_leftIndent; - m_leftSubIndent = attr.m_leftSubIndent; - m_rightIndent = attr.m_rightIndent; - m_tabs = attr.m_tabs; - m_flags = attr.m_flags; - - m_fontSize = attr.m_fontSize; - m_fontStyle = attr.m_fontStyle; - m_fontWeight = attr.m_fontWeight; - m_fontUnderlined = attr.m_fontUnderlined; - m_fontFaceName = attr.m_fontFaceName; - - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_characterStyleName = attr.m_characterStyleName; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; -} - -// operators -void wxRichTextAttr::operator= (const wxTextAttrEx& attr) -{ - m_colText = attr.GetTextColour(); - m_colBack = attr.GetBackgroundColour(); - m_textAlignment = attr.GetAlignment(); - m_leftIndent = attr.GetLeftIndent(); - m_leftSubIndent = attr.GetLeftSubIndent(); - m_rightIndent = attr.GetRightIndent(); - m_tabs = attr.GetTabs(); - m_flags = attr.GetFlags(); - - m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter(); - m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore(); - m_lineSpacing = attr.GetLineSpacing(); - m_characterStyleName = attr.GetCharacterStyleName(); - m_paragraphStyleName = attr.GetParagraphStyleName(); - - if (attr.GetFont().Ok()) - GetFontAttributes(attr.GetFont()); -} - -// Making a wxTextAttrEx object. -wxRichTextAttr::operator wxTextAttrEx () const -{ - wxTextAttrEx attr; - CopyTo(attr); - return attr; + return attr1.EqPartial(attr2, flags); } -// Copy to a wxTextAttr -void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const +/// Compare tabs +bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) { - attr.SetTextColour(GetTextColour()); - attr.SetBackgroundColour(GetBackgroundColour()); - attr.SetAlignment(GetAlignment()); - attr.SetTabs(GetTabs()); - attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent()); - attr.SetRightIndent(GetRightIndent()); - attr.SetFont(CreateFont()); - attr.SetFlags(GetFlags()); // Important: set after SetFont, since SetFont sets flags - - attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter); - attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore); - attr.SetLineSpacing(m_lineSpacing); - attr.SetBulletStyle(m_bulletStyle); - attr.SetBulletNumber(m_bulletNumber); - attr.SetBulletSymbol(m_bulletSymbol); - attr.SetCharacterStyleName(m_characterStyleName); - attr.SetParagraphStyleName(m_paragraphStyleName); + if (tabs1.GetCount() != tabs2.GetCount()) + return false; + size_t i; + for (i = 0; i < tabs1.GetCount(); i++) + { + if (tabs1[i] != tabs2[i]) + return false; + } + return true; } -// Create font from font attributes. -wxFont wxRichTextAttr::CreateFont() const +bool wxRichTextApplyStyle(wxTextAttr& destStyle, const wxTextAttr& style, wxTextAttr* compareWith) { - wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName); - return font; + return destStyle.Apply(style, compareWith); } -// Get attributes from font. -bool wxRichTextAttr::GetFontAttributes(const wxFont& font) +// Remove attributes +bool wxRichTextRemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style) { - if (!font.Ok()) - return false; - - m_fontSize = font.GetPointSize(); - m_fontStyle = font.GetStyle(); - m_fontWeight = font.GetWeight(); - m_fontUnderlined = font.GetUnderlined(); - m_fontFaceName = font.GetFaceName(); - - return true; + return wxTextAttr::RemoveStyle(destStyle, style); } -/*! - * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes. - */ - -wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr) +/// Combine two bitlists, specifying the bits of interest with separate flags. +bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB) { - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_characterStyleName = attr.m_characterStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; + return wxTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB); } -// Initialise this object. -void wxTextAttrEx::Init() +/// Compare two bitlists +bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags) { - m_paragraphSpacingAfter = 0; - m_paragraphSpacingBefore = 0; - m_lineSpacing = 0; - m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; - m_bulletNumber = 0; - m_bulletSymbol = 0; - m_bulletSymbol = wxT('*'); + return wxTextAttr::BitlistsEqPartial(valueA, valueB, flags); } -// Assignment from a wxTextAttrEx object -void wxTextAttrEx::operator= (const wxTextAttrEx& attr) +/// Split into paragraph and character styles +bool wxRichTextSplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle) { - wxTextAttr::operator= (attr); - - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_characterStyleName = attr.m_characterStyleName; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; + return wxTextAttr::SplitParaCharStyles(style, parStyle, charStyle); } -// Assignment from a wxTextAttr object. -void wxTextAttrEx::operator= (const wxTextAttr& attr) +/// Convert a decimal to Roman numerals +wxString wxRichTextDecimalToRoman(long n) { - wxTextAttr::operator= (attr); + static wxArrayInt decimalNumbers; + static wxArrayString romanNumbers; + + // Clean up arrays + if (n == -1) + { + decimalNumbers.Clear(); + romanNumbers.Clear(); + return wxEmptyString; + } + + if (decimalNumbers.GetCount() == 0) + { + #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r); + + wxRichTextAddDecRom(1000, wxT("M")); + wxRichTextAddDecRom(900, wxT("CM")); + wxRichTextAddDecRom(500, wxT("D")); + wxRichTextAddDecRom(400, wxT("CD")); + wxRichTextAddDecRom(100, wxT("C")); + wxRichTextAddDecRom(90, wxT("XC")); + wxRichTextAddDecRom(50, wxT("L")); + wxRichTextAddDecRom(40, wxT("XL")); + wxRichTextAddDecRom(10, wxT("X")); + wxRichTextAddDecRom(9, wxT("IX")); + wxRichTextAddDecRom(5, wxT("V")); + wxRichTextAddDecRom(4, wxT("IV")); + wxRichTextAddDecRom(1, wxT("I")); + } + + int i = 0; + wxString roman; + + while (n > 0 && i < 13) + { + if (n >= decimalNumbers[i]) + { + n -= decimalNumbers[i]; + roman += romanNumbers[i]; + } + else + { + i ++; + } + } + if (roman.IsEmpty()) + roman = wxT("0"); + return roman; } /*! @@ -4623,13 +7279,14 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr) IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject) +#if wxUSE_FFILE && wxUSE_STREAMS bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename) { wxFFileInputStream stream(filename); if (stream.Ok()) return LoadFile(buffer, stream); - else - return false; + + return false; } bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) @@ -4637,9 +7294,10 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f wxFFileOutputStream stream(filename); if (stream.Ok()) return SaveFile(buffer, stream); - else - return false; + + return false; } +#endif // wxUSE_FFILE && wxUSE_STREAMS /// Can we handle this filename (if using files)? By default, checks the extension. bool wxRichTextFileHandler::CanHandle(const wxString& filename) const @@ -4658,43 +7316,54 @@ bool wxRichTextFileHandler::CanHandle(const wxString& filename) const IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler) #if wxUSE_STREAMS -bool wxRichTextPlainTextHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) +bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) { if (!stream.IsOk()) return false; wxString str; - int ch = 0; + int lastCh = 0; while (!stream.Eof()) { - ch = stream.GetC(); + int ch = stream.GetC(); + + if (!stream.Eof()) + { + if (ch == 10 && lastCh != 13) + str += wxT('\n'); + + if (ch > 0 && ch != 10) + str += wxChar(ch); - if (ch > 0) - str += ch; + lastCh = ch; + } } + buffer->ResetAndClearCommands(); buffer->Clear(); buffer->AddParagraphs(str); buffer->UpdateRanges(); return true; - } -bool wxRichTextPlainTextHandler::SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) +bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { if (!stream.IsOk()) return false; wxString text = buffer->GetText(); + + wxString newLine = wxRichTextLineBreakChar; + text.Replace(newLine, wxT("\n")); + wxCharBuffer buf = text.ToAscii(); - stream.Write((const char*) buf, text.Length()); + stream.Write((const char*) buf, text.length()); return true; } - -#endif +#endif // wxUSE_STREAMS /* * Stores information about an image, in binary in-memory form @@ -4724,16 +7393,15 @@ void wxRichTextImageBlock::Init() { m_data = NULL; m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } void wxRichTextImageBlock::Clear() { - if (m_data) - delete m_data; + delete[] m_data; m_data = NULL; m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } @@ -4743,15 +7411,16 @@ void wxRichTextImageBlock::Clear() // If it's not a JPEG we can make use of 'image', already scaled, so we don't have to // load the image a 2nd time. -bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG) +bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType, + wxImage& image, bool convertToJPEG) { m_imageType = imageType; wxString filenameToRead(filename); - bool removeFile = FALSE; + bool removeFile = false; - if (imageType == -1) - return FALSE; // Could not determine image type + if (imageType == wxBITMAP_TYPE_INVALID) + return false; // Could not determine image type if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG) { @@ -4764,13 +7433,13 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG); filenameToRead = tempFile; - removeFile = TRUE; + removeFile = true; m_imageType = wxBITMAP_TYPE_JPEG; } wxFile file; if (!file.Open(filenameToRead)) - return FALSE; + return false; m_dataSize = (size_t) file.Length(); file.Close(); @@ -4787,30 +7456,30 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp // Make an image block from the wxImage in the given // format. -bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality) +bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality) { m_imageType = imageType; image.SetOption(wxT("quality"), quality); - if (imageType == -1) - return FALSE; // Could not determine image type + if (imageType == wxBITMAP_TYPE_INVALID) + return false; // Could not determine image type wxString tempFile; bool success = wxGetTempFileName(_("image"), tempFile) ; - + wxASSERT(success); wxUnusedVar(success); - + if (!image.SaveFile(tempFile, m_imageType)) { if (wxFileExists(tempFile)) wxRemoveFile(tempFile); - return FALSE; + return false; } wxFile file; if (!file.Open(tempFile)) - return FALSE; + return false; m_dataSize = (size_t) file.Length(); file.Close(); @@ -4859,10 +7528,10 @@ void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block) bool wxRichTextImageBlock::Load(wxImage& image) { if (!m_data) - return FALSE; + return false; // Read in the image. -#if 1 +#if wxUSE_STREAMS wxMemoryInputStream mstream(m_data, m_dataSize); bool success = image.LoadFile(mstream, GetImageType()); #else @@ -4872,7 +7541,7 @@ bool wxRichTextImageBlock::Load(wxImage& image) if (!WriteBlock(tempFile, m_data, m_dataSize)) { - return FALSE; + return false; } success = image.LoadFile(tempFile, GetImageType()); wxRemoveFile(tempFile); @@ -4884,36 +7553,56 @@ bool wxRichTextImageBlock::Load(wxImage& image) // Write data in hex to a stream bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) { - wxString hex; - int i; - for (i = 0; i < (int) m_dataSize; i++) + const int bufSize = 512; + char buf[bufSize+1]; + + int left = m_dataSize; + int n, i, j; + j = 0; + while (left > 0) { - hex = wxDecToHex(m_data[i]); - wxCharBuffer buf = hex.ToAscii(); - - stream.Write((const char*) buf, hex.Length()); - } + if (left*2 > bufSize) + { + n = bufSize; left -= (bufSize/2); + } + else + { + n = left*2; left = 0; + } + + char* b = buf; + for (i = 0; i < (n/2); i++) + { + wxDecToHex(m_data[j], b, b+1); + b += 2; j ++; + } + buf[n] = 0; + stream.Write((const char*) buf, n); + } return true; } // Read data in hex from a stream -bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType) +bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType) { int dataSize = length/2; if (m_data) delete[] m_data; - wxString str(wxT(" ")); + // create a null terminated temporary string: + char str[3]; + str[2] = '\0'; + m_data = new unsigned char[dataSize]; int i; for (i = 0; i < dataSize; i ++) { - str[0] = stream.GetC(); - str[1] = stream.GetC(); + str[0] = (char)stream.GetC(); + str[1] = (char)stream.GetC(); - m_data[i] = wxHexToDec(str); + m_data[i] = (unsigned char)wxHexToDec(str); } m_dataSize = dataSize; @@ -4922,7 +7611,6 @@ bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageT return true; } - // Allocate and read from stream as a block of memory unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size) { @@ -4957,11 +7645,218 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b { wxFileOutputStream outStream(filename); if (!outStream.Ok()) - return FALSE; + return false; return WriteBlock(outStream, block, size); } +// Gets the extension for the block's type +wxString wxRichTextImageBlock::GetExtension() const +{ + wxImageHandler* handler = wxImage::FindHandler(GetImageType()); + if (handler) + return handler->GetExtension(); + else + return wxEmptyString; +} + +#if wxUSE_DATAOBJ + +/*! + * The data object for a wxRichTextBuffer + */ + +const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape"); + +wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer) +{ + m_richTextBuffer = richTextBuffer; + + // this string should uniquely identify our format, but is otherwise + // arbitrary + m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId()); + + SetFormat(m_formatRichTextBuffer); +} + +wxRichTextBufferDataObject::~wxRichTextBufferDataObject() +{ + delete m_richTextBuffer; +} + +// after a call to this function, the richTextBuffer is owned by the caller and it +// is responsible for deleting it! +wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer() +{ + wxRichTextBuffer* richTextBuffer = m_richTextBuffer; + m_richTextBuffer = NULL; + + return richTextBuffer; +} + +wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const +{ + return m_formatRichTextBuffer; +} + +size_t wxRichTextBufferDataObject::GetDataSize() const +{ + if (!m_richTextBuffer) + return 0; + + wxString bufXML; + + { + wxStringOutputStream stream(& bufXML); + if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) + { + wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); + return 0; + } + } + +#if wxUSE_UNICODE + wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); + return strlen(buffer) + 1; +#else + return bufXML.Length()+1; #endif - // wxUSE_RICHTEXT +} + +bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const +{ + if (!pBuf || !m_richTextBuffer) + return false; + + wxString bufXML; + + { + wxStringOutputStream stream(& bufXML); + if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) + { + wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); + return 0; + } + } + +#if wxUSE_UNICODE + wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); + size_t len = strlen(buffer); + memcpy((char*) pBuf, (const char*) buffer, len); + ((char*) pBuf)[len] = 0; +#else + size_t len = bufXML.Length(); + memcpy((char*) pBuf, (const char*) bufXML.c_str(), len); + ((char*) pBuf)[len] = 0; +#endif + + return true; +} + +bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) +{ + delete m_richTextBuffer; + m_richTextBuffer = NULL; + + wxString bufXML((const char*) buf, wxConvUTF8); + + m_richTextBuffer = new wxRichTextBuffer; + + wxStringInputStream stream(bufXML); + if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML)) + { + wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler.")); + + delete m_richTextBuffer; + m_richTextBuffer = NULL; + + return false; + } + return true; +} + +#endif + // wxUSE_DATAOBJ + + +/* + * wxRichTextFontTable + * Manages quick access to a pool of fonts for rendering rich text + */ + +WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxFont, wxRichTextFontTableHashMap, class WXDLLIMPEXP_RICHTEXT); + +class wxRichTextFontTableData: public wxObjectRefData +{ +public: + wxRichTextFontTableData() {} + + wxFont FindFont(const wxTextAttr& fontSpec); + + wxRichTextFontTableHashMap m_hashMap; +}; + +wxFont wxRichTextFontTableData::FindFont(const wxTextAttr& fontSpec) +{ + wxString facename(fontSpec.GetFontFaceName()); + wxString spec(wxString::Format(wxT("%d-%d-%d-%d-%s-%d"), fontSpec.GetFontSize(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), facename.c_str(), (int) fontSpec.GetFontEncoding())); + wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec); + if ( entry == m_hashMap.end() ) + { + wxFont font(fontSpec.GetFontSize(), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str()); + m_hashMap[spec] = font; + return font; + } + else + { + return entry->second; + } +} + +IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject) + +wxRichTextFontTable::wxRichTextFontTable() +{ + m_refData = new wxRichTextFontTableData; +} + +wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table) + : wxObject() +{ + (*this) = table; +} + +wxRichTextFontTable::~wxRichTextFontTable() +{ + UnRef(); +} + +bool wxRichTextFontTable::operator == (const wxRichTextFontTable& table) const +{ + return (m_refData == table.m_refData); +} + +void wxRichTextFontTable::operator= (const wxRichTextFontTable& table) +{ + Ref(table); +} + +wxFont wxRichTextFontTable::FindFont(const wxTextAttr& fontSpec) +{ + wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData; + if (data) + return data->FindFont(fontSpec); + else + return wxFont(); +} + +void wxRichTextFontTable::Clear() +{ + wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData; + if (data) + data->m_hashMap.clear(); +} + +#endif + // wxUSE_RICHTEXT