X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e967276d8bce0ea59924f71ed00962ce19a742e..37702a44db52f188c1ea5df89f857c797b7fc297:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index e5fa616f93..f1ed9eacf1 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtextbuffer.cpp +// Name: src/richtext/richtextbuffer.cpp // Purpose: Buffer for wxRichTextCtrl // Author: Julian Smart // Modified by: @@ -13,32 +13,35 @@ #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/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/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) /*! * wxRichTextObject @@ -79,11 +82,12 @@ 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) @@ -174,9 +178,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 +200,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 +223,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(); } @@ -368,7 +375,7 @@ bool wxRichTextCompositeObject::Defragment() if (child->CanMerge(nextChild) && child->Merge(nextChild)) { nextChild->Dereference(); - delete node->GetNext(); + m_children.Erase(node->GetNext()); // Don't set node -- we'll see if we can merge again with the next // child. @@ -440,13 +447,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) 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); } else return false; @@ -485,6 +492,7 @@ void wxRichTextParagraphLayoutBox::Init() m_rightMargin = 4; m_topMargin = 4; m_bottomMargin = 4; + m_partialParagraph = false; } /// Draw the item @@ -516,7 +524,31 @@ 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. + 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); @@ -524,13 +556,13 @@ 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) + if (invalidRange == wxRICHTEXT_NONE && !formatRect) return true; if (invalidRange == wxRICHTEXT_ALL) @@ -542,7 +574,9 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl if (firstParagraph) { wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph); - wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? firstNode->GetPrevious() : (wxRichTextObjectList::compatibility_iterator) NULL; + wxRichTextObjectList::compatibility_iterator previousNode; + if ( firstNode ) + previousNode = firstNode->GetPrevious(); if (firstNode && previousNode) { wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph); @@ -556,21 +590,33 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl } } + // 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") ); // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines - if (child && (layoutAll || child->GetLines().GetCount() == 0 || !child->GetRange().IsOutside(invalidRange))) + 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 { @@ -615,15 +661,17 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj) { wxRichTextBox::Copy(obj); + + m_partialParagraph = obj.m_partialParagraph; } /// 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) 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(); @@ -674,7 +722,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); @@ -828,16 +876,23 @@ 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, wxTextAttrEx* paraStyle) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + // Don't use the base style, just the default style, and the base style will + // be combined at display time + wxTextAttrEx style(GetDefaultStyle()); +#else wxTextAttrEx style(GetAttributes()); // 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()); - +#endif wxRichTextParagraph* para = new wxRichTextParagraph(text, this, & style); + if (paraStyle) + para->SetAttributes(*paraStyle); AppendChild(para); @@ -848,9 +903,15 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text) } /// Adds multiple paragraphs, based on newlines. -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + // Don't use the base style, just the default style, and the base style will + // be combined at display time + wxTextAttrEx style(GetDefaultStyle()); +#else wxTextAttrEx style(GetAttributes()); + //wxLogDebug("Initial style = %s", style.GetFont().GetFaceName()); //wxLogDebug("Initial size = %d", style.GetFont().GetPointSize()); @@ -861,24 +922,42 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text //wxLogDebug("Style after applying default style = %s", style.GetFont().GetFaceName()); //wxLogDebug("Size after applying default style = %d", style.GetFont().GetPointSize()); +#endif 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, & style); + if (paraStyle) + para->SetAttributes(*paraStyle); + + 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); + wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); + plainText->SetText(line); + + para = new wxRichTextParagraph(wxEmptyString, this, & style); + if (paraStyle) + para->SetAttributes(*paraStyle); AppendChild(para); - if (!firstPara) - firstPara = para; + + //if (!firstPara) + // firstPara = para; + lastPara = para; line = wxEmptyString; } @@ -887,13 +966,14 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text i ++; } + 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) @@ -903,27 +983,38 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text 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, wxTextAttrEx* paraStyle) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + // Don't use the base style, just the default style, and the base style will + // be combined at display time + wxTextAttrEx style(GetDefaultStyle()); +#else wxTextAttrEx style(GetAttributes()); // 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()); +#endif wxRichTextParagraph* para = new wxRichTextParagraph(this, & style); AppendChild(para); para->AppendChild(new wxRichTextImage(image, this)); + if (paraStyle) + para->SetAttributes(*paraStyle); + UpdateRanges(); SetDirty(true); @@ -937,7 +1028,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image) /// 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); @@ -1071,7 +1162,9 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm if (finalPara->GetChildCount() == 0) { wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); +#if !wxRICHTEXT_USE_DYNAMIC_STYLES text->SetAttributes(finalPara->GetAttributes()); +#endif finalPara->AppendChild(text); } @@ -1096,13 +1189,11 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm 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) @@ -1317,7 +1408,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) } wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); - delete node1; + nextParagraph->GetChildren().Erase(node1); node1 = next1; } @@ -1348,8 +1439,8 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra wxRichTextObject* child = node->GetData(); if (!child->GetRange().IsOutside(range)) { - if (lineCount > 0) - text += wxT("\n"); +// if (lineCount > 0) +// text += wxT("\n"); wxRichTextRange childRange = range; childRange.LimitTo(child->GetRange()); @@ -1357,6 +1448,9 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra text += childText; + if (childRange.GetEnd() == child->GetRange().GetEnd()) + text += wxT("\n"); + lineCount ++; } node = node->GetNext(); @@ -1374,7 +1468,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); @@ -1462,7 +1556,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 wxRichTextAttr& style, int flags) { bool characterStyle = false; bool paragraphStyle = false; @@ -1472,6 +1566,15 @@ 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); + + // Limit the attributes to be set to the content to only character attributes. + wxRichTextAttr characterAttributes(style); + characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER)); + // If we are associated with a control, make undoable; otherwise, apply immediately // to the data. @@ -1502,7 +1605,7 @@ 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) { @@ -1515,10 +1618,35 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const else newPara = para; - if (paragraphStyle) - wxRichTextApplyStyle(newPara->GetAttributes(), style); + if (paragraphStyle && !charactersOnly) + { + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxRichTextAttr combinedAttr(para->GetCombinedAttributes()); + wxRichTextApplyStyle(newPara->GetAttributes(), style, & combinedAttr); + } + else + wxRichTextApplyStyle(newPara->GetAttributes(), style); + } + +#if wxRICHTEXT_USE_DYNAMIC_STYLES + // If 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. + + // 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 (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd()) + if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd()) +#else if (characterStyle && range.GetStart() != newPara->GetRange().GetEnd()) +#endif { wxRichTextRange childRange(range); childRange.LimitTo(newPara->GetRange()); @@ -1527,8 +1655,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const // 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(); @@ -1557,8 +1685,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const 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; @@ -1566,7 +1694,16 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { wxRichTextObject* child = node2->GetData(); - wxRichTextApplyStyle(child->GetAttributes(), style); + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr); + } + else + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes); + if (node2 == lastNode) break; @@ -1587,139 +1724,647 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const } /// Set text attributes -bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, bool withUndo) +bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags) { wxRichTextAttr richStyle = style; - return SetStyle(range, richStyle, withUndo); + return SetStyle(range, richStyle, flags); } /// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const +bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) { - wxRichTextObject* obj = NULL; - if (style.IsParagraphStyle()) - obj = GetParagraphAtPosition(position); - else - obj = GetLeafObjectAtPosition(position); - if (obj) + return DoGetStyle(position, style, true); +} + +/// Get the text attributes for this position. +bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) +{ + wxTextAttrEx textAttrEx(style); + if (GetStyle(position, textAttrEx)) { - style = obj->GetAttributes(); + style = textAttrEx; return true; } else return false; } -/// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const +/// Get the content (uncombined) attributes for this position. +bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style) { - wxRichTextObject* obj = NULL; - if (style.IsParagraphStyle()) - obj = GetParagraphAtPosition(position); - else - obj = GetLeafObjectAtPosition(position); - if (obj) + return DoGetStyle(position, style, false); +} + +bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style) +{ + wxTextAttrEx textAttrEx(style); + if (GetUncombinedStyle(position, textAttrEx)) { - style = obj->GetAttributes(); + style = textAttrEx; return true; } else return false; } -/// Set default style -bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style) +/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and +/// context attributes. +bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles) { - m_defaultAttributes = style; + wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); - return true; + if (style.IsParagraphStyle()) + { + obj = GetParagraphAtPosition(position); + if (obj) + { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + if (combineStyles) + { + // Start with the base style + style = GetAttributes(); + + // Apply the paragraph style + wxRichTextApplyStyle(style, obj->GetAttributes()); + } + else + style = obj->GetAttributes(); +#else + style = obj->GetAttributes(); +#endif + return true; + } + } + else + { + obj = GetLeafObjectAtPosition(position); + if (obj) + { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + if (combineStyles) + { + wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph); + style = para ? para->GetCombinedAttributes(obj->GetAttributes()) : obj->GetAttributes(); + } + else + style = obj->GetAttributes(); +#else + style = obj->GetAttributes(); +#endif + return true; + } + } + return false; } -/// 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 +static bool wxHasStyle(long flags, long style) { - int foundCount = 0; - int matchingCount = 0; + return (flags & style) != 0; +} - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) +/// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of +/// content. +bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, const wxTextAttrEx& style, long& multipleStyleAttributes) +{ + if (style.HasFont()) { - wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (para != NULL); - - if (para) + if (style.HasSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE)) { - // Stop searching if we're beyond the range of interest - if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; + if (currentStyle.GetFont().Ok() && currentStyle.HasSize()) + { + if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_SIZE); + } + } + else + { + if (!currentStyle.GetFont().Ok()) + wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); + wxFont font(currentStyle.GetFont()); + font.SetPointSize(style.GetFont().GetPointSize()); - if (!para->GetRange().IsOutside(range)) + wxSetFontPreservingStyles(currentStyle, font); + currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); + } + } + + if (style.HasItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC)) + { + if (currentStyle.GetFont().Ok() && currentStyle.HasItalic()) { - wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); + if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_ITALIC); + } + } + else + { + if (!currentStyle.GetFont().Ok()) + wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); + wxFont font(currentStyle.GetFont()); + font.SetStyle(style.GetFont().GetStyle()); + wxSetFontPreservingStyles(currentStyle, font); + currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); + } + } - while (node2) + if (style.HasWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT)) + { + if (currentStyle.GetFont().Ok() && currentStyle.HasWeight()) + { + if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight()) { - wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) - { - foundCount ++; - if (wxTextAttrEqPartial(child->GetAttributes(), style, style.GetFlags())) - matchingCount ++; - } + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT); + } + } + else + { + if (!currentStyle.GetFont().Ok()) + wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); + wxFont font(currentStyle.GetFont()); + font.SetWeight(style.GetFont().GetWeight()); + wxSetFontPreservingStyles(currentStyle, font); + currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); + } + } - node2 = node2->GetNext(); + if (style.HasFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE)) + { + if (currentStyle.GetFont().Ok() && currentStyle.HasFaceName()) + { + wxString faceName1(currentStyle.GetFont().GetFaceName()); + wxString faceName2(style.GetFont().GetFaceName()); + + if (faceName1 != faceName2) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_FACE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_FACE); } } + else + { + if (!currentStyle.GetFont().Ok()) + wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); + wxFont font(currentStyle.GetFont()); + font.SetFaceName(style.GetFont().GetFaceName()); + wxSetFontPreservingStyles(currentStyle, font); + currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); + } } - node = node->GetNext(); + if (style.HasUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE)) + { + if (currentStyle.GetFont().Ok() && currentStyle.HasUnderlined()) + { + if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_UNDERLINE); + } + } + else + { + if (!currentStyle.GetFont().Ok()) + wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); + wxFont font(currentStyle.GetFont()); + font.SetUnderlined(style.GetFont().GetUnderlined()); + wxSetFontPreservingStyles(currentStyle, font); + currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); + } + } } - return foundCount == matchingCount; -} + if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes, 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()); + } -bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const -{ - wxRichTextAttr richStyle = style; - return HasCharacterAttributes(range, richStyle); -} + if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, 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()); + } -/// 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 -{ - int foundCount = 0; - int matchingCount = 0; + if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, 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()); + } - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) + if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TABS)) { - wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (para != NULL); + 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 (para) + if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LEFT_INDENT)) + { + if (currentStyle.HasLeftIndent()) { - // Stop searching if we're beyond the range of interest - if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; + 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 (!para->GetRange().IsOutside(range)) + if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT)) + { + if (currentStyle.HasRightIndent()) + { + if (currentStyle.GetRightIndent() != style.GetRightIndent()) { - foundCount ++; - if (wxTextAttrEqPartial(para->GetAttributes(), style, style.GetFlags())) - matchingCount ++; + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_RIGHT_INDENT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_RIGHT_INDENT); } } + else + currentStyle.SetRightIndent(style.GetRightIndent()); + } - node = node->GetNext(); + if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER)) + { + if (currentStyle.HasParagraphSpacingAfter()) + { + if (currentStyle.HasParagraphSpacingAfter() != style.HasParagraphSpacingAfter()) + { + // 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()); } - return foundCount == matchingCount; -} + + if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE)) + { + if (currentStyle.HasParagraphSpacingBefore()) + { + if (currentStyle.HasParagraphSpacingBefore() != style.HasParagraphSpacingBefore()) + { + // 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, wxTEXT_ATTR_LINE_SPACING)) + { + if (currentStyle.HasLineSpacing()) + { + if (currentStyle.HasLineSpacing() != style.HasLineSpacing()) + { + // 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, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) + { + if (currentStyle.HasCharacterStyleName()) + { + if (currentStyle.HasCharacterStyleName() != style.HasCharacterStyleName()) + { + // 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, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME)) + { + if (currentStyle.HasParagraphStyleName()) + { + if (currentStyle.HasParagraphStyleName() != style.HasParagraphStyleName()) + { + // 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, wxTEXT_ATTR_LIST_STYLE_NAME)) + { + if (currentStyle.HasListStyleName()) + { + if (currentStyle.HasListStyleName() != style.HasListStyleName()) + { + // 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, wxTEXT_ATTR_BULLET_STYLE)) + { + if (currentStyle.HasBulletStyle()) + { + if (currentStyle.HasBulletStyle() != style.HasBulletStyle()) + { + // 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, wxTEXT_ATTR_BULLET_NUMBER)) + { + if (currentStyle.HasBulletNumber()) + { + if (currentStyle.HasBulletNumber() != style.HasBulletNumber()) + { + // 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.HasBulletSymbol() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_SYMBOL)) + { + if (currentStyle.HasBulletSymbol()) + { + if (currentStyle.HasBulletSymbol() != style.HasBulletSymbol()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_SYMBOL; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_SYMBOL); + } + } + else + { + currentStyle.SetBulletSymbol(style.GetBulletSymbol()); + currentStyle.SetBulletFont(style.GetBulletFont()); + } + } + + if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME)) + { + if (currentStyle.HasBulletName()) + { + if (currentStyle.HasBulletName() != style.HasBulletName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME); + } + } + else + { + currentStyle.SetBulletName(style.GetBulletName()); + } + } + + 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, wxTextAttrEx& style) +{ + style = wxTextAttrEx(); + + // The attributes that aren't valid because of multiple styles within the range + long multipleStyleAttributes = 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) + { + wxTextAttrEx paraStyle = para->GetCombinedAttributes(); + + CollectStyle(style, paraStyle, multipleStyleAttributes); + } + else + { + wxRichTextRange paraRange(para->GetRange()); + paraRange.LimitTo(range); + + // First collect paragraph attributes only + wxTextAttrEx paraStyle = para->GetCombinedAttributes(); + paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH); + CollectStyle(style, paraStyle, multipleStyleAttributes); + + wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst(); + + while (childNode) + { + wxRichTextObject* child = childNode->GetData(); + if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart())) + { + wxTextAttrEx childStyle = para->GetCombinedAttributes(child->GetAttributes()); + + // Now collect character attributes only + childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER); + + CollectStyle(style, childStyle, multipleStyleAttributes); + } + + childNode = childNode->GetNext(); + } + } + } + node = node->GetNext(); + } + return true; +} + +/// Set default style +bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style) +{ + // I don't think the default style should be combined with the previous + // default style. + m_defaultAttributes = style; + +#if 0 + // keep the old attributes if the new style doesn't specify them unless the + // new style is empty - then reset m_defaultStyle (as there is no other way + // to do it) + if ( style.IsDefault() ) + m_defaultAttributes = style; + else + m_defaultAttributes = wxTextAttrEx::CombineEx(style, m_defaultAttributes, NULL); +#endif + 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 wxRichTextAttr& 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 ++; +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes()); +#else + const wxTextAttrEx& textAttr = child->GetAttributes(); +#endif + if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + matchingCount ++; + } + + node2 = node2->GetNext(); + } + } + } + + node = node->GetNext(); + } + + return foundCount == matchingCount; +} + +bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const +{ + wxRichTextAttr richStyle = style; + return HasCharacterAttributes(range, richStyle); +} + +/// 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 +{ + 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)) + { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx textAttr = GetAttributes(); + // Apply the paragraph style + wxRichTextApplyStyle(textAttr, para->GetAttributes()); + +#else + const wxTextAttrEx& textAttr = para->GetAttributes(); +#endif + foundCount ++; + if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + matchingCount ++; + } + } + + node = node->GetNext(); + } + return foundCount == matchingCount; +} bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const { @@ -1732,74 +2377,473 @@ void wxRichTextParagraphLayoutBox::Clear() DeleteChildren(); } -void wxRichTextParagraphLayoutBox::Reset() -{ - Clear(); +void wxRichTextParagraphLayoutBox::Reset() +{ + Clear(); + + AddParagraph(wxEmptyString); +} + +/// 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; + + 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->GetStyle(); + foundCount ++; + } + else if (listDef && !paraDef) + { + // Set overall style defined for the list style definition + para->GetAttributes() = listDef->GetStyle(); + + // 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->GetStyle()); + 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->GetStyle(); + + // 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->GetStyle(); + foundCount ++; + } + } + } + + node = node->GetNext(); + } + return foundCount != 0; +} + +/// Set list style +bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + 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 + wxTextAttrEx listStyle(def->GetCombinedStyleForLevel(thisLevel)); + wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); + + // Now we need to check 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); + + // 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_SYMBOL & wxTEXT_ATTR_LIST_STYLE_NAME); + + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); + if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName()); + if (def) + { + newPara->GetAttributes() = def->GetStyle(); + } + } + } + } + } + + 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); + } + return false; +} + +/// Clear list for given range +bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags) +{ + return SetListStyle(range, NULL, flags); +} + +/// 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); +} + +/// 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) +{ + 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); + + // 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; + else if (renumber) // start again + levels[i] = 1; + 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; - AddParagraph(wxEmptyString); -} + if (haveControl && withUndo) + { + action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(range); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); + } -/// Invalidate the buffer. With no argument, invalidates whole buffer. -void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange) -{ - SetDirty(true); - - if (invalidRange == wxRICHTEXT_ALL) + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) { - m_invalidRange = wxRICHTEXT_ALL; - return; + 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; + + wxRichTextListStyleDefinition* defToUse = def; + if (!defToUse) + { + wxRichTextStyleSheet* sheet = GetStyleSheet(); + + if (sheet && !newPara->GetAttributes().GetListStyleName().IsEmpty()) + defToUse = sheet->FindListStyle(newPara->GetAttributes().GetListStyleName()); + } + + if (defToUse) + { + int thisIndent = newPara->GetAttributes().GetLeftIndent(); + int thisLevel = defToUse->FindLevelForIndent(thisIndent); + + // If the paragraph doesn't have an indent, or we've specified a level to apply to all, + // change the level. + if (thisIndent == 0 || specifiedLevel != -1) + thisLevel = specifiedLevel; + + // Do promotion if specified + if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange)) + { + thisLevel = thisLevel - promoteBy; + if (thisLevel < 0) + thisLevel = 0; + if (thisLevel > 9) + thisLevel = 9; + } + + // Apply the overall list style, and item style for this level + wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel)); + 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] = 1; + } + 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; + } + + newPara->GetAttributes().SetBulletNumber(levels[currentLevel]); + + levels[currentLevel] ++; + } + } + } + + node = node->GetNext(); } - // 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()); + // Do action, or delay it until end of batch. + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); + + return true; } -/// Get invalid range, rounding to entire paragraphs if argument is true. -wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const +bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) { - if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE) - return m_invalidRange; - - wxRichTextRange range = m_invalidRange; - - if (wholeParagraphs) + if (GetStyleSheet()) { - wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart()); - wxRichTextParagraph* para2 = GetParagraphAtPosition(range.GetEnd()); - if (para1) - range.SetStart(para1->GetRange().GetStart()); - if (para2) - range.SetEnd(para2->GetRange().GetEnd()); + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return NumberList(range, def, flags, startFrom, specifiedLevel); } - return range; + return false; } -/*! - * wxRichTextFragment class declaration - * This is a lind of paragraph layout box used for storing - * paragraphs for Undo/Redo, for example. - */ +/// 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) +{ + // 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. -IMPLEMENT_DYNAMIC_CLASS(wxRichTextFragment, wxRichTextParagraphLayoutBox) + // For now, only renumber within the promotion range. -/// Initialise -void wxRichTextFragment::Init() -{ - m_partialParagraph = false; + return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel); } -/// Copy -void wxRichTextFragment::Copy(const wxRichTextFragment& obj) +bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel) { - wxRichTextParagraphLayoutBox::Copy(obj); - - m_partialParagraph = obj.m_partialParagraph; + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return PromoteList(promoteBy, range, def, flags, specifiedLevel); + } + return false; } /*! @@ -1809,6 +2853,8 @@ void wxRichTextFragment::Copy(const wxRichTextFragment& obj) IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox) +wxArrayInt wxRichTextParagraph::sm_defaultTabs; + wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style): wxRichTextBox(parent) { @@ -1837,31 +2883,105 @@ 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) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr = GetCombinedAttributes(); +#else + const wxTextAttrEx& attr = GetAttributes(); +#endif + // 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()); - if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) { // TODO } + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD) + { + wxTextAttrEx bulletAttr(GetCombinedAttributes()); + if (bulletAttr.GetTextColour().Ok()) + { + dc.SetPen(wxPen(bulletAttr.GetTextColour())); + dc.SetBrush(wxBrush(bulletAttr.GetTextColour())); + } + else + { + dc.SetPen(*wxBLACK_PEN); + dc.SetBrush(*wxBLACK_BRUSH); + } + + wxFont font; + if (bulletAttr.GetFont().Ok()) + font = bulletAttr.GetFont(); + else + font = (*wxNORMAL_FONT); + + dc.SetFont(font); + + // Get line height from first line, if any + wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; + + wxPoint linePos; + int lineHeight wxDUMMY_INITIALIZE(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 bulletWidth = wxMax(2, (charHeight/3 + 1)); + int bulletHeight = bulletWidth; + + int x = GetPosition().x + leftIndent; + int y = linePos.y + (lineHeight - charHeight/2) - bulletHeight/2; + + if (bulletAttr.GetBulletName() == wxT("standard/square")) + { + dc.DrawRectangle(x, y, bulletWidth, bulletHeight); + } + else // "standard/round", and catch-all + { + dc.DrawEllipse(x, y, bulletWidth, bulletHeight); + } + } else { wxString bulletText = GetBulletText(); if (!bulletText.empty()) { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + // Get the combined font, or if a font is specified for a symbol bullet, + // create the font - if (GetAttributes().GetTextColour().Ok()) - dc.SetTextForeground(GetAttributes().GetTextColour()); + wxTextAttrEx bulletAttr(GetCombinedAttributes()); + wxFont font; + if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && bulletAttr.GetFont().Ok()) + { + font = (*wxTheFontList->FindOrCreateFont(bulletAttr.GetFont().GetPointSize(), bulletAttr.GetFont().GetFamily(), + bulletAttr.GetFont().GetStyle(), bulletAttr.GetFont().GetWeight(), bulletAttr.GetFont().GetUnderlined(), + attr.GetBulletFont())); + } + else if (bulletAttr.GetFont().Ok()) + font = bulletAttr.GetFont(); + else + font = (*wxNORMAL_FONT); + + dc.SetFont(font); + + if (bulletAttr.GetTextColour().Ok()) + dc.SetTextForeground(bulletAttr.GetTextColour()); dc.SetBackgroundMode(wxTRANSPARENT); @@ -1869,7 +2989,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; wxPoint linePos; - int lineHeight = 0; + int lineHeight wxDUMMY_INITIALIZE(0); if (line) { lineHeight = line->GetSize().y; @@ -1921,7 +3041,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), wxSize objectSize; int descent = 0; - child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED); + child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); // Use the child object's width, but the whole line's height wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); @@ -1945,27 +3065,35 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), /// Lay the item out bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr = GetCombinedAttributes(); +#else + const wxTextAttrEx& attr = GetAttributes(); +#endif + + // 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 && attr.GetFont().Ok()) { - dc.SetFont(GetAttributes().GetFont()); - lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * GetAttributes().GetLineSpacing())/10; + dc.SetFont(attr.GetFont()); + 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; @@ -1976,12 +3104,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; @@ -2032,7 +3157,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) childDescent = child->GetDescent(); } else - GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); + GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED,rect.GetPosition()); if (childSize.x + currentWidth > availableSpaceForText) { @@ -2062,7 +3187,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // Add a new line 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); @@ -2124,8 +3249,8 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) if (lineHeight == 0) { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + if (attr.GetFont().Ok()) + dc.SetFont(attr.GetFont()); lineHeight = dc.GetCharHeight(); } if (maxDescent == 0) @@ -2145,7 +3270,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) ClearUnusedLines(lineCount); // Apply styles to wrapped lines - ApplyParagraphStyle(rect); + ApplyParagraphStyle(attr, rect); SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara)); @@ -2155,9 +3280,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) } /// Apply paragraph styles, such as centering, to wrapped lines -void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect) +void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wxRect& rect) { - if (!GetAttributes().HasAlignment()) + if (!attr.HasAlignment()) return; wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); @@ -2169,12 +3294,12 @@ 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; 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; line->SetPosition(pos); @@ -2188,7 +3313,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) @@ -2215,7 +3340,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)); @@ -2267,7 +3392,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) const { if (!range.IsWithin(GetRange())) return false; @@ -2291,7 +3416,7 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz rangeToUse.LimitTo(child->GetRange()); int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags)) + if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position)) { sz.y = wxMax(sz.y, childSize.y); sz.x += childSize.x; @@ -2336,7 +3461,7 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxSize childSize; int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags)) + if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position)) { lineSize.y = wxMax(lineSize.y, childSize.y); lineSize.x += childSize.x; @@ -2374,8 +3499,6 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h if (line) pt = pt + line->GetPosition(); - *height = dc.GetCharHeight(); - return true; } @@ -2437,7 +3560,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; @@ -2490,7 +3613,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition wxRichTextRange rangeToUse(lineRange.GetStart(), i); - GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED); + GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos); int nextX = childSize.x + linePos.x; @@ -2534,7 +3657,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; } @@ -2594,7 +3722,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()); } @@ -2704,7 +3832,7 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d int spacePos = plainText.Find(wxT(' '), true); if (spacePos != wxNOT_FOUND) { - int positionsFromEndOfString = plainText.Length() - spacePos - 1; + int positionsFromEndOfString = plainText.length() - spacePos - 1; breakPosition = breakPosition - positionsFromEndOfString; } } @@ -2740,31 +3868,12 @@ 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) { @@ -2817,6 +3926,56 @@ bool wxRichTextParagraph::ClearUnusedLines(int lineCount) return true; } +/// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically +/// retrieve the actual style. +wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& contentStyle) const +{ + wxTextAttrEx 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. +wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes() const +{ + wxTextAttrEx 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(); +} + /*! * wxRichTextLine @@ -2878,9 +4037,20 @@ wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* m_text = text; } +#define USE_KERNING_FIX 1 + /// Draw the item bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style)) { +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); + wxASSERT (para != NULL); + + wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); +#else + wxTextAttrEx textAttr(GetAttributes()); +#endif + int offset = GetRange().GetStart(); long len = range.GetLength(); @@ -2894,30 +4064,19 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR // Test for the optimized situations where all is selected, or none // is selected. - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); + if (textAttr.GetFont().Ok()) + dc.SetFont(textAttr.GetFont()); // (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 { @@ -2936,12 +4095,24 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen); wxString stringFragment = m_text.Mid(r1 - offset, fragmentLen); - dc.SetTextForeground(GetAttributes().GetTextColour()); - dc.DrawText(stringFragment, x, y); + DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); - wxCoord w, h; - dc.GetTextExtent(stringFragment, & w, & h); - x += w; +#if USE_KERNING_FIX + if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND) + { + // Compensate for kerning difference + wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1)); + wxString stringFragment3(m_text.Mid(r1 - 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); + + int kerningDiff = (w1 + w3) - w2; + x = x - kerningDiff; + } +#endif } // 2. Selected chunk, if any. @@ -2955,17 +4126,24 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen); wxString stringFragment = m_text.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(m_text.Mid(s1 - offset, fragmentLen+1)); + wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1)); - x += w; + wxCoord w1, h1, w2, h2, w3, h3; + dc.GetTextExtent(stringFragment, & w1, & h1); + dc.GetTextExtent(stringFragment2, & w2, & h2); + dc.GetTextExtent(stringFragment3, & w3, & h3); + + int kerningDiff = (w1 + w3) - w2; + x = x - kerningDiff; + } +#endif } // 3. Remaining unselected chunk, if any @@ -2979,19 +4157,111 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen); wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen); - dc.SetTextForeground(GetAttributes().GetTextColour()); - dc.DrawText(stringFragment, x, y); + DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); + } + } + + return true; +} + +bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected) +{ + 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; + + if (selected) + { + dc.SetBrush(*wxBLACK_BRUSH); + dc.SetPen(*wxBLACK_PEN); + dc.SetTextForeground(*wxWHITE); + dc.SetBackgroundMode(wxTRANSPARENT); + } + else + { + dc.SetTextForeground(attr.GetTextColour()); + dc.SetBackgroundMode(wxTRANSPARENT); + } + + 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); + if (nextTabPos > tabPos) + { + not_found = false; + if (selected) + { + w = nextTabPos - x; + wxRect selRect(x, rect.y, w, rect.GetHeight()); + dc.DrawRectangle(selRect); + } + dc.DrawText(stringChunk, x, y); + 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); + x += w; + } return true; + } /// Lay the item out bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style)) { - if (GetAttributes().GetFont().Ok()) - dc.SetFont(GetAttributes().GetFont()); +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); + wxASSERT (para != NULL); + + wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); +#else + wxTextAttrEx textAttr(GetAttributes()); +#endif + + if (textAttr.GetFont().Ok()) + dc.SetFont(textAttr.GetFont()); wxCoord w, h; dc.GetTextExtent(m_text, & w, & h, & m_descent); @@ -3010,24 +4280,76 @@ 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) const { if (!range.IsWithin(GetRange())) return false; +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); + wxASSERT (para != NULL); + + wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); +#else + wxTextAttrEx textAttr(GetAttributes()); +#endif + // 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()); + if (textAttr.GetFont().Ok()) + dc.SetFont(textAttr.GetFont()); int startPos = range.GetStart() - GetRange().GetStart(); long len = range.GetLength(); wxString stringChunk = m_text.Mid(startPos, (size_t) len); wxCoord w, h; + 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) + { + // the string has a tab + // break up the string at the Tab + wxString stringFragment = stringChunk.BeforeFirst(wxT('\t')); + stringChunk = stringChunk.AfterFirst(wxT('\t')); + dc.GetTextExtent(stringFragment, & w, & h); + width += w; + int absoluteWidth = width + position.x; + bool notFound = true; + for (int i = 0; i < tabCount && notFound; ++i) + { + nextTabPos = tabArray.Item(i); + if (nextTabPos > absoluteWidth) + { + notFound = false; + width = nextTabPos - position.x; + } + } + } + } dc.GetTextExtent(stringChunk, & w, & h, & descent); - size = wxSize(w, dc.GetCharHeight()); + width += w; + size = wxSize(width, dc.GetCharHeight()); return true; } @@ -3037,7 +4359,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) { int index = pos - GetRange().GetStart(); - if (index < 0 || index >= (int) m_text.Length()) + if (index < 0 || index >= (int) m_text.length()) return NULL; wxString firstPart = m_text.Mid(0, index); @@ -3057,7 +4379,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); } @@ -3170,19 +4492,123 @@ void wxRichTextBuffer::Reset() Invalidate(wxRICHTEXT_ALL); } +void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj) +{ + 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); + + wxTextAttrEx* p = NULL; + wxTextAttrEx paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr(GetDefaultStyle()); +#else + wxTextAttrEx attr(GetBasicStyle()); + wxRichTextApplyStyle(attr, GetDefaultStyle()); +#endif + + action->GetNewParagraphs() = paragraphs; + + if (p) + { + wxRichTextObjectList::compatibility_iterator node = m_children.GetLast(); + while (node) + { + wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData(); + obj->SetAttributes(*p); + node = node->GetPrevious(); + } + } + + action->SetPosition(pos); + + // Set the range we'll need to delete in Undo + action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1)); + + 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) + wxTextAttrEx* p = NULL; + wxTextAttrEx paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr(GetDefaultStyle()); +#else + wxTextAttrEx attr(GetBasicStyle()); + wxRichTextApplyStyle(attr, GetDefaultStyle()); +#endif + + 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); + } 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); @@ -3190,12 +4616,25 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich } /// 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* p = NULL; + wxTextAttrEx paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr(GetDefaultStyle()); +#else wxTextAttrEx attr(GetBasicStyle()); wxRichTextApplyStyle(attr, GetDefaultStyle()); +#endif wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr); action->GetNewParagraphs().AppendChild(newPara); @@ -3203,6 +4642,9 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl) action->GetNewParagraphs().SetPartialParagraph(false); action->SetPosition(pos); + if (p) + newPara->SetAttributes(*p); + // Set the range we'll need to delete in Undo action->SetRange(wxRichTextRange(pos, pos)); @@ -3212,14 +4654,30 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl) } /// 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* p = NULL; + wxTextAttrEx paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr(GetDefaultStyle()); +#else wxTextAttrEx attr(GetBasicStyle()); wxRichTextApplyStyle(attr, GetDefaultStyle()); +#endif wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); + if (p) + newPara->SetAttributes(*p); + wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara); newPara->AppendChild(imageObject); action->GetNewParagraphs().AppendChild(newPara); @@ -3237,6 +4695,39 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& 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. +wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition) const +{ + wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); + if (para) + { + if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + if (paraDef && !paraDef->GetNextStyle().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); + if (nextParaDef) + return nextParaDef->GetStyle(); + } + } + wxRichTextAttr 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 wxRichTextAttr(); +} + /// Submit command to delete this range bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl) { @@ -3364,15 +4855,15 @@ bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style) /// 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(); + wxList::compatibility_iterator node = m_attributeStack.GetLast(); wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData(); - delete node; + m_attributeStack.Erase(node); SetDefaultStyle(*attr); @@ -3391,7 +4882,7 @@ bool wxRichTextBuffer::EndAllStyles() /// Clear the style stack void wxRichTextBuffer::ClearStyleStack() { - for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext()) delete (wxTextAttrEx*) node->GetData(); m_attributeStack.Clear(); } @@ -3525,7 +5016,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) 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); + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetBulletNumber(bulletNumber); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -3537,7 +5028,7 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle) { wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT); + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); attr.SetBulletSymbol(symbol); @@ -3545,6 +5036,18 @@ bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int left 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_LEFT_INDENT); + attr.SetBulletStyle(bulletStyle); + attr.SetLeftIndent(leftIndent, leftSubIndent); + attr.SetBulletName(bulletName); + + return BeginStyle(attr); +} + /// Begin named character style bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle) { @@ -3577,6 +5080,24 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle) 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) + { + wxTextAttrEx attr(def->GetCombinedStyleForLevel(level)); + + attr.SetBulletNumber(number); + + return BeginStyle(attr); + } + } + return false; +} + /// Adds a handler to the end void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler) { @@ -3608,12 +5129,14 @@ wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxStrin { 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; } @@ -3726,6 +5249,8 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t /// Load a file bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) + + { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) @@ -3779,12 +5304,45 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range) { bool success = false; - wxString text = GetTextForRange(range); - if (wxTheClipboard->Open()) +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ + + if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open()) { - success = wxTheClipboard->SetData(new wxTextDataObject(text)); + 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; } @@ -3792,15 +5350,28 @@ 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(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + delete richTextBuffer; + } + } + else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)) { wxTextDataObject data; wxTheClipboard->GetData(data); wxString text(data.GetText()); + text.Replace(_T("\r\n"), _T("\n")); InsertTextWithUndo(position+1, text, GetRichTextCtrl()); @@ -3832,6 +5403,9 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxTheClipboard->Close(); } } +#else + wxUnusedVar(position); +#endif return success; } @@ -3839,14 +5413,18 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) bool wxRichTextBuffer::CanPasteFromClipboard() const { bool canPaste = false; - if (wxTheClipboard->Open()) +#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; } wxTheClipboard->Close(); } +#endif return canPaste; } @@ -3873,13 +5451,35 @@ class wxRichTextModule: public wxModule DECLARE_DYNAMIC_CLASS(wxRichTextModule) public: wxRichTextModule() {} - bool OnInit() { wxRichTextBuffer::InitStandardHandlers(); return true; }; - void OnExit() { wxRichTextBuffer::CleanUpHandlers(); }; + bool OnInit() + { + wxRichTextBuffer::InitStandardHandlers(); + wxRichTextParagraph::InitDefaultTabs(); + return true; + }; + void OnExit() + { + wxRichTextBuffer::CleanUpHandlers(); + wxRichTextDecimalToRoman(-1); + wxRichTextParagraph::ClearDefaultTabs(); + wxRichTextCtrl::ClearAvailableFontNames(); + }; }; 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 * @@ -3908,7 +5508,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(); @@ -3919,7 +5519,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(); @@ -3969,10 +5569,17 @@ bool wxRichTextAction::Do() m_buffer->UpdateRanges(); m_buffer->Invalidate(GetRange()); - long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength() - 1; + 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 --; + newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); + UpdateAppearance(newCaretPosition, true /* send update event */); break; @@ -4057,18 +5664,18 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent m_ctrl->SetCaretPosition(caretPosition); if (!m_ctrl->IsFrozen()) { - m_ctrl->Layout(); + m_ctrl->LayoutContent(); m_ctrl->PositionCaret(); - m_ctrl->Refresh(); + m_ctrl->Refresh(false); if (sendUpdateEvent) - m_ctrl->SendUpdateEvent(); + m_ctrl->SendTextUpdatedEvent(); } } } /// 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) @@ -4201,7 +5808,7 @@ bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSE /// 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 +bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position)) const { if (!range.IsWithin(GetRange())) return false; @@ -4218,6 +5825,8 @@ bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, i /// Copy void wxRichTextImage::Copy(const wxRichTextImage& obj) { + wxRichTextObject::Copy(obj); + m_image = obj.m_image; m_imageBlock = obj.m_imageBlock; } @@ -4230,23 +5839,7 @@ void wxRichTextImage::Copy(const wxRichTextImage& obj) /// 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()); + return (attr1 == attr2); } bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2) @@ -4263,15 +5856,18 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2) attr1.GetLeftIndent() == attr2.GetLeftIndent() && attr1.GetRightIndent() == attr2.GetRightIndent() && attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() && - attr1.GetTabs().GetCount() == attr2.GetTabs().GetCount() && // heuristic + wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()) && 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.GetBulletName() == attr2.GetBulletName() && + attr1.GetBulletFont() == attr2.GetBulletFont() && attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && - attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName()); + attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() && + attr1.GetListStyleName() == attr2.GetListStyleName()); } /// Compare two attribute objects, but take into account the flags @@ -4315,26 +5911,30 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i (attr1.GetRightIndent() != attr2.GetRightIndent())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) return false; - if ((flags && wxTEXT_ATTR_LINE_SPACING) && + if ((flags & wxTEXT_ATTR_LINE_SPACING) && (attr1.GetLineSpacing() != attr2.GetLineSpacing())) return false; - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) return false; - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) return false; + if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) && + (attr1.GetListStyleName() != attr2.GetListStyleName())) + return false; + if ((flags & wxTEXT_ATTR_BULLET_STYLE) && (attr1.GetBulletStyle() != attr2.GetBulletStyle())) return false; @@ -4344,13 +5944,17 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i return false; if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) + (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()) && + (attr1.GetBulletFont() != attr2.GetBulletFont())) + return false; + + if ((flags & wxTEXT_ATTR_BULLET_NAME) && + (attr1.GetBulletName() != attr2.GetBulletName())) return false; -/* TODO if ((flags & wxTEXT_ATTR_TABS) && + !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) return false; -*/ return true; } @@ -4397,26 +6001,30 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, (attr1.GetRightIndent() != attr2.GetRightIndent())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) return false; - if ((flags && wxTEXT_ATTR_LINE_SPACING) && + if ((flags & wxTEXT_ATTR_LINE_SPACING) && (attr1.GetLineSpacing() != attr2.GetLineSpacing())) return false; - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) return false; - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) return false; + if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) && + (attr1.GetListStyleName() != attr2.GetListStyleName())) + return false; + if ((flags & wxTEXT_ATTR_BULLET_STYLE) && (attr1.GetBulletStyle() != attr2.GetBulletStyle())) return false; @@ -4426,14 +6034,33 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, return false; if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) + (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()) && + (attr1.GetBulletFont() != attr2.GetBulletFont())) + return false; + + if ((flags & wxTEXT_ATTR_BULLET_NAME) && + (attr1.GetBulletName() != attr2.GetBulletName())) return false; -/* TODO if ((flags & wxTEXT_ATTR_TABS) && + !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) + return false; + + return true; +} + +/// Compare tabs +bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) +{ + 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; } @@ -4449,22 +6076,43 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style) wxFont font = destStyle.GetFont(); if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); font.SetFaceName(style.GetFont().GetFaceName()); + } if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); font.SetPointSize(style.GetFont().GetPointSize()); + } if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); font.SetStyle(style.GetFont().GetStyle()); + } if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); font.SetWeight(style.GetFont().GetWeight()); + } if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); font.SetUnderlined(style.GetFont().GetUnderlined()); + } if (font != destStyle.GetFont()) + { + int oldFlags = destStyle.GetFlags(); + destStyle.SetFont(font); + + destStyle.SetFlags(oldFlags); + } } if ( style.GetTextColour().Ok() && style.HasTextColour()) @@ -4500,12 +6148,21 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style) if (style.HasParagraphStyleName()) destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + if (style.HasListStyleName()) + destStyle.SetListStyleName(style.GetListStyleName()); + if (style.HasBulletStyle()) - { destStyle.SetBulletStyle(style.GetBulletStyle()); + + if (style.HasBulletSymbol()) + { destStyle.SetBulletSymbol(style.GetBulletSymbol()); + destStyle.SetBulletFont(style.GetBulletFont()); } + if (style.HasBulletName()) + destStyle.SetBulletName(style.GetBulletName()); + if (style.HasBulletNumber()) destStyle.SetBulletNumber(style.GetBulletNumber()); @@ -4521,12 +6178,11 @@ bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style) return true; } -bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style) +bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) { - // Whole font. Avoiding setting individual attributes if possible, since // it recreates the font each time. - if ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) + if (((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) && !compareWith) { destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT, style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName())); @@ -4536,69 +6192,243 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style) wxFont font = destStyle.GetFont(); if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) - font.SetFaceName(style.GetFontFaceName()); + { + if (compareWith && compareWith->HasFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()) + { + // The same as currently displayed, so don't set + } + else + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); + font.SetFaceName(style.GetFontFaceName()); + } + } if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) - font.SetPointSize(style.GetFontSize()); + { + if (compareWith && compareWith->HasSize() && compareWith->GetFontSize() == style.GetFontSize()) + { + // The same as currently displayed, so don't set + } + else + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); + font.SetPointSize(style.GetFontSize()); + } + } if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) - font.SetStyle(style.GetFontStyle()); + { + if (compareWith && compareWith->HasItalic() && compareWith->GetFontStyle() == style.GetFontStyle()) + { + // The same as currently displayed, so don't set + } + else + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); + font.SetStyle(style.GetFontStyle()); + } + } if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) - font.SetWeight(style.GetFontWeight()); + { + if (compareWith && compareWith->HasWeight() && compareWith->GetFontWeight() == style.GetFontWeight()) + { + // The same as currently displayed, so don't set + } + else + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); + font.SetWeight(style.GetFontWeight()); + } + } if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) - font.SetUnderlined(style.GetFontUnderlined()); + { + if (compareWith && compareWith->HasUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()) + { + // The same as currently displayed, so don't set + } + else + { + destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); + font.SetUnderlined(style.GetFontUnderlined()); + } + } if (font != destStyle.GetFont()) + { + int oldFlags = destStyle.GetFlags(); + destStyle.SetFont(font); + + destStyle.SetFlags(oldFlags); + } } - if ( style.GetTextColour().Ok() && style.HasTextColour()) - destStyle.SetTextColour(style.GetTextColour()); + if (style.GetTextColour().Ok() && style.HasTextColour()) + { + if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) + destStyle.SetTextColour(style.GetTextColour()); + } - if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); + if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) + { + if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour())) + destStyle.SetBackgroundColour(style.GetBackgroundColour()); + } if (style.HasAlignment()) - destStyle.SetAlignment(style.GetAlignment()); + { + if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment())) + destStyle.SetAlignment(style.GetAlignment()); + } if (style.HasTabs()) - destStyle.SetTabs(style.GetTabs()); + { + if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs()))) + destStyle.SetTabs(style.GetTabs()); + } if (style.HasLeftIndent()) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); + { + if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent() + && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent())) + destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); + } if (style.HasRightIndent()) - destStyle.SetRightIndent(style.GetRightIndent()); + { + if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent())) + destStyle.SetRightIndent(style.GetRightIndent()); + } if (style.HasParagraphSpacingAfter()) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); + { + if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter())) + destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); + } if (style.HasParagraphSpacingBefore()) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); + { + if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore())) + destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); + } if (style.HasLineSpacing()) - destStyle.SetLineSpacing(style.GetLineSpacing()); + { + if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing())) + destStyle.SetLineSpacing(style.GetLineSpacing()); + } if (style.HasCharacterStyleName()) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); + { + if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName())) + destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); + } if (style.HasParagraphStyleName()) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + { + if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName())) + destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + } + + if (style.HasListStyleName()) + { + if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName())) + destStyle.SetListStyleName(style.GetListStyleName()); + } if (style.HasBulletStyle()) { - destStyle.SetBulletStyle(style.GetBulletStyle()); - destStyle.SetBulletSymbol(style.GetBulletSymbol()); + if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle())) + destStyle.SetBulletStyle(style.GetBulletStyle()); + } + + if (style.HasBulletSymbol()) + { + if (!(compareWith && compareWith->HasBulletSymbol() && compareWith->GetBulletSymbol() == style.GetBulletSymbol())) + { + destStyle.SetBulletSymbol(style.GetBulletSymbol()); + destStyle.SetBulletFont(style.GetBulletFont()); + } } if (style.HasBulletNumber()) - destStyle.SetBulletNumber(style.GetBulletNumber()); + { + if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber())) + destStyle.SetBulletNumber(style.GetBulletNumber()); + } + + if (style.HasBulletName()) + { + if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName())) + destStyle.SetBulletName(style.GetBulletName()); + } return true; } +void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font) +{ + long flags = attr.GetFlags(); + attr.SetFont(font); + attr.SetFlags(flags); +} + +/// Convert a decimal to Roman numerals +wxString wxRichTextDecimalToRoman(long n) +{ + 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; +} + /*! * wxRichTextAttr stores attributes without a wxFont object, so is a much more @@ -4670,9 +6500,12 @@ void wxRichTextAttr::operator= (const wxRichTextAttr& attr) m_lineSpacing = attr.m_lineSpacing; m_characterStyleName = attr.m_characterStyleName; m_paragraphStyleName = attr.m_paragraphStyleName; + m_listStyleName = attr.m_listStyleName; m_bulletStyle = attr.m_bulletStyle; m_bulletNumber = attr.m_bulletNumber; m_bulletSymbol = attr.m_bulletSymbol; + m_bulletFont = attr.m_bulletFont; + m_bulletName = attr.m_bulletName; } // operators @@ -4692,6 +6525,12 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr) m_lineSpacing = attr.GetLineSpacing(); m_characterStyleName = attr.GetCharacterStyleName(); m_paragraphStyleName = attr.GetParagraphStyleName(); + m_listStyleName = attr.GetListStyleName(); + m_bulletStyle = attr.GetBulletStyle(); + m_bulletNumber = attr.GetBulletNumber(); + m_bulletSymbol = attr.GetBulletSymbol(); + m_bulletName = attr.GetBulletName(); + m_bulletFont = attr.GetBulletFont(); if (attr.GetFont().Ok()) GetFontAttributes(attr.GetFont()); @@ -4705,6 +6544,40 @@ wxRichTextAttr::operator wxTextAttrEx () const return attr; } +// Equality test +bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const +{ + return GetFlags() == attr.GetFlags() && + + GetTextColour() == attr.GetTextColour() && + GetBackgroundColour() == attr.GetBackgroundColour() && + + GetAlignment() == attr.GetAlignment() && + GetLeftIndent() == attr.GetLeftIndent() && + GetLeftSubIndent() == attr.GetLeftSubIndent() && + GetRightIndent() == attr.GetRightIndent() && + wxRichTextTabsEq(GetTabs(), attr.GetTabs()) && + + GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() && + GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() && + GetLineSpacing() == attr.GetLineSpacing() && + GetCharacterStyleName() == attr.GetCharacterStyleName() && + GetParagraphStyleName() == attr.GetParagraphStyleName() && + GetListStyleName() == attr.GetListStyleName() && + + GetBulletStyle() == attr.GetBulletStyle() && + GetBulletSymbol() == attr.GetBulletSymbol() && + GetBulletNumber() == attr.GetBulletNumber() && + GetBulletFont() == attr.GetBulletFont() && + GetBulletName() == attr.GetBulletName() && + + 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; +} + // Copy to a wxTextAttr void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const { @@ -4715,7 +6588,6 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const 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); @@ -4723,15 +6595,22 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const attr.SetBulletStyle(m_bulletStyle); attr.SetBulletNumber(m_bulletNumber); attr.SetBulletSymbol(m_bulletSymbol); + attr.SetBulletName(m_bulletName); + attr.SetBulletFont(m_bulletFont); attr.SetCharacterStyleName(m_characterStyleName); attr.SetParagraphStyleName(m_paragraphStyleName); + attr.SetListStyleName(m_listStyleName); + attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags } // Create font from font attributes. wxFont wxRichTextAttr::CreateFont() const { wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName); +#ifdef __WXMAC__ + font.SetNoAntiAliasing(true); +#endif return font; } @@ -4750,6 +6629,103 @@ bool wxRichTextAttr::GetFontAttributes(const wxFont& font) return true; } +wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, + const wxRichTextAttr& attrDef, + const wxTextCtrlBase *text) +{ + wxColour colFg = attr.GetTextColour(); + if ( !colFg.Ok() ) + { + colFg = attrDef.GetTextColour(); + + if ( text && !colFg.Ok() ) + colFg = text->GetForegroundColour(); + } + + wxColour colBg = attr.GetBackgroundColour(); + if ( !colBg.Ok() ) + { + colBg = attrDef.GetBackgroundColour(); + + if ( text && !colBg.Ok() ) + colBg = text->GetBackgroundColour(); + } + + wxRichTextAttr newAttr(colFg, colBg); + + if (attr.HasWeight()) + newAttr.SetFontWeight(attr.GetFontWeight()); + + if (attr.HasSize()) + newAttr.SetFontSize(attr.GetFontSize()); + + if (attr.HasItalic()) + newAttr.SetFontStyle(attr.GetFontStyle()); + + if (attr.HasUnderlined()) + newAttr.SetFontUnderlined(attr.GetFontUnderlined()); + + if (attr.HasFaceName()) + newAttr.SetFontFaceName(attr.GetFontFaceName()); + + if (attr.HasAlignment()) + newAttr.SetAlignment(attr.GetAlignment()); + else if (attrDef.HasAlignment()) + newAttr.SetAlignment(attrDef.GetAlignment()); + + if (attr.HasTabs()) + newAttr.SetTabs(attr.GetTabs()); + else if (attrDef.HasTabs()) + newAttr.SetTabs(attrDef.GetTabs()); + + if (attr.HasLeftIndent()) + newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); + else if (attrDef.HasLeftIndent()) + newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent()); + + if (attr.HasRightIndent()) + newAttr.SetRightIndent(attr.GetRightIndent()); + else if (attrDef.HasRightIndent()) + newAttr.SetRightIndent(attrDef.GetRightIndent()); + + // NEW ATTRIBUTES + + if (attr.HasParagraphSpacingAfter()) + newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); + + if (attr.HasParagraphSpacingBefore()) + newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); + + if (attr.HasLineSpacing()) + newAttr.SetLineSpacing(attr.GetLineSpacing()); + + if (attr.HasCharacterStyleName()) + newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); + + if (attr.HasParagraphStyleName()) + newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); + + if (attr.HasListStyleName()) + newAttr.SetListStyleName(attr.GetListStyleName()); + + if (attr.HasBulletStyle()) + newAttr.SetBulletStyle(attr.GetBulletStyle()); + + if (attr.HasBulletNumber()) + newAttr.SetBulletNumber(attr.GetBulletNumber()); + + if (attr.HasBulletName()) + newAttr.SetBulletName(attr.GetBulletName()); + + if (attr.HasBulletSymbol()) + { + newAttr.SetBulletSymbol(attr.GetBulletSymbol()); + newAttr.SetBulletFont(attr.GetBulletFont()); + } + + return newAttr; +} + /*! * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes. */ @@ -4761,9 +6737,12 @@ wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr) m_lineSpacing = attr.m_lineSpacing; m_paragraphStyleName = attr.m_paragraphStyleName; m_characterStyleName = attr.m_characterStyleName; + m_listStyleName = attr.m_listStyleName; m_bulletStyle = attr.m_bulletStyle; m_bulletNumber = attr.m_bulletNumber; m_bulletSymbol = attr.m_bulletSymbol; + m_bulletName = attr.m_bulletName; + m_bulletFont = attr.m_bulletFont; } // Initialise this object. @@ -4774,7 +6753,6 @@ void wxTextAttrEx::Init() m_lineSpacing = 0; m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; m_bulletNumber = 0; - m_bulletSymbol = 0; m_bulletSymbol = wxT('*'); } @@ -4788,9 +6766,12 @@ void wxTextAttrEx::operator= (const wxTextAttrEx& attr) m_lineSpacing = attr.m_lineSpacing; m_characterStyleName = attr.m_characterStyleName; m_paragraphStyleName = attr.m_paragraphStyleName; + m_listStyleName = attr.m_listStyleName; m_bulletStyle = attr.m_bulletStyle; m_bulletNumber = attr.m_bulletNumber; m_bulletSymbol = attr.m_bulletSymbol; + m_bulletFont = attr.m_bulletFont; + m_bulletName = attr.m_bulletName; } // Assignment from a wxTextAttr object. @@ -4799,6 +6780,180 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr) wxTextAttr::operator= (attr); } +// Equality test +bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const +{ + return ( + GetTextColour() == attr.GetTextColour() && + GetBackgroundColour() == attr.GetBackgroundColour() && + GetFont() == attr.GetFont() && + GetAlignment() == attr.GetAlignment() && + GetLeftIndent() == attr.GetLeftIndent() && + GetRightIndent() == attr.GetRightIndent() && + GetLeftSubIndent() == attr.GetLeftSubIndent() && + wxRichTextTabsEq(GetTabs(), attr.GetTabs()) && + GetLineSpacing() == attr.GetLineSpacing() && + GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() && + GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() && + GetBulletStyle() == attr.GetBulletStyle() && + GetBulletNumber() == attr.GetBulletNumber() && + GetBulletSymbol() == attr.GetBulletSymbol() && + GetBulletName() == attr.GetBulletName() && + GetBulletFont() == attr.GetBulletFont() && + GetCharacterStyleName() == attr.GetCharacterStyleName() && + GetParagraphStyleName() == attr.GetParagraphStyleName() && + GetListStyleName() == attr.GetListStyleName()); +} + +wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, + const wxTextAttrEx& attrDef, + const wxTextCtrlBase *text) +{ + wxTextAttrEx newAttr; + + // If attr specifies the complete font, just use that font, overriding all + // default font attributes. + if ((attr.GetFlags() & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT) + newAttr.SetFont(attr.GetFont()); + else + { + // First find the basic, default font + long flags = 0; + + wxFont font; + if (attrDef.HasFont()) + { + flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT); + font = attrDef.GetFont(); + } + else + { + if (text) + font = text->GetFont(); + + // We leave flags at 0 because no font attributes have been specified yet + } + if (!font.Ok()) + font = *wxNORMAL_FONT; + + // Otherwise, if there are font attributes in attr, apply them + if (attr.GetFlags() & wxTEXT_ATTR_FONT) + { + if (attr.HasSize()) + { + flags |= wxTEXT_ATTR_FONT_SIZE; + font.SetPointSize(attr.GetFont().GetPointSize()); + } + if (attr.HasItalic()) + { + flags |= wxTEXT_ATTR_FONT_ITALIC;; + font.SetStyle(attr.GetFont().GetStyle()); + } + if (attr.HasWeight()) + { + flags |= wxTEXT_ATTR_FONT_WEIGHT; + font.SetWeight(attr.GetFont().GetWeight()); + } + if (attr.HasFaceName()) + { + flags |= wxTEXT_ATTR_FONT_FACE; + font.SetFaceName(attr.GetFont().GetFaceName()); + } + if (attr.HasUnderlined()) + { + flags |= wxTEXT_ATTR_FONT_UNDERLINE; + font.SetUnderlined(attr.GetFont().GetUnderlined()); + } + newAttr.SetFont(font); + newAttr.SetFlags(newAttr.GetFlags()|flags); + } + } + + // TODO: should really check we are specifying these in the flags, + // before setting them, as per above; or we will set them willy-nilly. + // However, we should also check whether this is the intention + // as per wxTextAttr::Combine, i.e. always to have valid colours + // in the style. + wxColour colFg = attr.GetTextColour(); + if ( !colFg.Ok() ) + { + colFg = attrDef.GetTextColour(); + + if ( text && !colFg.Ok() ) + colFg = text->GetForegroundColour(); + } + + wxColour colBg = attr.GetBackgroundColour(); + if ( !colBg.Ok() ) + { + colBg = attrDef.GetBackgroundColour(); + + if ( text && !colBg.Ok() ) + colBg = text->GetBackgroundColour(); + } + + newAttr.SetTextColour(colFg); + newAttr.SetBackgroundColour(colBg); + + if (attr.HasAlignment()) + newAttr.SetAlignment(attr.GetAlignment()); + else if (attrDef.HasAlignment()) + newAttr.SetAlignment(attrDef.GetAlignment()); + + if (attr.HasTabs()) + newAttr.SetTabs(attr.GetTabs()); + else if (attrDef.HasTabs()) + newAttr.SetTabs(attrDef.GetTabs()); + + if (attr.HasLeftIndent()) + newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); + else if (attrDef.HasLeftIndent()) + newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent()); + + if (attr.HasRightIndent()) + newAttr.SetRightIndent(attr.GetRightIndent()); + else if (attrDef.HasRightIndent()) + newAttr.SetRightIndent(attrDef.GetRightIndent()); + + // NEW ATTRIBUTES + + if (attr.HasParagraphSpacingAfter()) + newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); + + if (attr.HasParagraphSpacingBefore()) + newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); + + if (attr.HasLineSpacing()) + newAttr.SetLineSpacing(attr.GetLineSpacing()); + + if (attr.HasCharacterStyleName()) + newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); + + if (attr.HasParagraphStyleName()) + newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); + + if (attr.HasListStyleName()) + newAttr.SetListStyleName(attr.GetListStyleName()); + + if (attr.HasBulletStyle()) + newAttr.SetBulletStyle(attr.GetBulletStyle()); + + if (attr.HasBulletNumber()) + newAttr.SetBulletNumber(attr.GetBulletNumber()); + + if (attr.HasBulletName()) + newAttr.SetBulletName(attr.GetBulletName()); + + if (attr.HasBulletSymbol()) + { + newAttr.SetBulletSymbol(attr.GetBulletSymbol()); + newAttr.SetBulletFont(attr.GetBulletFont()); + } + + return newAttr; +} + + /*! * wxRichTextFileHandler * Base class for file handlers @@ -4812,8 +6967,8 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f wxFFileInputStream stream(filename); if (stream.Ok()) return LoadFile(buffer, stream); - else - return false; + + return false; } bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) @@ -4821,8 +6976,8 @@ 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_STREAMS @@ -4849,20 +7004,22 @@ bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStr return false; wxString str; - int ch = 0; int lastCh = 0; while (!stream.Eof()) { - ch = stream.GetC(); + int ch = stream.GetC(); - if (ch == 10 && lastCh != 13) - str += wxT('\n'); + if (!stream.Eof()) + { + if (ch == 10 && lastCh != 13) + str += wxT('\n'); - if (ch > 0 && ch != 10) - str += wxChar(ch); + if (ch > 0 && ch != 10) + str += wxChar(ch); - lastCh = ch; + lastCh = ch; + } } buffer->Clear(); @@ -4881,7 +7038,7 @@ bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputSt wxString text = buffer->GetText(); wxCharBuffer buf = text.ToAscii(); - stream.Write((const char*) buf, text.Length()); + stream.Write((const char*) buf, text.length()); return true; } #endif // wxUSE_STREAMS @@ -4919,8 +7076,7 @@ void wxRichTextImageBlock::Init() void wxRichTextImageBlock::Clear() { - if (m_data) - delete m_data; + delete[] m_data; m_data = NULL; m_dataSize = 0; m_imageType = -1; @@ -5052,7 +7208,7 @@ bool wxRichTextImageBlock::Load(wxImage& image) return false; // Read in the image. -#if 1 +#if wxUSE_STREAMS wxMemoryInputStream mstream(m_data, m_dataSize); bool success = image.LoadFile(mstream, GetImageType()); #else @@ -5081,7 +7237,7 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) hex = wxDecToHex(m_data[i]); wxCharBuffer buf = hex.ToAscii(); - stream.Write((const char*) buf, hex.Length()); + stream.Write((const char*) buf, hex.length()); } return true; @@ -5112,7 +7268,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) { @@ -5152,6 +7307,123 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b return WriteBlock(outStream, block, size); } +#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 + +#endif + // wxUSE_RICHTEXT