X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c025e094f4527b6b6658141a0ee1daa425dc6e49..2d55af1dfa7fd1cc2df13a6593fd51591cfcfcb1:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 4ee7357eea..af17e75462 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -36,9 +36,11 @@ #include "wx/sstream.h" #include "wx/textfile.h" #include "wx/hashmap.h" +#include "wx/dynarray.h" #include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextstyles.h" +#include "wx/richtext/richtextimagedlg.h" #include "wx/listimpl.cpp" @@ -48,12 +50,344 @@ WX_DEFINE_LIST(wxRichTextLineList) // Switch off if the platform doesn't like it for some reason #define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1 +// Use GetPartialTextExtents for platforms that support it natively +#define wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS 1 + const wxChar wxRichTextLineBreakChar = (wxChar) 29; -// Helpers for efficiency +// Helper classes for floating layout +struct wxRichTextFloatRectMap +{ + wxRichTextFloatRectMap(int sY, int eY, int w, wxRichTextObject* obj) + { + startY = sY; + endY = eY; + width = w; + anchor = obj; + } + + int startY, endY; + int width; + wxRichTextObject* anchor; +}; + +WX_DEFINE_SORTED_ARRAY(wxRichTextFloatRectMap*, wxRichTextFloatRectMapArray); + +int wxRichTextFloatRectMapCmp(wxRichTextFloatRectMap* r1, wxRichTextFloatRectMap* r2) +{ + return r1->startY - r2->startY; +} + +class wxRichTextFloatCollector +{ +public: + wxRichTextFloatCollector(int width); + ~wxRichTextFloatCollector(); + + // Collect the floating objects info in the given paragraph + void CollectFloat(wxRichTextParagraph* para); + void CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating); + + // Return the last paragraph we collected + wxRichTextParagraph* LastParagraph(); + + // Given the start y position and the height of the line, + // find out how wide the line can be + wxRect GetAvailableRect(int startY, int endY); + + // Given a floating box, find its fit position + int GetFitPosition(int direction, int start, int height) const; + int GetFitPosition(const wxRichTextFloatRectMapArray& array, int start, int height) const; + + // Find the last y position + int GetLastRectBottom(); + + // Draw the floats inside a rect + void Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style); + + // HitTest the floats + int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition); + + static int SearchAdjacentRect(const wxRichTextFloatRectMapArray& array, int point); + + static int GetWidthFromFloatRect(const wxRichTextFloatRectMapArray& array, int index, int startY, int endY); + + static void FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array); + + static void DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style); + + static int HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition); + +private: + wxRichTextFloatRectMapArray m_left; + wxRichTextFloatRectMapArray m_right; + int m_width; + wxRichTextParagraph* m_para; +}; + +/* + * Binary search helper function + * The argument point is the Y coordinate, and this fuction + * always return the floating rect that contain this coordinate + * or under this coordinate. + */ +int wxRichTextFloatCollector::SearchAdjacentRect(const wxRichTextFloatRectMapArray& array, int point) +{ + int end = array.GetCount() - 1; + int start = 0; + int ret = 0; + + wxASSERT(end >= 0); + + while (true) + { + if (start > end) + { + break; + } + + int mid = (start + end) / 2; + if (array[mid]->startY <= point && array[mid]->endY >= point) + return mid; + else if (array[mid]->startY > point) + { + end = mid - 1; + ret = mid; + } + else if (array[mid]->endY < point) + { + start = mid + 1; + ret = start; + } + } + + return ret; +} + +int wxRichTextFloatCollector::GetWidthFromFloatRect(const wxRichTextFloatRectMapArray& array, int index, int startY, int endY) +{ + int ret = 0; + int len = array.GetCount(); + + wxASSERT(index >= 0 && index < len); + + if (array[index]->startY < startY && array[index]->endY > startY) + ret = ret < array[index]->width ? array[index]->width : ret; + while (index < len && array[index]->startY <= endY) + { + ret = ret < array[index]->width ? array[index]->width : ret; + index++; + } + + return ret; +} + +wxRichTextFloatCollector::wxRichTextFloatCollector(int width) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp) +{ + m_width = width; + m_para = NULL; +} + +void wxRichTextFloatCollector::FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array) +{ + int len = array.GetCount(); + for (int i = 0; i < len; i++) + delete array[i]; +} + +wxRichTextFloatCollector::~wxRichTextFloatCollector() +{ + FreeFloatRectMapArray(m_left); + FreeFloatRectMapArray(m_right); +} + +int wxRichTextFloatCollector::GetFitPosition(const wxRichTextFloatRectMapArray& array, int start, int height) const +{ + if (array.GetCount() == 0) + return start; + + unsigned int i = SearchAdjacentRect(array, start); + int last = start; + while (i < array.GetCount()) + { + if (array[i]->startY - last >= height) + return last + 1; + last = array[i]->endY; + i++; + } + + return last + 1; +} + +int wxRichTextFloatCollector::GetFitPosition(int direction, int start, int height) const +{ + if (direction == wxTEXT_BOX_ATTR_FLOAT_LEFT) + return GetFitPosition(m_left, start, height); + else if (direction == wxTEXT_BOX_ATTR_FLOAT_RIGHT) + return GetFitPosition(m_right, start, height); + else + { + wxASSERT("Never should be here"); + return start; + } +} + +void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating) +{ + int direction = floating->GetFloatDirection(); + + wxPoint pos = floating->GetPosition(); + wxSize size = floating->GetCachedSize(); + wxRichTextFloatRectMap *map = new wxRichTextFloatRectMap(pos.y, pos.y + size.y, size.x, floating); + switch (direction) + { + case wxTEXT_BOX_ATTR_FLOAT_NONE: + delete map; + break; + case wxTEXT_BOX_ATTR_FLOAT_LEFT: + // Just a not-enough simple assertion + wxASSERT (m_left.Index(map) == wxNOT_FOUND); + m_left.Add(map); + break; + case wxTEXT_BOX_ATTR_FLOAT_RIGHT: + wxASSERT (m_right.Index(map) == wxNOT_FOUND); + m_right.Add(map); + break; + default: + delete map; + wxASSERT("Must some error occurs"); + } + + m_para = para; +} + +void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para) +{ + wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst(); + while (node) + { + wxRichTextObject* floating = node->GetData(); + + if (floating->IsFloating()) + { + wxRichTextAnchoredObject* anchor = wxDynamicCast(floating, wxRichTextAnchoredObject); + if (anchor) + { + CollectFloat(para, floating); + } + } + + node = node->GetNext(); + } + + m_para = para; +} + +wxRichTextParagraph* wxRichTextFloatCollector::LastParagraph() +{ + return m_para; +} + +wxRect wxRichTextFloatCollector::GetAvailableRect(int startY, int endY) +{ + int widthLeft = 0, widthRight = 0; + if (m_left.GetCount() != 0) + { + unsigned int i = SearchAdjacentRect(m_left, startY); + if (i >= 0 && i < m_left.GetCount()) + widthLeft = GetWidthFromFloatRect(m_left, i, startY, endY); + } + if (m_right.GetCount() != 0) + { + unsigned int j = SearchAdjacentRect(m_right, startY); + if (j >= 0 && j < m_right.GetCount()) + widthRight = GetWidthFromFloatRect(m_right, j, startY, endY); + } + + return wxRect(widthLeft, 0, m_width - widthLeft - widthRight, 0); +} + +int wxRichTextFloatCollector::GetLastRectBottom() +{ + int ret = 0; + int len = m_left.GetCount(); + if (len) { + ret = ret > m_left[len-1]->endY ? ret : m_left[len-1]->endY; + } + len = m_right.GetCount(); + if (len) { + ret = ret > m_right[len-1]->endY ? ret : m_right[len-1]->endY; + } + + return ret; +} + +void wxRichTextFloatCollector::DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& WXUNUSED(selectionRange), const wxRect& rect, int descent, int style) +{ + int start = rect.y; + int end = rect.y + rect.height; + unsigned int i, j; + i = SearchAdjacentRect(array, start); + if (i < 0 || i >= array.GetCount()) + return; + j = SearchAdjacentRect(array, end); + if (j < 0 || j >= array.GetCount()) + j = array.GetCount() - 1; + while (i <= j) + { + wxRichTextObject* obj = array[i]->anchor; + wxRichTextRange r = obj->GetRange(); + obj->Draw(dc, r, wxRichTextRange(0, -1), wxRect(obj->GetPosition(), obj->GetCachedSize()), descent, style); + i++; + } +} + +void wxRichTextFloatCollector::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style) +{ + if (m_left.GetCount() > 0) + DrawFloat(m_left, dc, range, selectionRange, rect, descent, style); + if (m_right.GetCount() > 0) + DrawFloat(m_right, dc, range, selectionRange, rect, descent, style); +} + +int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition) +{ + unsigned int i; + if (array.GetCount() == 0) + return wxRICHTEXT_HITTEST_NONE; + i = SearchAdjacentRect(array, pt.y); + if (i < 0 || i >= array.GetCount()) + return wxRICHTEXT_HITTEST_NONE; + wxPoint point = array[i]->anchor->GetPosition(); + wxSize size = array[i]->anchor->GetCachedSize(); + if (point.x <= pt.x && point.x + size.x >= pt.x + && point.y <= pt.y && point.y + size.y >= pt.y) + { + textPosition = array[i]->anchor->GetRange().GetStart(); + if (pt.x > (pt.x + pt.x + size.x) / 2) + return wxRICHTEXT_HITTEST_BEFORE; + else + return wxRICHTEXT_HITTEST_AFTER; + } + + return wxRICHTEXT_HITTEST_NONE; +} + +int wxRichTextFloatCollector::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition) +{ + int ret = HitTestFloat(m_left, dc, pt, textPosition); + if (ret == wxRICHTEXT_HITTEST_NONE) + { + ret = HitTestFloat(m_right, dc, pt, textPosition); + } + return ret; +} +// Helpers for efficiency inline void wxCheckSetFont(wxDC& dc, const wxFont& font) { + // JACS: did I do this some time ago when testing? Should we re-enable it? +#if 0 const wxFont& font1 = dc.GetFont(); if (font1.IsOk() && font.IsOk()) { @@ -62,9 +396,11 @@ inline void wxCheckSetFont(wxDC& dc, const wxFont& font) font1.GetStyle() == font.GetStyle() && font1.GetWeight() == font.GetWeight() && font1.GetUnderlined() == font.GetUnderlined() && + font1.GetFamily() == font.GetFamily() && font1.GetFaceName() == font.GetFaceName()) return; } +#endif dc.SetFont(font); } @@ -148,7 +484,7 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin } // Convert units in tenths of a millimetre to device units -int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) +int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) const { int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units); @@ -169,6 +505,23 @@ int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units) return (int) pixels; } +// Convert units in pixels to tenths of a millimetre +int wxRichTextObject::ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const +{ + int p = pixels; + if (GetBuffer() && GetBuffer()->GetScale() != 1.0) + p = (int) (double(p) * GetBuffer()->GetScale()); + return ConvertPixelsToTenthsMM(dc.GetPPI().x, p); +} + +int wxRichTextObject::ConvertPixelsToTenthsMM(int ppi, int pixels) +{ + // There are ppi pixels in 254.1 "1/10 mm" + + int units = int( double(pixels) * 254.1 / (double) ppi ); + return units; +} + /// Dump to output stream for debugging void wxRichTextObject::Dump(wxTextOutputStream& stream) { @@ -309,7 +662,8 @@ int wxRichTextCompositeObject::HitTest(wxDC& dc, const wxPoint& pt, long& textPo node = node->GetNext(); } - return wxRICHTEXT_HITTEST_NONE; + textPosition = GetRange().GetEnd()-1; + return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE; } /// Finds the absolute position and row height for the given character position @@ -421,26 +775,31 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range } /// Recursively merge all pieces that can be merged. -bool wxRichTextCompositeObject::Defragment() +bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { wxRichTextObject* child = node->GetData(); - wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject); - if (composite) - composite->Defragment(); - - if (node->GetNext()) + if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range)) { - wxRichTextObject* nextChild = node->GetNext()->GetData(); - if (child->CanMerge(nextChild) && child->Merge(nextChild)) + wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject); + if (composite) + composite->Defragment(); + + if (node->GetNext()) { - nextChild->Dereference(); - m_children.Erase(node->GetNext()); + wxRichTextObject* nextChild = node->GetNext()->GetData(); + if (child->CanMerge(nextChild) && child->Merge(nextChild)) + { + nextChild->Dereference(); + m_children.Erase(node->GetNext()); - // Don't set node -- we'll see if we can merge again with the next - // child. + // Don't set node -- we'll see if we can merge again with the next + // child. + } + else + node = node->GetNext(); } else node = node->GetNext(); @@ -509,13 +868,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, wxPoint position) const +bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); if (node) { wxRichTextObject* child = node->GetData(); - return child->GetRangeSize(range, size, descent, dc, flags, position); + return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents); } else return false; @@ -541,6 +900,15 @@ wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* par Init(); } +wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox() +{ + if (m_floatCollector) + { + delete m_floatCollector; + m_floatCollector = NULL; + } +} + /// Initialize the object. void wxRichTextParagraphLayoutBox::Init() { @@ -555,11 +923,61 @@ void wxRichTextParagraphLayoutBox::Init() m_topMargin = 4; m_bottomMargin = 4; m_partialParagraph = false; + m_floatCollector = NULL; +} + +// Gather information about floating objects +bool wxRichTextParagraphLayoutBox::UpdateFloatingObjects(int width, wxRichTextObject* untilObj) +{ + if (m_floatCollector != NULL) + delete m_floatCollector; + m_floatCollector = new wxRichTextFloatCollector(width); + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node && node->GetData() != untilObj) + { + wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (child != NULL); + if (child) + m_floatCollector->CollectFloat(child); + node = node->GetNext(); + } + + return true; +} + +// HitTest +int wxRichTextParagraphLayoutBox::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition) +{ + int ret = wxRICHTEXT_HITTEST_NONE; + if (m_floatCollector) + ret = m_floatCollector->HitTest(dc, pt, textPosition); + + if (ret == wxRICHTEXT_HITTEST_NONE) + return wxRichTextCompositeObject::HitTest(dc, pt, textPosition); + else + return ret; +} + +/// Draw the floating objects +void wxRichTextParagraphLayoutBox::DrawFloats(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style) +{ + if (m_floatCollector) + m_floatCollector->Draw(dc, range, selectionRange, rect, descent, style); +} + +void wxRichTextParagraphLayoutBox::MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextAnchoredObject* obj) +{ + if (from == to) + return; + + from->RemoveChild(obj); + to->AppendChild(obj); } /// Draw the item bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style) { + DrawFloats(dc, range, selectionRange, rect, descent, style); wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { @@ -580,7 +998,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, // Skip } else - child->Draw(dc, range, selectionRange, childRect, descent, style); + child->Draw(dc, range, selectionRange, rect, descent, style); } node = node->GetNext(); @@ -663,6 +1081,8 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl } } + UpdateFloatingObjects(availableSpace.width, node ? node->GetData() : (wxRichTextObject*) NULL); + // A way to force speedy rest-of-buffer layout (the 'else' below) bool forceQuickLayout = false; @@ -671,7 +1091,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl // Assume this box only contains paragraphs wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxCHECK_MSG( child, false, _T("Unknown object in layout") ); + wxCHECK_MSG( child, false, wxT("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 ( !forceQuickLayout && @@ -740,7 +1160,7 @@ void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj) } /// Get/set the size for the given range. -bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const +bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const { wxSize sz; @@ -848,25 +1268,29 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { - // child is a paragraph - wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (child != NULL); - - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) + wxRichTextObject* obj = (wxRichTextObject*) node->GetData(); + if (obj->GetRange().Contains(pos)) { - wxRichTextLine* line = node2->GetData(); + // child is a paragraph + wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph); + wxASSERT (child != NULL); - wxRichTextRange range = line->GetAbsoluteRange(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); - if (range.Contains(pos) || + wxRichTextRange range = line->GetAbsoluteRange(); - // If the position is end-of-paragraph, then return the last line of - // of the paragraph. - (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) - return line; + if (range.Contains(pos) || - node2 = node2->GetNext(); + // If the position is end-of-paragraph, then return the last line of + // of the paragraph. + ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))) + return line; + + node2 = node2->GetNext(); + } } node = node->GetNext(); @@ -950,18 +1374,28 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP /// Convenience function to add a paragraph of text -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttr* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxRichTextAttr* paraStyle) { // Don't use the base style, just the default style, and the base style will // be combined at display time. // Divide into paragraph and character styles. - wxTextAttr defaultCharStyle; - wxTextAttr defaultParaStyle; + wxRichTextAttr defaultCharStyle; + wxRichTextAttr defaultParaStyle; + + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; - wxTextAttr* cStyle = & defaultCharStyle; + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle); @@ -974,18 +1408,28 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, } /// Adds multiple paragraphs, based on newlines. -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttr* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxRichTextAttr* paraStyle) { // Don't use the base style, just the default style, and the base style will // be combined at display time. // Divide into paragraph and character styles. - wxTextAttr defaultCharStyle; - wxTextAttr defaultParaStyle; - wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); + wxRichTextAttr defaultCharStyle; + wxRichTextAttr defaultParaStyle; + + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; - wxTextAttr* cStyle = & defaultCharStyle; + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; wxRichTextParagraph* firstPara = NULL; wxRichTextParagraph* lastPara = NULL; @@ -1040,18 +1484,28 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text } /// Convenience function to add an image -wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttr* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxRichTextAttr* paraStyle) { // Don't use the base style, just the default style, and the base style will // be combined at display time. // Divide into paragraph and character styles. - wxTextAttr defaultCharStyle; - wxTextAttr defaultParaStyle; - wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); + wxRichTextAttr defaultCharStyle; + wxRichTextAttr defaultParaStyle; + + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle; - wxTextAttr* cStyle = & defaultCharStyle; + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle); AppendChild(para); @@ -1076,7 +1530,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextParagraph* para = GetParagraphAtPosition(position); if (para) { - wxTextAttrEx originalAttr = para->GetAttributes(); + wxRichTextAttr originalAttr = para->GetAttributes(); wxRichTextObjectList::compatibility_iterator node = m_children.Find(para); @@ -1145,12 +1599,13 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph); wxASSERT(firstPara != NULL); - para->SetAttributes(firstPara->GetAttributes()); + if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE)) + para->SetAttributes(firstPara->GetAttributes()); // Save empty paragraph attributes for appending later // These are character attributes deliberately set for a new paragraph. Without this, // we couldn't pass default attributes when appending a new paragraph. - wxTextAttrEx emptyParagraphAttributes; + wxRichTextAttr emptyParagraphAttributes; wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst(); @@ -1222,7 +1677,9 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag } } - if (finalPara && finalPara != para) + if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara) + finalPara->SetAttributes(firstPara->GetAttributes()); + else if (finalPara && finalPara != para) finalPara->SetAttributes(originalAttr); return true; @@ -1338,7 +1795,7 @@ long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosi wxRichTextLine* line = node2->GetData(); wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (lineRange.Contains(pos)) + if (lineRange.Contains(pos) || pos == lineRange.GetStart()) { // If the caret is displayed at the end of the previous wrapped line, // we want to return the line it's _displayed_ at (not the actual line @@ -1424,6 +1881,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) obj->DeleteRange(range); wxRichTextRange thisRange = obj->GetRange(); + wxRichTextAttr thisAttr = obj->GetAttributes(); // If the whole paragraph is within the range to delete, // delete the whole thing. @@ -1455,9 +1913,16 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara; - wxTextAttrEx nextParaAttr; + wxRichTextAttr nextParaAttr; if (applyFinalParagraphStyle) - nextParaAttr = nextParagraph->GetAttributes(); + { + // Special case when deleting the end of a paragraph - use _this_ paragraph's style, + // not the next one. + if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd()) + nextParaAttr = thisAttr; + else + nextParaAttr = nextParagraph->GetAttributes(); + } if (firstPara && nextParagraph && firstPara != nextParagraph) { @@ -1468,15 +1933,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) { wxRichTextObject* obj1 = node1->GetData(); - // If the object is empty, optimise it out - if (obj1->IsEmpty()) - { - delete obj1; - } - else - { - firstPara->AppendChild(obj1); - } + firstPara->AppendChild(obj1); wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); nextParagraph->GetChildren().Erase(node1); @@ -1488,6 +1945,13 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) RemoveChild(nextParagraph, true); } + // Avoid empty paragraphs + if (firstPara && firstPara->GetChildren().GetCount() == 0) + { + wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); + firstPara->AppendChild(text); + } + if (applyFinalParagraphStyle) firstPara->SetAttributes(nextParaAttr); @@ -1627,7 +2091,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 wxTextAttr& style, int flags) +bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags) { bool characterStyle = false; bool paragraphStyle = false; @@ -1645,7 +2109,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0); // Apply paragraph style first, if any - wxTextAttr wholeStyle(style); + wxRichTextAttr wholeStyle(style); if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet()) { @@ -1655,7 +2119,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const } // Limit the attributes to be set to the content to only character attributes. - wxTextAttr characterAttributes(wholeStyle); + wxRichTextAttr characterAttributes(wholeStyle); characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER)); if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet()) @@ -1725,7 +2189,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { // Only apply attributes that will make a difference to the combined // style as seen on the display - wxTextAttr combinedAttr(para->GetCombinedAttributes()); + wxRichTextAttr combinedAttr(para->GetCombinedAttributes()); wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr); } else @@ -1743,8 +2207,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const // 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()) + if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd()) { wxRichTextRange childRange(range); childRange.LimitTo(newPara->GetRange()); @@ -1767,7 +2230,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const splitPoint ++; // Find last object - if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1)) + if (splitPoint == newPara->GetRange().GetEnd()) lastObject = newPara->GetChildren().GetLast()->GetData(); else // lastObject is set as a side-effect of splitting. It's @@ -1805,7 +2268,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { // Only apply attributes that will make a difference to the combined // style as seen on the display - wxTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); + wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr); } else @@ -1831,20 +2294,50 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const return true; } +void wxRichTextParagraphLayoutBox::SetImageStyle(wxRichTextImage *image, const wxRichTextAttr& textAttr, int flags) +{ + bool withUndo = flags & wxRICHTEXT_SETSTYLE_WITH_UNDO; + bool haveControl = (GetRichTextCtrl() != NULL); + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); + wxRichTextParagraph* para = GetParagraphAtPosition(image->GetRange().GetStart()); + wxRichTextAction *action = NULL; + wxRichTextAttr oldTextAttr = image->GetAttributes(); + + if (haveControl && withUndo) + { + action = new wxRichTextAction(NULL, _("Change Image Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(image->GetRange().FromInternal()); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); + image->SetAttributes(textAttr); + + // Set the new attribute + newPara = new wxRichTextParagraph(*para); + action->GetNewParagraphs().AppendChild(newPara); + // Change back to the old one + image->SetAttributes(oldTextAttr); + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + } + else + newPara = para; + + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); +} + /// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttr& style) +bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) { return DoGetStyle(position, style, true); } -bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttr& style) +bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style) { return DoGetStyle(position, style, false); } /// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and /// context attributes. -bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttr& style, bool combineStyles) +bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles) { wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); @@ -1893,402 +2386,9 @@ static bool wxHasStyle(long flags, long style) /// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of /// content. -bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttr& currentStyle, const wxTextAttr& style, long& multipleStyleAttributes, int& multipleTextEffectAttributes) +bool wxRichTextParagraphLayoutBox::CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr) { - if (style.HasFont()) - { - if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE)) - { - if (currentStyle.HasFontSize()) - { - if (currentStyle.GetFontSize() != style.GetFontSize()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_SIZE); - } - } - else - { - currentStyle.SetFontSize(style.GetFontSize()); - } - } - - if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC)) - { - if (currentStyle.HasFontItalic()) - { - if (currentStyle.GetFontStyle() != style.GetFontStyle()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_ITALIC); - } - } - else - { - currentStyle.SetFontStyle(style.GetFontStyle()); - } - } - - if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT)) - { - if (currentStyle.HasFontWeight()) - { - if (currentStyle.GetFontWeight() != style.GetFontWeight()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT); - } - } - else - { - currentStyle.SetFontWeight(style.GetFontWeight()); - } - } - - if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE)) - { - if (currentStyle.HasFontFaceName()) - { - wxString faceName1(currentStyle.GetFontFaceName()); - wxString faceName2(style.GetFontFaceName()); - - if (faceName1 != faceName2) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_FACE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_FACE); - } - } - else - { - currentStyle.SetFontFaceName(style.GetFontFaceName()); - } - } - - if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE)) - { - if (currentStyle.HasFontUnderlined()) - { - if (currentStyle.GetFontUnderlined() != style.GetFontUnderlined()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_UNDERLINE); - } - } - else - { - currentStyle.SetFontUnderlined(style.GetFontUnderlined()); - } - } - } - - if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR)) - { - if (currentStyle.HasTextColour()) - { - if (currentStyle.GetTextColour() != style.GetTextColour()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_TEXT_COLOUR; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TEXT_COLOUR); - } - } - else - currentStyle.SetTextColour(style.GetTextColour()); - } - - if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR)) - { - if (currentStyle.HasBackgroundColour()) - { - if (currentStyle.GetBackgroundColour() != style.GetBackgroundColour()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BACKGROUND_COLOUR; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR); - } - } - else - currentStyle.SetBackgroundColour(style.GetBackgroundColour()); - } - - if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_ALIGNMENT)) - { - if (currentStyle.HasAlignment()) - { - if (currentStyle.GetAlignment() != style.GetAlignment()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_ALIGNMENT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_ALIGNMENT); - } - } - else - currentStyle.SetAlignment(style.GetAlignment()); - } - - if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TABS)) - { - if (currentStyle.HasTabs()) - { - if (!wxRichTextTabsEq(currentStyle.GetTabs(), style.GetTabs())) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_TABS; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TABS); - } - } - else - currentStyle.SetTabs(style.GetTabs()); - } - - if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LEFT_INDENT)) - { - if (currentStyle.HasLeftIndent()) - { - if (currentStyle.GetLeftIndent() != style.GetLeftIndent() || currentStyle.GetLeftSubIndent() != style.GetLeftSubIndent()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_LEFT_INDENT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT); - } - } - else - currentStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); - } - - if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT)) - { - if (currentStyle.HasRightIndent()) - { - if (currentStyle.GetRightIndent() != style.GetRightIndent()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_RIGHT_INDENT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_RIGHT_INDENT); - } - } - else - currentStyle.SetRightIndent(style.GetRightIndent()); - } - - if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER)) - { - if (currentStyle.HasParagraphSpacingAfter()) - { - if (currentStyle.GetParagraphSpacingAfter() != style.GetParagraphSpacingAfter()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_AFTER); - } - } - else - currentStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); - } - - if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE)) - { - if (currentStyle.HasParagraphSpacingBefore()) - { - if (currentStyle.GetParagraphSpacingBefore() != style.GetParagraphSpacingBefore()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_BEFORE); - } - } - else - currentStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); - } - - if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LINE_SPACING)) - { - if (currentStyle.HasLineSpacing()) - { - if (currentStyle.GetLineSpacing() != style.GetLineSpacing()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LINE_SPACING); - } - } - else - currentStyle.SetLineSpacing(style.GetLineSpacing()); - } - - if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) - { - if (currentStyle.HasCharacterStyleName()) - { - if (currentStyle.GetCharacterStyleName() != style.GetCharacterStyleName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER_STYLE_NAME); - } - } - else - currentStyle.SetCharacterStyleName(style.GetCharacterStyleName()); - } - - if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME)) - { - if (currentStyle.HasParagraphStyleName()) - { - if (currentStyle.GetParagraphStyleName() != style.GetParagraphStyleName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARAGRAPH_STYLE_NAME); - } - } - else - currentStyle.SetParagraphStyleName(style.GetParagraphStyleName()); - } - - if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME)) - { - if (currentStyle.HasListStyleName()) - { - if (currentStyle.GetListStyleName() != style.GetListStyleName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LIST_STYLE_NAME); - } - } - else - currentStyle.SetListStyleName(style.GetListStyleName()); - } - - if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE)) - { - if (currentStyle.HasBulletStyle()) - { - if (currentStyle.GetBulletStyle() != style.GetBulletStyle()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_STYLE); - } - } - else - currentStyle.SetBulletStyle(style.GetBulletStyle()); - } - - if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER)) - { - if (currentStyle.HasBulletNumber()) - { - if (currentStyle.GetBulletNumber() != style.GetBulletNumber()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NUMBER); - } - } - else - currentStyle.SetBulletNumber(style.GetBulletNumber()); - } - - if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT)) - { - if (currentStyle.HasBulletText()) - { - if (currentStyle.GetBulletText() != style.GetBulletText()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT); - } - } - else - { - currentStyle.SetBulletText(style.GetBulletText()); - currentStyle.SetBulletFont(style.GetBulletFont()); - } - } - - if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME)) - { - if (currentStyle.HasBulletName()) - { - if (currentStyle.GetBulletName() != style.GetBulletName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME); - } - } - else - { - currentStyle.SetBulletName(style.GetBulletName()); - } - } - - if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL)) - { - if (currentStyle.HasURL()) - { - if (currentStyle.GetURL() != style.GetURL()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_URL; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL); - } - } - else - { - currentStyle.SetURL(style.GetURL()); - } - } - - if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_EFFECTS)) - { - if (currentStyle.HasTextEffects()) - { - // We need to find the bits in the new style that are different: - // just look at those bits that are specified by the new style. - - int currentRelevantTextEffects = currentStyle.GetTextEffects() & style.GetTextEffectFlags(); - int newRelevantTextEffects = style.GetTextEffects() & style.GetTextEffectFlags(); - - if (currentRelevantTextEffects != newRelevantTextEffects) - { - // Find the text effects that were different, using XOR - int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects; - - // Clash of style - mark as such - multipleTextEffectAttributes |= differentEffects; - currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects); - } - } - else - { - currentStyle.SetTextEffects(style.GetTextEffects()); - currentStyle.SetTextEffectFlags(style.GetTextEffectFlags()); - } - } - - if (style.HasOutlineLevel() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_OUTLINE_LEVEL)) - { - if (currentStyle.HasOutlineLevel()) - { - if (currentStyle.GetOutlineLevel() != style.GetOutlineLevel()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_OUTLINE_LEVEL; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_OUTLINE_LEVEL); - } - } - else - currentStyle.SetOutlineLevel(style.GetOutlineLevel()); - } + currentStyle.CollectCommonAttributes(style, clashingAttr, absentAttr); return true; } @@ -2297,13 +2397,12 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttr& currentStyle, const /// that attribute is not present within the flags. /// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself /// nested. -bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style) +bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style) { - style = wxTextAttr(); + style = wxRichTextAttr(); - // The attributes that aren't valid because of multiple styles within the range - long multipleStyleAttributes = 0; - int multipleTextEffectAttributes = 0; + wxRichTextAttr clashingAttr; + wxRichTextAttr absentAttrPara, absentAttrChar; wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst(); while (node) @@ -2313,9 +2412,9 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range { if (para->GetChildren().GetCount() == 0) { - wxTextAttr paraStyle = para->GetCombinedAttributes(); + wxRichTextAttr paraStyle = para->GetCombinedAttributes(); - CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes); + CollectStyle(style, paraStyle, clashingAttr, absentAttrPara); } else { @@ -2323,9 +2422,9 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range paraRange.LimitTo(range); // First collect paragraph attributes only - wxTextAttr paraStyle = para->GetCombinedAttributes(); + wxRichTextAttr paraStyle = para->GetCombinedAttributes(); paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH); - CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes); + CollectStyle(style, paraStyle, clashingAttr, absentAttrPara); wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst(); @@ -2334,12 +2433,12 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range wxRichTextObject* child = childNode->GetData(); if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart())) { - wxTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes()); + wxRichTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes()); // Now collect character attributes only childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER); - CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes); + CollectStyle(style, childStyle, clashingAttr, absentAttrChar); } childNode = childNode->GetNext(); @@ -2352,7 +2451,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range } /// Set default style -bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttr& style) +bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxRichTextAttr& style) { m_defaultAttributes = style; return true; @@ -2362,7 +2461,7 @@ bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttr& style) /// of the attributes are different within the range, the test fails. You /// can use this to implement, for example, bold button updating. style must have /// flags indicating which attributes are of interest. -bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttr& style) const +bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const { int foundCount = 0; int matchingCount = 0; @@ -2377,7 +2476,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& { // Stop searching if we're beyond the range of interest if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; + return foundCount == matchingCount && foundCount != 0; if (!para->GetRange().IsOutside(range)) { @@ -2386,12 +2485,17 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& while (node2) { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) + // Allow for empty string if no buffer + wxRichTextRange childRange = child->GetRange(); + if (childRange.GetLength() == 0 && GetRange().GetLength() == 1) + childRange.SetEnd(childRange.GetEnd()+1); + + if (!childRange.IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) { foundCount ++; - wxTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes()); + wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes()); - if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + if (wxTextAttrEqPartial(textAttr, style)) matchingCount ++; } @@ -2403,14 +2507,14 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& node = node->GetNext(); } - return foundCount == matchingCount; + return foundCount == matchingCount && foundCount != 0; } /// Test if this whole range has paragraph attributes of the specified kind. If any /// of the attributes are different within the range, the test fails. You /// can use this to implement, for example, centering button updating. style must have /// flags indicating which attributes are of interest. -bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttr& style) const +bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const { int foundCount = 0; int matchingCount = 0; @@ -2425,23 +2529,23 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& { // Stop searching if we're beyond the range of interest if (para->GetRange().GetStart() > range.GetEnd()) - return foundCount == matchingCount; + return foundCount == matchingCount && foundCount != 0; if (!para->GetRange().IsOutside(range)) { - wxTextAttr textAttr = GetAttributes(); + wxRichTextAttr textAttr = GetAttributes(); // Apply the paragraph style wxRichTextApplyStyle(textAttr, para->GetAttributes()); foundCount ++; - if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + if (wxTextAttrEqPartial(textAttr, style)) matchingCount ++; } } node = node->GetNext(); } - return foundCount == matchingCount; + return foundCount == matchingCount && foundCount != 0; } void wxRichTextParagraphLayoutBox::Clear() @@ -2499,11 +2603,10 @@ wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagrap 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()); + // floating layout make all child should be relayout + range.SetEnd(GetRange().GetEnd()); } return range; } @@ -2557,6 +2660,13 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh // So when changing a list style interactively, could retrieve level based on current style, then // set appropriate indent and apply new style. + int outline = -1; + int num = -1; + if (para->GetAttributes().HasOutlineLevel()) + outline = para->GetAttributes().GetOutlineLevel(); + if (para->GetAttributes().HasBulletNumber()) + num = para->GetAttributes().GetBulletNumber(); + if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) { int currentIndent = para->GetAttributes().GetLeftIndent(); @@ -2607,6 +2717,11 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh foundCount ++; } } + + if (outline != -1) + para->GetAttributes().SetOutlineLevel(outline); + if (num != -1) + para->GetAttributes().SetBulletNumber(num); } node = node->GetNext(); @@ -2686,7 +2801,7 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx // Renumbering will need to be done when we promote/demote a paragraph. // Apply the overall list style, and item style for this level - wxTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet)); wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); // Now we need to do numbering @@ -2762,7 +2877,7 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); #endif @@ -2861,7 +2976,7 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co } // Apply the overall list style, and item style for this level - wxTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet)); wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); // OK, we've (re)applied the style, now let's get the numbering right. @@ -2972,7 +3087,7 @@ bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRa /// Fills in the attributes for numbering a paragraph after previousParagraph. It also finds the /// position of the paragraph that it had to start looking from. -bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxTextAttr& attr) const +bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const { if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) return false; @@ -3034,14 +3149,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox) wxArrayInt wxRichTextParagraph::sm_defaultTabs; -wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttr* style): +wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxRichTextAttr* style): wxRichTextBox(parent) { if (style) SetAttributes(*style); } -wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttr* paraStyle, wxTextAttr* charStyle): +wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* paraStyle, wxRichTextAttr* charStyle): wxRichTextBox(parent) { if (paraStyle) @@ -3056,9 +3171,9 @@ wxRichTextParagraph::~wxRichTextParagraph() } /// Draw the item -bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) +bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int style) { - wxTextAttr attr = GetCombinedAttributes(); + wxRichTextAttr attr = GetCombinedAttributes(); // Draw the bullet, if any if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) @@ -3068,20 +3183,20 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); - wxTextAttr bulletAttr(GetCombinedAttributes()); + wxRichTextAttr bulletAttr(GetCombinedAttributes()); // Combine with the font of the first piece of content, if one is specified if (GetChildren().GetCount() > 0) { wxRichTextObject* firstObj = (wxRichTextObject*) GetChildren().GetFirst()->GetData(); - if (firstObj->GetAttributes().HasFont()) + if (!firstObj->IsFloatable() && firstObj->GetAttributes().HasFont()) { wxRichTextApplyStyle(bulletAttr, firstObj->GetAttributes()); } } // Get line height from first line, if any - wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; + wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : NULL; wxPoint linePos; int lineHeight wxDUMMY_INITIALIZE(0); @@ -3135,40 +3250,56 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxRichTextLine* line = node->GetData(); wxRichTextRange lineRange = line->GetAbsoluteRange(); - int maxDescent = line->GetDescent(); - // Lines are specified relative to the paragraph wxPoint linePosition = line->GetPosition() + GetPosition(); - wxPoint objectPosition = linePosition; - // Loop through objects until we get to the one within range - wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - while (node2) + // Don't draw if off the screen + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) != 0) || ((linePosition.y + line->GetSize().y) >= rect.y && linePosition.y <= rect.y + rect.height)) { - wxRichTextObject* child = node2->GetData(); + wxPoint objectPosition = linePosition; + int maxDescent = line->GetDescent(); + + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) + int i = 0; + while (node2) { - // Draw this part of the line at the correct position - wxRichTextRange objectRange(child->GetRange()); - objectRange.LimitTo(lineRange); + wxRichTextObject* child = node2->GetData(); - wxSize objectSize; - int descent = 0; - child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); + if (!child->IsFloating() && child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) + { + // Draw this part of the line at the correct position + wxRichTextRange objectRange(child->GetRange()); + objectRange.LimitTo(lineRange); - // Use the child object's width, but the whole line's height - wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); - child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); + wxSize objectSize; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (i < (int) line->GetObjectSizes().GetCount()) + { + objectSize.x = line->GetObjectSizes()[(size_t) i]; + } + else +#endif + { + int descent = 0; + child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); + } - objectPosition.x += objectSize.x; - } - else if (child->GetRange().GetStart() > lineRange.GetEnd()) - // Can break out of inner loop now since we've passed this line's range - break; + // Use the child object's width, but the whole line's height + wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); + child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); - node2 = node2->GetNext(); + objectPosition.x += objectSize.x; + i ++; + } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; + + node2 = node2->GetNext(); + } } node = node->GetNext(); @@ -3177,10 +3308,36 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR return true; } +// Get the range width using partial extents calculated for the whole paragraph. +static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents) +{ + wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength()); + + if (partialExtents.GetCount() < (size_t) range.GetLength()) + return 0; + + int leftMostPos = 0; + if (range.GetStart() - para.GetRange().GetStart() > 0) + leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1]; + + int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()]; + + int w = rightMostPos - leftMostPos; + + return w; +} + /// Lay the item out bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { - wxTextAttr attr = GetCombinedAttributes(); + // Deal with floating objects firstly before the normal layout + wxRichTextBuffer* buffer = GetBuffer(); + wxASSERT(buffer); + wxRichTextFloatCollector* collector = buffer->GetFloatCollector(); + wxASSERT(collector); + LayoutFloat(dc, rect, style, collector); + + wxRichTextAttr attr = GetCombinedAttributes(); // ClearLines(); @@ -3194,25 +3351,16 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) int lineSpacing = 0; // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc. - if (attr.GetLineSpacing() != 10 && GetBuffer()) + if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().Ok()) { - wxFont font(GetBuffer()->GetFontTable().FindFont(attr)); - wxCheckSetFont(dc, font); - lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10; + wxCheckSetFont(dc, attr.GetFont()); + lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0)); } - // 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 (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) - availableTextSpaceFirstLine -= leftSubIndent; - - int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent; - // Start position for each line relative to the paragraph int startPositionFirstLine = leftIndent; int startPositionSubsequentLines = leftIndent + leftSubIndent; + wxRect availableRect; // If we have a bullet in this paragraph, the start position for the first line's text // is actually leftIndent + leftSubIndent. @@ -3228,11 +3376,25 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph int lineHeight = 0; int maxWidth = 0; + int maxAscent = 0; int maxDescent = 0; - int lineCount = 0; + int lineAscent = 0; + int lineDescent = 0; - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + wxRichTextObjectList::compatibility_iterator node; + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxUnusedVar(style); + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents); +#else + node = m_children.GetFirst(); while (node) { wxRichTextObject* child = node->GetData(); @@ -3243,6 +3405,8 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) node = node->GetNext(); } +#endif + // Split up lines // We may need to go back to a previous child, in which case create the new line, @@ -3254,6 +3418,13 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { wxRichTextObject* child = node->GetData(); + // If floating, ignore. We already laid out floats. + if (child->IsFloating() || child->GetRange().GetLength() == 0) + { + node = node->GetNext(); + continue; + } + // If this is e.g. a composite text box, it will need to be laid out itself. // But if just a text fragment or image, for example, this will // do nothing. NB: won't we need to set the position after layout? @@ -3261,11 +3432,6 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // can't tell the position until the size is determined. So possibly introduce // another layout phase. - // Available width depends on whether we're on the first or subsequent lines - int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines); - - currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); - // We may only be looking at part of a child, if we searched back for wrapping // and found a suitable point some way into the child. So get the size for the fragment // if necessary. @@ -3286,21 +3452,46 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) childDescent = child->GetDescent(); } else + { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents); +#else GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition()); +#endif + } + + // Available width depends on the floating objects and the line height + // Note: the floating objects may be placed vertically along the two side of + // buffer, so we may have different available line width with different + // [startY, endY]. So, we should can't determine how wide the available + // space is until we know the exact line height. + lineDescent = wxMax(childDescent, maxDescent); + lineAscent = wxMax(childSize.y-childDescent, maxAscent); + lineHeight = lineDescent + lineAscent; + availableRect = collector->GetAvailableRect(rect.y + currentPosition.y, rect.y + currentPosition.y + lineHeight); + + currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines); // Cases: // 1) There was a line break BEFORE the natural break // 2) There was a line break AFTER the natural break // 3) The child still fits (carry on) - if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableSpaceForText)) || - (childSize.x + currentWidth > availableSpaceForText)) + if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableRect.width)) || + (childSize.x + currentWidth > availableRect.width)) { long wrapPosition = 0; + int indent = lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines; + indent += rightIndent; // Find a place to wrap. This may walk back to previous children, // for example if a word spans several objects. - if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition)) + // Note: one object must contains only one wxTextAtrr, so the line height will not + // change inside one object. Thus, we can pass the remain line width to the + // FindWrapPosition function. + if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableRect.width - indent, wrapPosition, & partialExtents)) { // If the function failed, just cut it off at the end of this child. wrapPosition = child->GetRange().GetEnd(); @@ -3315,10 +3506,23 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // Let's find the actual size of the current line now wxSize actualSize; wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition); + + /// Use previous descent, not the wrapping descent we just found, since this may be too big + /// for the fragment we're about to add. + childDescent = maxDescent; + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents); +#else GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); +#endif + currentWidth = actualSize.x; - lineHeight = wxMax(lineHeight, actualSize.y); maxDescent = wxMax(childDescent, maxDescent); + maxAscent = wxMax(actualSize.y-childDescent, maxAscent); + lineHeight = maxDescent + maxAscent; // Add a new line wxRichTextLine* line = AllocateLine(lineCount); @@ -3334,6 +3538,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) currentPosition.y += lineSpacing; currentWidth = 0; maxDescent = 0; + maxAscent = 0; maxWidth = wxMax(maxWidth, currentWidth); lineCount ++; @@ -3357,8 +3562,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { // We still fit, so don't add a line, and keep going currentWidth += childSize.x; - lineHeight = wxMax(lineHeight, childSize.y); maxDescent = wxMax(childDescent, maxDescent); + maxAscent = wxMax(childSize.y-childDescent, maxAscent); + lineHeight = maxDescent + maxAscent; maxWidth = wxMax(maxWidth, currentWidth); lastEndPos = child->GetRange().GetEnd(); @@ -3371,7 +3577,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // Substract -1 because the last position is always the end-paragraph position. if (lastCompletedEndPos <= GetRange().GetEnd()-1) { - currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); + currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines); wxRichTextLine* line = AllocateLine(lineCount); @@ -3405,17 +3611,59 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) ClearUnusedLines(lineCount); // Apply styles to wrapped lines - ApplyParagraphStyle(attr, rect); + ApplyParagraphStyle(attr, rect, dc); - SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara)); + SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceAfterPara)); m_dirty = false; +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + // Use the text extents to calculate the size of each fragment in each line + wxRichTextLineList::compatibility_iterator lineNode = m_cachedLines.GetFirst(); + while (lineNode) + { + wxRichTextLine* line = lineNode->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); + + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); + + while (node2) + { + wxRichTextObject* child = node2->GetData(); + + if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange)) + { + wxRichTextRange rangeToUse = lineRange; + rangeToUse.LimitTo(child->GetRange()); + + // Find the size of the child from the text extents, and store in an array + // for drawing later + int left = 0; + if (rangeToUse.GetStart() > GetRange().GetStart()) + left = partialExtents[(rangeToUse.GetStart()-1) - GetRange().GetStart()]; + int right = partialExtents[rangeToUse.GetEnd() - GetRange().GetStart()]; + int sz = right - left; + line->GetObjectSizes().Add(sz); + } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; + + node2 = node2->GetNext(); + } + + lineNode = lineNode->GetNext(); + } +#endif +#endif + return true; } /// Apply paragraph styles, such as centering, to wrapped lines -void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRect& rect) +void wxRichTextParagraph::ApplyParagraphStyle(const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc) { if (!attr.HasAlignment()) return; @@ -3431,12 +3679,14 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRe // centering, right-justification if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) { - pos.x = (rect.GetWidth() - size.x)/2 + pos.x; + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + pos.x = (rect.GetWidth() - pos.x - rightIndent - size.x)/2 + pos.x; line->SetPosition(pos); } else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) { - pos.x = pos.x + rect.GetWidth() - size.x; + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + pos.x = rect.GetWidth() - size.x - rightIndent; line->SetPosition(pos); } @@ -3527,7 +3777,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, wxPoint position) const +bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const { if (!range.IsWithin(GetRange())) return false; @@ -3539,24 +3789,84 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxSize sz; + wxArrayInt childExtents; + wxArrayInt* p; + if (partialExtents) + p = & childExtents; + else + p = NULL; + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { + wxRichTextObject* child = node->GetData(); if (!child->GetRange().IsOutside(range)) { + // Floating objects have a zero size within the paragraph. + if (child->IsFloating()) + { + if (partialExtents) + { + int lastSize; + if (partialExtents->GetCount() > 0) + lastSize = (*partialExtents)[partialExtents->GetCount()-1]; + else + lastSize = 0; + + partialExtents->Add(0 /* zero size */ + lastSize); + } + } + else + { wxSize childSize; wxRichTextRange rangeToUse = range; rangeToUse.LimitTo(child->GetRange()); int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y))) + // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size, + // but it's only going to be used after caching has taken place. + if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0) + { + childDescent = child->GetDescent(); + childSize = child->GetCachedSize(); + + sz.y = wxMax(sz.y, childSize.y); + sz.x += childSize.x; + descent = wxMax(descent, childDescent); + } + else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p)) { sz.y = wxMax(sz.y, childSize.y); sz.x += childSize.x; descent = wxMax(descent, childDescent); + + if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange())) + { + child->SetCachedSize(childSize); + child->SetDescent(childDescent); + } + + if (partialExtents) + { + int lastSize; + if (partialExtents->GetCount() > 0) + lastSize = (*partialExtents)[partialExtents->GetCount()-1]; + else + lastSize = 0; + + size_t i; + for (i = 0; i < childExtents.GetCount(); i++) + { + partialExtents->Add(childExtents[i] + lastSize); + } + } } + } + + if (p) + p->Clear(); } node = node->GetNext(); @@ -3589,7 +3899,7 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(lineRange)) + if (!child->IsFloating() && !child->GetRange().IsOutside(lineRange)) { wxRichTextRange rangeToUse = lineRange; rangeToUse.LimitTo(child->GetRange()); @@ -3725,7 +4035,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition wxSize lineSize = line->GetSize(); wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y) + if (pt.y <= linePos.y + lineSize.y) { if (pt.x < linePos.x) { @@ -3739,6 +4049,39 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition } else { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & partialExtents); + + int lastX = linePos.x; + size_t i; + for (i = 0; i < partialExtents.GetCount(); i++) + { + int nextX = partialExtents[i] + linePos.x; + + if (pt.x >= lastX && pt.x <= nextX) + { + textPosition = i + lineRange.GetStart(); // minus 1? + + // So now we know it's between i-1 and i. + // Let's see if we can be more precise about + // which side of the position it's on. + + int midPoint = (nextX + lastX)/2; + if (pt.x >= midPoint) + return wxRICHTEXT_HITTEST_AFTER; + else + return wxRICHTEXT_HITTEST_BEFORE; + } + + lastX = nextX; + } +#else long i; int lastX = linePos.x; for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++) @@ -3760,7 +4103,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition // Let's see if we can be more precise about // which side of the position it's on. - int midPoint = (nextX - lastX)/2 + lastX; + int midPoint = (nextX + lastX)/2; if (pt.x >= midPoint) return wxRICHTEXT_HITTEST_AFTER; else @@ -3771,6 +4114,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition lastX = nextX; } } +#endif } } @@ -3909,7 +4253,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text += textObj->GetTextForRange(range); } else - return true; + { + text += wxT(" "); + } } node = node->GetNext(); @@ -3929,7 +4275,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text = textObj->GetTextForRange(range) + text; } else - return true; + { + text = wxT(" ") + text; + } } node = node->GetPrevious(); @@ -3940,55 +4288,84 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex } /// Find a suitable wrap position. -bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition) +bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents) { + if (range.GetLength() <= 0) + return false; + // Find the first position where the line exceeds the available space. wxSize sz; long breakPosition = range.GetEnd(); - // Binary chop for speed - long minPos = range.GetStart(); - long maxPos = range.GetEnd(); - while (true) +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (partialExtents && partialExtents->GetCount() >= (size_t) (GetRange().GetLength()-1)) // the final position in a paragraph is the newline { - if (minPos == maxPos) - { - int descent = 0; - GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + int widthBefore; - if (sz.x > availableSpace) - breakPosition = minPos - 1; - break; - } - else if ((maxPos - minPos) == 1) + if (range.GetStart() > GetRange().GetStart()) + widthBefore = (*partialExtents)[range.GetStart() - GetRange().GetStart() - 1]; + else + widthBefore = 0; + + size_t i; + for (i = (size_t) range.GetStart(); i <= (size_t) range.GetEnd(); i++) { - int descent = 0; - GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore; - if (sz.x > availableSpace) - breakPosition = minPos - 1; - else + if (widthFromStartOfThisRange > availableSpace) { - GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); - if (sz.x > availableSpace) - breakPosition = maxPos-1; + breakPosition = i-1; + break; } - break; } - else + } + else +#endif + { + // Binary chop for speed + long minPos = range.GetStart(); + long maxPos = range.GetEnd(); + while (true) { - long nextPos = minPos + ((maxPos - minPos) / 2); - - int descent = 0; - GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + if (minPos == maxPos) + { + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); - if (sz.x > availableSpace) + if (sz.x > availableSpace) + breakPosition = minPos - 1; + break; + } + else if ((maxPos - minPos) == 1) { - maxPos = nextPos; + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + breakPosition = minPos - 1; + else + { + GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + if (sz.x > availableSpace) + breakPosition = maxPos-1; + } + break; } else { - minPos = nextPos; + long nextPos = minPos + ((maxPos - minPos) / 2); + + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + { + maxPos = nextPos; + } + else + { + minPos = nextPos; + } } } } @@ -4123,9 +4500,9 @@ bool wxRichTextParagraph::ClearUnusedLines(int lineCount) /// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically /// retrieve the actual style. -wxTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxTextAttr& contentStyle) const +wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle) const { - wxTextAttr attr; + wxRichTextAttr attr; wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); if (buf) { @@ -4140,9 +4517,9 @@ wxTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxTextAttr& contentS } /// Get combined attributes of the base style and paragraph style. -wxTextAttr wxRichTextParagraph::GetCombinedAttributes() const +wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes() const { - wxTextAttr attr; + wxRichTextAttr attr; wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); if (buf) { @@ -4171,6 +4548,56 @@ void wxRichTextParagraph::ClearDefaultTabs() sm_defaultTabs.Clear(); } +void wxRichTextParagraph::LayoutFloat(wxDC& dc, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector) +{ + wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst(); + while (node) + { + wxRichTextAnchoredObject* anchored = wxDynamicCast(node->GetData(), wxRichTextAnchoredObject); + if (anchored && anchored->IsFloating()) + { + wxSize size; + int descent, x = 0; + anchored->GetRangeSize(anchored->GetRange(), size, descent, dc, style); + + int offsetY = 0; + if (anchored->GetAttributes().GetTextBoxAttr().GetTop().IsPresent()) + { + offsetY = anchored->GetAttributes().GetTextBoxAttr().GetTop().GetValue(); + if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + { + offsetY = ConvertTenthsMMToPixels(dc, offsetY); + } + } + + int pos = floatCollector->GetFitPosition(anchored->GetAttributes().GetTextBoxAttr().GetFloatMode(), rect.y + offsetY, size.y); + + /* Update the offset */ + int newOffsetY = pos - rect.y; + if (newOffsetY != offsetY) + { + if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + newOffsetY = ConvertPixelsToTenthsMM(dc, newOffsetY); + anchored->GetAttributes().GetTextBoxAttr().GetTop().SetValue(newOffsetY); + } + + // attr.m_offset = pos - rect.y; + //anchored->SetAnchoredAttr(attr); + + if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_LEFT) + x = 0; + else if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_RIGHT) + x = rect.width - size.x; + + anchored->SetPosition(wxPoint(x, pos)); + anchored->SetCachedSize(size); + floatCollector->CollectFloat(this, anchored); + } + + node = node->GetNext(); + } +} + /// Get the first position from pos that has a line break character. long wxRichTextParagraph::GetFirstLineBreakPosition(long pos) { @@ -4213,12 +4640,18 @@ void wxRichTextLine::Init(wxRichTextParagraph* parent) m_pos = wxPoint(0, 0); m_size = wxSize(0, 0); m_descent = 0; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + m_objectSizes.Clear(); +#endif } /// Copy void wxRichTextLine::Copy(const wxRichTextLine& obj) { m_range = obj.m_range; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + m_objectSizes = obj.m_objectSizes; +#endif } /// Get the absolute object position @@ -4242,7 +4675,7 @@ wxRichTextRange wxRichTextLine::GetAbsoluteRange() const IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject) -wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttr* style): +wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* style): wxRichTextObject(parent) { if (style) @@ -4262,7 +4695,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); wxASSERT (para != NULL); - wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); + wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); int offset = GetRange().GetStart(); @@ -4276,16 +4709,44 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR long len = range.GetLength(); wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len); - int charHeight = dc.GetCharHeight(); - - int x = rect.x; - int y = rect.y + (rect.height - charHeight - (descent - m_descent)); - // Test for the optimized situations where all is selected, or none // is selected. - wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr)); - wxCheckSetFont(dc, font); + wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr)); + wxCheckSetFont(dc, textFont); + int charHeight = dc.GetCharHeight(); + + int x, y; + if ( textFont.Ok() ) + { + if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + y = rect.y; + wxCheckSetFont(dc, textFont); + } + else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + int sub_height = static_cast( static_cast(charHeight) / wxSCRIPT_MUL_FACTOR); + y = rect.y + (rect.height - sub_height + (descent - m_descent)); + wxCheckSetFont(dc, textFont); + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } // (a) All selected. if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd()) @@ -4303,7 +4764,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR // (c) Part selected, part not // Let's draw unselected chunk, selected chunk, then unselected chunk. - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); // 1. Initial unselected chunk, if any, up until start of selection. if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd()) @@ -4312,7 +4773,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int s1 = selectionRange.GetStart()-1; int fragmentLen = s1 - r1 + 1; if (fragmentLen < 0) + { wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen); + } wxString stringFragment = str.Mid(r1 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); @@ -4343,7 +4806,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = s2 - s1 + 1; if (fragmentLen < 0) + { wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen); + } wxString stringFragment = str.Mid(s1 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true); @@ -4374,7 +4839,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = r2 - s2 + 1; if (fragmentLen < 0) + { wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen); + } wxString stringFragment = str.Mid(s2 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); @@ -4384,7 +4851,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR return true; } -bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected) +bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected) { bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND); @@ -4420,7 +4887,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, con wxCheckSetBrush(dc, wxBrush(highlightColour)); wxCheckSetPen(dc, wxPen(highlightColour)); dc.SetTextForeground(highlightTextColour); - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); } else { @@ -4428,13 +4895,14 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, con if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk()) { - dc.SetBackgroundMode(wxSOLID); + dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); dc.SetTextBackground(attr.GetBackgroundColour()); } else - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); } + wxCoord x_orig = x; while (hasTabs) { // the string has a tab @@ -4446,7 +4914,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, con bool not_found = true; for (int i = 0; i < tabCount && not_found; ++i) { - nextTabPos = tabArray.Item(i); + nextTabPos = tabArray.Item(i) + x_orig; // Find the next tab position. // Even if we're at the end of the tab array, we must still draw the chunk. @@ -4526,7 +4994,7 @@ 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), wxPoint position) const +bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const { if (!range.IsWithin(GetRange())) return false; @@ -4534,15 +5002,32 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); wxASSERT (para != NULL); - wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); + wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); // Always assume unformatted text, since at this level we have no knowledge // of line breaks - and we don't need it, since we'll calculate size within // formatted text by doing it in chunks according to the line ranges + bool bScript(false); wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr)); - wxCheckSetFont(dc, font); + if (font.Ok()) + { + if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) ) + { + wxFont textFont = font; + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + wxCheckSetFont(dc, textFont); + bScript = true; + } + else + { + wxCheckSetFont(dc, font); + } + } + bool haveDescent = false; int startPos = range.GetStart() - GetRange().GetStart(); long len = range.GetLength(); @@ -4579,13 +5064,40 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz while (stringChunk.Find(wxT('\t')) >= 0) { + int absoluteWidth = 0; + // the string has a tab // break up the string at the Tab wxString stringFragment = stringChunk.BeforeFirst(wxT('\t')); stringChunk = stringChunk.AfterFirst(wxT('\t')); - dc.GetTextExtent(stringFragment, & w, & h); - width += w; - int absoluteWidth = width + position.x; + + if (partialExtents) + { + int oldWidth; + if (partialExtents->GetCount() > 0) + oldWidth = (*partialExtents)[partialExtents->GetCount()-1]; + else + oldWidth = 0; + + // Add these partial extents + wxArrayInt p; + dc.GetPartialTextExtents(stringFragment, p); + size_t j; + for (j = 0; j < p.GetCount(); j++) + partialExtents->Add(oldWidth + p[j]); + + if (partialExtents->GetCount() > 0) + absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + position.x; + else + absoluteWidth = position.x; + } + else + { + dc.GetTextExtent(stringFragment, & w, & h); + width += w; + absoluteWidth = width + position.x; + haveDescent = true; + } bool notFound = true; for (int i = 0; i < tabCount && notFound; ++i) @@ -4605,27 +5117,72 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz notFound = false; width = nextTabPos - position.x; + + if (partialExtents) + partialExtents->Add(width); } } } } - dc.GetTextExtent(stringChunk, & w, & h, & descent); - width += w; - size = wxSize(width, dc.GetCharHeight()); - - return true; -} - -/// Do a split, returning an object containing the second part, and setting -/// the first part in 'this'. -wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) -{ - long index = pos - GetRange().GetStart(); - if (index < 0 || index >= (int) m_text.length()) - return NULL; + if (!stringChunk.IsEmpty()) + { + if (partialExtents) + { + int oldWidth; + if (partialExtents->GetCount() > 0) + oldWidth = (*partialExtents)[partialExtents->GetCount()-1]; + else + oldWidth = 0; - wxString firstPart = m_text.Mid(0, index); + // Add these partial extents + wxArrayInt p; + dc.GetPartialTextExtents(stringChunk, p); + size_t j; + for (j = 0; j < p.GetCount(); j++) + partialExtents->Add(oldWidth + p[j]); + } + else + { + dc.GetTextExtent(stringChunk, & w, & h, & descent); + width += w; + haveDescent = true; + } + } + + if (partialExtents) + { + int charHeight = dc.GetCharHeight(); + if ((*partialExtents).GetCount() > 0) + w = (*partialExtents)[partialExtents->GetCount()-1]; + else + w = 0; + size = wxSize(w, charHeight); + } + else + { + size = wxSize(width, dc.GetCharHeight()); + } + + if (!haveDescent) + dc.GetTextExtent(wxT("X"), & w, & h, & descent); + + if ( bScript ) + dc.SetFont(font); + + return true; +} + +/// Do a split, returning an object containing the second part, and setting +/// the first part in 'this'. +wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) +{ + long index = pos - GetRange().GetStart(); + + if (index < 0 || index >= (int) m_text.length()) + return NULL; + + wxString firstPart = m_text.Mid(0, index); wxString secondPart = m_text.Mid(index); m_text = firstPart; @@ -4814,10 +5371,10 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttr attr(GetDefaultStyle()); + wxRichTextAttr attr(GetDefaultStyle()); - wxTextAttr* p = NULL; - wxTextAttr paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos); @@ -4829,6 +5386,15 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr action->GetNewParagraphs() = paragraphs; + if (p && !p->IsDefault()) + { + for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxRichTextObject* child = node->GetData(); + child->SetAttributes(*p); + } + } + action->SetPosition(pos); wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1); @@ -4848,8 +5414,8 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttr* p = NULL; - wxTextAttr paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { // Get appropriate paragraph style @@ -4886,8 +5452,8 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttr* p = NULL; - wxTextAttr paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */); @@ -4895,7 +5461,7 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int p = & paraAttr; } - wxTextAttr attr(GetDefaultStyle()); + wxRichTextAttr attr(GetDefaultStyle()); wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr); action->GetNewParagraphs().AppendChild(newPara); @@ -4904,29 +5470,37 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int wxRichTextParagraph* para = GetParagraphAtPosition(pos, false); long pos1 = pos; + if (p) + newPara->SetAttributes(*p); + if (flags & wxRICHTEXT_INSERT_INTERACTIVE) { if (para && para->GetRange().GetEnd() == pos) pos1 ++; + + // Now see if we need to number the paragraph. + if (newPara->GetAttributes().HasBulletNumber()) + { + wxRichTextAttr numberingAttr; + if (FindNextParagraphNumber(para, numberingAttr)) + wxRichTextApplyStyle(newPara->GetAttributes(), (const wxRichTextAttr&) numberingAttr); + } } action->SetPosition(pos); - if (p) - newPara->SetAttributes(*p); - // Use the default character style // Use the default character style if (!GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst()) { // Check whether the default style merely reflects the paragraph/basic style, // in which case don't apply it. - wxTextAttrEx defaultStyle(GetDefaultStyle()); - wxTextAttrEx toApply; + wxRichTextAttr defaultStyle(GetDefaultStyle()); + wxRichTextAttr toApply; if (para) { wxRichTextAttr combinedAttr = para->GetCombinedAttributes(); - wxTextAttrEx newAttr; + wxRichTextAttr newAttr; // This filters out attributes that are accounted for by the current // paragraph/basic style wxRichTextApplyStyle(toApply, defaultStyle, & combinedAttr); @@ -4947,12 +5521,13 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int } /// Submit command to insert the given image -bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags) +bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags, + const wxRichTextAttr& textAttr) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttr* p = NULL; - wxTextAttr paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos); @@ -4960,7 +5535,7 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& p = & paraAttr; } - wxTextAttr attr(GetDefaultStyle()); + wxRichTextAttr attr(GetDefaultStyle()); wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); if (p) @@ -4968,6 +5543,8 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara); newPara->AppendChild(imageObject); + imageObject->SetAttributes(textAttr); + //imageObject->SetAnchoredAttr(floatAttr); action->GetNewParagraphs().AppendChild(newPara); action->GetNewParagraphs().UpdateRanges(); @@ -4983,15 +5560,50 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& return true; } +// Insert an object with no change of it +bool wxRichTextBuffer::InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags) +{ + wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert object"), wxRICHTEXT_INSERT, this, ctrl, false); + + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + + wxRichTextAttr attr(GetDefaultStyle()); + + wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); + if (p) + newPara->SetAttributes(*p); + + newPara->AppendChild(object); + action->GetNewParagraphs().AppendChild(newPara); + action->GetNewParagraphs().UpdateRanges(); + + action->GetNewParagraphs().SetPartialParagraph(true); + + action->SetPosition(pos); + + // Set the range we'll need to delete in Undo + action->SetRange(wxRichTextRange(pos, pos)); + + SubmitAction(action); + + return true; +} /// Get the style that is appropriate for a new paragraph at this position. /// If the previous paragraph has a paragraph style name, look up the next-paragraph /// style. -wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const +wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const { wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); if (para) { - wxTextAttr attr; + wxRichTextAttr attr; bool foundAttributes = false; // Look for a matching paragraph style @@ -5019,6 +5631,25 @@ wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPositio } } } + + // Also apply list style if present + if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet()) + { + wxRichTextListStyleDefinition* listDef = GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName()); + if (listDef) + { + int thisIndent = para->GetAttributes().GetLeftIndent(); + int thisLevel = para->GetAttributes().HasOutlineLevel() ? para->GetAttributes().GetOutlineLevel() : listDef->FindLevelForIndent(thisIndent); + + // Apply the overall list style, and item style for this level + wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, GetStyleSheet())); + wxRichTextApplyStyle(attr, listStyle); + attr.SetOutlineLevel(thisLevel); + if (para->GetAttributes().HasBulletNumber()) + attr.SetBulletNumber(para->GetAttributes().GetBulletNumber()); + } + } + if (!foundAttributes) { attr = para->GetAttributes(); @@ -5031,18 +5662,10 @@ wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPositio attr.SetFlags(flags); } - // Now see if we need to number the paragraph. - if (attr.HasBulletStyle()) - { - wxTextAttr numberingAttr; - if (FindNextParagraphNumber(para, numberingAttr)) - wxRichTextApplyStyle(attr, (const wxTextAttr&) numberingAttr); - } - return attr; } else - return wxTextAttr(); + return wxRichTextAttr(); } /// Submit command to delete this range @@ -5058,22 +5681,18 @@ bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichT // Copy the fragment that we'll need to restore in Undo CopyFragment(range, action->GetOldParagraphs()); - // Special case: if there is only one (non-partial) paragraph, - // we must save the *next* paragraph's style, because that - // is the style we must apply when inserting the content back - // when undoing the delete. (This is because we're merging the - // paragraph with the previous paragraph and throwing away - // the style, and we need to restore it.) - if (!action->GetOldParagraphs().GetPartialParagraph() && action->GetOldParagraphs().GetChildCount() == 1) + // See if we're deleting a paragraph marker, in which case we need to + // make a note not to copy the attributes from the 2nd paragraph to the 1st. + if (range.GetStart() == range.GetEnd()) { - wxRichTextParagraph* lastPara = GetParagraphAtPosition(range.GetStart()); - if (lastPara) + wxRichTextParagraph* para = GetParagraphAtPosition(range.GetStart()); + if (para && para->GetRange().GetEnd() == range.GetEnd()) { - wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetEnd()+1); - if (nextPara) + wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetStart()+1); + if (nextPara && nextPara != para) { - wxRichTextParagraph* para = (wxRichTextParagraph*) action->GetOldParagraphs().GetChild(0); - para->SetAttributes(nextPara->GetAttributes()); + action->GetOldParagraphs().GetChildren().GetFirst()->GetData()->SetAttributes(nextPara->GetAttributes()); + action->GetOldParagraphs().GetAttributes().SetFlags(action->GetOldParagraphs().GetAttributes().GetFlags() | wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE); } } } @@ -5091,7 +5710,7 @@ bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName) wxASSERT(m_batchedCommand == NULL); if (m_batchedCommand) { - GetCommandProcessor()->Submit(m_batchedCommand); + GetCommandProcessor()->Store(m_batchedCommand); } m_batchedCommand = new wxRichTextCommand(cmdName); } @@ -5111,7 +5730,7 @@ bool wxRichTextBuffer::EndBatchUndo() if (m_batchedCommandDepth == 0) { - GetCommandProcessor()->Submit(m_batchedCommand); + GetCommandProcessor()->Store(m_batchedCommand); m_batchedCommand = NULL; } @@ -5122,7 +5741,15 @@ bool wxRichTextBuffer::EndBatchUndo() bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action) { if (BatchingUndo() && m_batchedCommand && !SuppressingUndo()) + { + wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName()); + cmd->AddAction(action); + cmd->Do(); + cmd->GetActions().Clear(); + delete cmd; + m_batchedCommand->AddAction(action); + } else { wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName()); @@ -5152,20 +5779,18 @@ bool wxRichTextBuffer::EndSuppressUndo() } /// Begin using a style -bool wxRichTextBuffer::BeginStyle(const wxTextAttr& style) +bool wxRichTextBuffer::BeginStyle(const wxRichTextAttr& style) { - wxTextAttr newStyle(GetDefaultStyle()); + wxRichTextAttr newStyle(GetDefaultStyle()); // Save the old default style - m_attributeStack.Append((wxObject*) new wxTextAttr(GetDefaultStyle())); + m_attributeStack.Append((wxObject*) new wxRichTextAttr(GetDefaultStyle())); wxRichTextApplyStyle(newStyle, style); newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags()); SetDefaultStyle(newStyle); - // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize()); - return true; } @@ -5179,7 +5804,7 @@ bool wxRichTextBuffer::EndStyle() } wxList::compatibility_iterator node = m_attributeStack.GetLast(); - wxTextAttr* attr = (wxTextAttr*)node->GetData(); + wxRichTextAttr* attr = (wxRichTextAttr*)node->GetData(); m_attributeStack.Erase(node); SetDefaultStyle(*attr); @@ -5200,15 +5825,15 @@ bool wxRichTextBuffer::EndAllStyles() void wxRichTextBuffer::ClearStyleStack() { for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext()) - delete (wxTextAttr*) node->GetData(); + delete (wxRichTextAttr*) node->GetData(); m_attributeStack.Clear(); } /// Begin using bold bool wxRichTextBuffer::BeginBold() { - wxTextAttr attr; - attr.SetFontWeight(wxBOLD); + wxRichTextAttr attr; + attr.SetFontWeight(wxFONTWEIGHT_BOLD); return BeginStyle(attr); } @@ -5216,8 +5841,8 @@ bool wxRichTextBuffer::BeginBold() /// Begin using italic bool wxRichTextBuffer::BeginItalic() { - wxTextAttr attr; - attr.SetFontStyle(wxITALIC); + wxRichTextAttr attr; + attr.SetFontStyle(wxFONTSTYLE_ITALIC); return BeginStyle(attr); } @@ -5225,7 +5850,7 @@ bool wxRichTextBuffer::BeginItalic() /// Begin using underline bool wxRichTextBuffer::BeginUnderline() { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFontUnderlined(true); return BeginStyle(attr); @@ -5234,7 +5859,7 @@ bool wxRichTextBuffer::BeginUnderline() /// Begin using point size bool wxRichTextBuffer::BeginFontSize(int pointSize) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFontSize(pointSize); return BeginStyle(attr); @@ -5243,7 +5868,7 @@ bool wxRichTextBuffer::BeginFontSize(int pointSize) /// Begin using this font bool wxRichTextBuffer::BeginFont(const wxFont& font) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFont(font); return BeginStyle(attr); @@ -5252,7 +5877,7 @@ bool wxRichTextBuffer::BeginFont(const wxFont& font) /// Begin using this colour bool wxRichTextBuffer::BeginTextColour(const wxColour& colour) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR); attr.SetTextColour(colour); @@ -5262,7 +5887,7 @@ bool wxRichTextBuffer::BeginTextColour(const wxColour& colour) /// Begin using alignment bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_ALIGNMENT); attr.SetAlignment(alignment); @@ -5272,7 +5897,7 @@ bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment) /// Begin left indent bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -5282,7 +5907,7 @@ bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent) /// Begin right indent bool wxRichTextBuffer::BeginRightIndent(int rightIndent) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT); attr.SetRightIndent(rightIndent); @@ -5298,7 +5923,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after) if (after != 0) flags |= wxTEXT_ATTR_PARA_SPACING_AFTER; - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(flags); attr.SetParagraphSpacingBefore(before); attr.SetParagraphSpacingAfter(after); @@ -5309,7 +5934,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after) /// Begin line spacing bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(lineSpacing); @@ -5319,7 +5944,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) /// Begin numbered bullet bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetBulletNumber(bulletNumber); @@ -5331,7 +5956,7 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int /// Begin symbol bullet bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -5343,7 +5968,7 @@ bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, /// Begin standard bullet bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttr attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -5360,7 +5985,7 @@ bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle) wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); if (def) { - wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); + wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); return BeginStyle(attr); } } @@ -5375,7 +6000,7 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle) wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle); if (def) { - wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); + wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); return BeginStyle(attr); } } @@ -5390,7 +6015,7 @@ bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle); if (def) { - wxTextAttr attr(def->GetCombinedStyleForLevel(level)); + wxRichTextAttr attr(def->GetCombinedStyleForLevel(level)); attr.SetBulletNumber(number); @@ -5403,7 +6028,7 @@ bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int /// Begin URL bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle) { - wxTextAttr attr; + wxRichTextAttr attr; if (!characterStyle.IsEmpty() && GetStyleSheet()) { @@ -5445,14 +6070,15 @@ bool wxRichTextBuffer::RemoveHandler(const wxString& name) } /// Finds a handler by filename or, if supplied, type -wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType) +wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, + wxRichTextFileType imageType) { if (imageType != wxRICHTEXT_TYPE_ANY) return FindHandler(imageType); else if (!filename.IsEmpty()) { wxString path, file, ext; - wxSplitPath(filename, & path, & file, & ext); + wxFileName::SplitPath(filename, & path, & file, & ext); return FindHandler(ext, imageType); } else @@ -5475,7 +6101,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name) } /// Finds a handler by extension and type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -5490,7 +6116,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, } /// Finds a handler by type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -5534,7 +6160,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t while (node) { wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData(); - if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad())) + if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad()))) { if (combine) { @@ -5568,12 +6194,12 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t } /// Load a file -bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) +bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) { - SetDefaultStyle(wxTextAttr()); + SetDefaultStyle(wxRichTextAttr()); handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, filename); Invalidate(wxRICHTEXT_ALL); @@ -5584,7 +6210,7 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) } /// Save a file -bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) +bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) @@ -5597,12 +6223,12 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) } /// Load from a stream -bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) +bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) { - SetDefaultStyle(wxTextAttr()); + SetDefaultStyle(wxRichTextAttr()); handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, stream); Invalidate(wxRICHTEXT_ALL); @@ -5613,7 +6239,7 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) } /// Save to a stream -bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) +bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) @@ -5687,7 +6313,9 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer(); if (richTextBuffer) { - InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0); + if (GetRichTextCtrl()) + GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd()); delete richTextBuffer; } } @@ -5709,7 +6337,10 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) #else wxString text2 = text; #endif - InsertTextWithUndo(position+1, text2, GetRichTextCtrl()); + InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + + if (GetRichTextCtrl()) + GetRichTextCtrl()->ShowPosition(position + text2.Length()); success = true; } @@ -5727,10 +6358,10 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) if (action->GetNewParagraphs().GetChildCount() == 1) action->GetNewParagraphs().SetPartialParagraph(true); - action->SetPosition(position); + action->SetPosition(position+1); // Set the range we'll need to delete in Undo - action->SetRange(wxRichTextRange(position, position)); + action->SetRange(wxRichTextRange(position+1, position+1)); SubmitAction(action); @@ -5867,7 +6498,7 @@ void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer) sm_renderer = renderer; } -bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& bulletAttr, const wxRect& rect) +bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect) { if (bulletAttr.GetTextColour().Ok()) { @@ -5942,14 +6573,14 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w return true; } -bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& attr, const wxRect& rect, const wxString& text) +bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) { if (!text.empty()) { wxFont font; if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont()) { - wxTextAttr fontAttr; + wxRichTextAttr fontAttr; fontAttr.SetFontSize(attr.GetFontSize()); fontAttr.SetFontStyle(attr.GetFontStyle()); fontAttr.SetFontWeight(attr.GetFontWeight()); @@ -5967,7 +6598,7 @@ bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& if (attr.GetTextColour().Ok()) dc.SetTextForeground(attr.GetTextColour()); - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); int charHeight = dc.GetCharHeight(); wxCoord tw, th; @@ -5994,7 +6625,7 @@ bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& return false; } -bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttr& WXUNUSED(attr), const wxRect& WXUNUSED(rect)) +bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxRichTextAttr& WXUNUSED(attr), const wxRect& WXUNUSED(rect)) { // Currently unimplemented. The intention is to store bitmaps by name in a media store associated // with the buffer. The store will allow retrieval from memory, disk or other means. @@ -6004,10 +6635,10 @@ bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(parag /// Enumerate the standard bullet names currently supported bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames) { - bulletNames.Add(wxT("standard/circle")); - bulletNames.Add(wxT("standard/square")); - bulletNames.Add(wxT("standard/diamond")); - bulletNames.Add(wxT("standard/triangle")); + bulletNames.Add(wxTRANSLATE("standard/circle")); + bulletNames.Add(wxTRANSLATE("standard/square")); + bulletNames.Add(wxTRANSLATE("standard/diamond")); + bulletNames.Add(wxTRANSLATE("standard/triangle")); return true; } @@ -6129,6 +6760,58 @@ wxRichTextAction::~wxRichTextAction() { } +void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions) +{ + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // NOTE: we're assuming that the buffer is laid out correctly at this point. + // If we had several actions, which only invalidate and leave layout until the + // paint handler is called, then this might not be true. So we may need to switch + // optimisation on only when we're simply adding text and not simultaneously + // deleting a selection, for example. Or, we make sure the buffer is laid out correctly + // first, but of course this means we'll be doing it twice. + if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly + { + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + int lastY = firstVisiblePt.y + clientSize.y; + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart()); + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + if (pt.y > lastY) + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) + { + optimizationLineCharPositions.Add(range.GetStart()); + optimizationLineYPositions.Add(pt.y); + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + } +#endif +} + bool wxRichTextAction::Do() { m_buffer->Modify(true); @@ -6143,54 +6826,12 @@ bool wxRichTextAction::Do() wxArrayInt optimizationLineYPositions; #if wxRICHTEXT_USE_OPTIMIZED_DRAWING - // NOTE: we're assuming that the buffer is laid out correctly at this point. - // If we had several actions, which only invalidate and leave layout until the - // paint handler is called, then this might not be true. So we may need to switch - // optimisation on only when we're simply adding text and not simultaneously - // deleting a selection, for example. Or, we make sure the buffer is laid out correctly - // first, but of course this means we'll be doing it twice. - if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly - { - wxSize clientSize = m_ctrl->GetClientSize(); - wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); - int lastY = firstVisiblePt.y + clientSize.y; - - wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart()); - wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); - while (node) - { - wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) - { - wxRichTextLine* line = node2->GetData(); - wxPoint pt = line->GetAbsolutePosition(); - wxRichTextRange range = line->GetAbsoluteRange(); - - if (pt.y > lastY) - { - node2 = wxRichTextLineList::compatibility_iterator(); - node = wxRichTextObjectList::compatibility_iterator(); - } - else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) - { - optimizationLineCharPositions.Add(range.GetStart()); - optimizationLineYPositions.Add(pt.y); - } - - if (node2) - node2 = node2->GetNext(); - } - - if (node) - node = node->GetNext(); - } - } + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); #endif m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs); m_buffer->UpdateRanges(); - m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart()-1, GetRange().GetEnd())); + m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd())); long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength(); @@ -6210,10 +6851,7 @@ bool wxRichTextAction::Do() newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); - if (optimizationLineCharPositions.GetCount() > 0) - UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions); - else - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, @@ -6228,11 +6866,22 @@ bool wxRichTextAction::Do() } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); - UpdateAppearance(GetRange().GetStart()-1, true /* send update event */); + long caretPos = GetRange().GetStart()-1; + if (caretPos >= m_buffer->GetRange().GetEnd()) + caretPos --; + + UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, @@ -6278,13 +6927,20 @@ bool wxRichTextAction::Undo() { case wxRICHTEXT_INSERT: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); long newCaretPosition = GetPosition() - 1; - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, @@ -6299,11 +6955,18 @@ bool wxRichTextAction::Undo() } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs); m_buffer->UpdateRanges(); m_buffer->Invalidate(GetRange()); - UpdateAppearance(GetPosition(), true /* send update event */); + UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, @@ -6342,7 +7005,7 @@ bool wxRichTextAction::Undo() } /// Update the control appearance -void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions) +void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* WXUNUSED(optimizationLineCharPositions), wxArrayInt* WXUNUSED(optimizationLineYPositions), bool WXUNUSED(isDoCmd)) { if (m_ctrl) { @@ -6350,101 +7013,12 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent if (!m_ctrl->IsFrozen()) { m_ctrl->LayoutContent(); - m_ctrl->PositionCaret(); - -#if wxRICHTEXT_USE_OPTIMIZED_DRAWING - // Find refresh rectangle if we are in a position to optimise refresh - if (m_cmdId == wxRICHTEXT_INSERT && optimizationLineCharPositions && optimizationLineCharPositions->GetCount() > 0) - { - size_t i; - - wxSize clientSize = m_ctrl->GetClientSize(); - wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); - - // Start/end positions - int firstY = 0; - int lastY = firstVisiblePt.y + clientSize.y; - - bool foundStart = false; - bool foundEnd = false; + // TODO Refresh the whole client area now + m_ctrl->Refresh(false); - // position offset - how many characters were inserted - int positionOffset = GetRange().GetLength(); - - // find the first line which is being drawn at the same position as it was - // before. Since we're talking about a simple insertion, we can assume - // that the rest of the window does not need to be redrawn. - - wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition()); - wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); - while (node) - { - wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) - { - wxRichTextLine* line = node2->GetData(); - wxPoint pt = line->GetAbsolutePosition(); - wxRichTextRange range = line->GetAbsoluteRange(); - - // we want to find the first line that is in the same position - // as before. This will mean we're at the end of the changed text. - - if (pt.y > lastY) // going past the end of the window, no more info - { - node2 = wxRichTextLineList::compatibility_iterator(); - node = wxRichTextObjectList::compatibility_iterator(); - } - else - { - if (!foundStart) - { - firstY = pt.y - firstVisiblePt.y; - foundStart = true; - } - - // search for this line being at the same position as before - for (i = 0; i < optimizationLineCharPositions->GetCount(); i++) - { - if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) && - ((*optimizationLineYPositions)[i] == pt.y)) - { - // Stop, we're now the same as we were - foundEnd = true; - lastY = pt.y - firstVisiblePt.y; - - node2 = wxRichTextLineList::compatibility_iterator(); - node = wxRichTextObjectList::compatibility_iterator(); - - break; - } - } - } - - if (node2) - node2 = node2->GetNext(); - } - - if (node) - node = node->GetNext(); - } - - if (!foundStart) - firstY = firstVisiblePt.y; - if (!foundEnd) - lastY = firstVisiblePt.y + clientSize.y; - - wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY); - m_ctrl->RefreshRect(rect); - - // TODO: we need to make sure that lines are only drawn if in the update region. The rect - // passed to Draw is currently used in different ways (to pass the position the content should - // be drawn at as well as the relevant region). - } - else +#if wxRICHTEXT_USE_OWN_CARET + m_ctrl->PositionCaret(); #endif - m_ctrl->Refresh(false); - if (sendUpdateEvent) wxTextCtrl::SendTextUpdatedEvent(m_ctrl); } @@ -6501,64 +7075,119 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range) return true; } +/*! + * wxRichTextAnchoredObject implementation + */ +IMPLEMENT_CLASS(wxRichTextAnchoredObject, wxRichTextObject) + +wxRichTextAnchoredObject::wxRichTextAnchoredObject(wxRichTextObject* parent, const wxRichTextAttr& attr): + wxRichTextObject(parent) +{ + SetAttributes(attr); +} + +wxRichTextAnchoredObject::~wxRichTextAnchoredObject() +{ +} + +void wxRichTextAnchoredObject::Copy(const wxRichTextAnchoredObject& obj) +{ + wxRichTextObject::Copy(obj); +} + +void wxRichTextAnchoredObject::SetParent(wxRichTextObject* parent) +{ + wxRichTextObject::SetParent(parent); +} + /*! * wxRichTextImage implementation * This object represents an image. */ -IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject) +IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextAnchoredObject) -wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttr* charStyle): - wxRichTextObject(parent) +wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxRichTextAttr* charStyle): + wxRichTextAnchoredObject(parent) { - m_image = image; + m_imageBlock.MakeImageBlockDefaultQuality(image, wxBITMAP_TYPE_PNG); if (charStyle) SetAttributes(*charStyle); } -wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttr* charStyle): - wxRichTextObject(parent) +wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxRichTextAttr* charStyle): + wxRichTextAnchoredObject(parent) { m_imageBlock = imageBlock; - m_imageBlock.Load(m_image); if (charStyle) SetAttributes(*charStyle); } -/// Load wxImage from the block -bool wxRichTextImage::LoadFromBlock() +/// Create a cached image at the required size +bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache) { - m_imageBlock.Load(m_image); - return m_imageBlock.Ok(); -} + if (resetCache || !m_imageCache.IsOk() /* || m_imageCache.GetWidth() != size.x || m_imageCache.GetHeight() != size.y */) + { + if (!m_imageBlock.IsOk()) + return false; -/// Make block from the wxImage -bool wxRichTextImage::MakeBlock() -{ - if (m_imageBlock.GetImageType() == wxBITMAP_TYPE_ANY || m_imageBlock.GetImageType() == -1) - m_imageBlock.SetImageType(wxBITMAP_TYPE_PNG); + wxImage image; + m_imageBlock.Load(image); + if (!image.IsOk()) + return false; - m_imageBlock.MakeImageBlock(m_image, m_imageBlock.GetImageType()); - return m_imageBlock.Ok(); -} + int width = image.GetWidth(); + int height = image.GetHeight(); + + if (GetAttributes().GetTextBoxAttr().GetWidth().IsPresent() && GetAttributes().GetTextBoxAttr().GetWidth().GetValue() > 0) + { + if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + width = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetWidth().GetValue()); + else + width = GetAttributes().GetTextBoxAttr().GetWidth().GetValue(); + } + if (GetAttributes().GetTextBoxAttr().GetHeight().IsPresent() && GetAttributes().GetTextBoxAttr().GetHeight().GetValue() > 0) + { + if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + height = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetHeight().GetValue()); + else + height = GetAttributes().GetTextBoxAttr().GetHeight().GetValue(); + } + + if (image.GetWidth() == width && image.GetHeight() == height) + m_imageCache = wxBitmap(image); + else + { + // If the original width and height is small, e.g. 400 or below, + // scale up and then down to improve image quality. This can make + // a big difference, with not much performance hit. + int upscaleThreshold = 400; + wxImage img; + if (image.GetWidth() <= upscaleThreshold || image.GetHeight() <= upscaleThreshold) + { + img = image.Scale(image.GetWidth()*2, image.GetHeight()*2); + img.Rescale(width, height, wxIMAGE_QUALITY_HIGH); + } + else + img = image.Scale(width, height, wxIMAGE_QUALITY_HIGH); + m_imageCache = wxBitmap(img); + } + } + return m_imageCache.IsOk(); +} /// Draw the item bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style)) { - if (!m_image.Ok() && m_imageBlock.Ok()) - LoadFromBlock(); - - if (!m_image.Ok()) + // Don't need cached size AFAIK + // wxSize size = GetCachedSize(); + if (!LoadImageCache(dc)) return false; - if (m_image.Ok() && !m_bitmap.Ok()) - m_bitmap = wxBitmap(m_image); - - int y = rect.y + (rect.height - m_image.GetHeight()); + int y = rect.y + (rect.height - m_imageCache.GetHeight()); - if (m_bitmap.Ok()) - dc.DrawBitmap(m_bitmap, rect.x, y, true); + dc.DrawBitmap(m_imageCache, rect.x, y, true); if (selectionRange.Contains(range.GetStart())) { @@ -6573,32 +7202,40 @@ bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichT } /// Lay the item out -bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style)) +bool wxRichTextImage::Layout(wxDC& dc, const wxRect& rect, int WXUNUSED(style)) { - if (!m_image.Ok()) - LoadFromBlock(); + if (!LoadImageCache(dc)) + return false; - if (m_image.Ok()) - { - SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight())); - SetPosition(rect.GetPosition()); - } + SetCachedSize(wxSize(m_imageCache.GetWidth(), m_imageCache.GetHeight())); + SetPosition(rect.GetPosition()); return true; } /// Get/set the object size for the given range. Returns false if the range /// is invalid for this object. -bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position)) const +bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& dc, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const { if (!range.IsWithin(GetRange())) return false; - if (!m_image.Ok()) + if (!((wxRichTextImage*)this)->LoadImageCache(dc)) + { + size.x = 0; size.y = 0; + if (partialExtents) + partialExtents->Add(0); return false; + } - size.x = m_image.GetWidth(); - size.y = m_image.GetHeight(); + int width = m_imageCache.GetWidth(); + int height = m_imageCache.GetHeight(); + + if (partialExtents) + partialExtents->Add(width); + + size.x = width; + size.y = height; return true; } @@ -6606,27 +7243,41 @@ bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, i /// Copy void wxRichTextImage::Copy(const wxRichTextImage& obj) { - wxRichTextObject::Copy(obj); + wxRichTextAnchoredObject::Copy(obj); - m_image = obj.m_image; m_imageBlock = obj.m_imageBlock; } +/// Edit properties via a GUI +bool wxRichTextImage::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) +{ + wxRichTextImageDialog imageDlg(wxGetTopLevelParent(parent)); + imageDlg.SetImageObject(this, buffer); + + if (imageDlg.ShowModal() == wxID_OK) + { + imageDlg.ApplyImageAttr(); + return true; + } + else + return false; +} + /*! * Utilities * */ /// Compare two attribute objects -bool wxTextAttrEq(const wxTextAttr& attr1, const wxTextAttr& attr2) +bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2) { return (attr1 == attr2); } // Partial equality test taking flags into account -bool wxTextAttrEqPartial(const wxTextAttr& attr1, const wxTextAttr& attr2, int flags) +bool wxTextAttrEqPartial(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2) { - return attr1.EqPartial(attr2, flags); + return attr1.EqPartial(attr2); } /// Compare tabs @@ -6644,33 +7295,33 @@ bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) return true; } -bool wxRichTextApplyStyle(wxTextAttr& destStyle, const wxTextAttr& style, wxTextAttr* compareWith) +bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) { return destStyle.Apply(style, compareWith); } // Remove attributes -bool wxRichTextRemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style) +bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style) { - return wxTextAttr::RemoveStyle(destStyle, style); + return destStyle.RemoveStyle(style); } /// Combine two bitlists, specifying the bits of interest with separate flags. bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB) { - return wxTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB); + return wxRichTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB); } /// Compare two bitlists bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags) { - return wxTextAttr::BitlistsEqPartial(valueA, valueB, flags); + return wxRichTextAttr::BitlistsEqPartial(valueA, valueB, flags); } /// Split into paragraph and character styles -bool wxRichTextSplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle) +bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle) { - return wxTextAttr::SplitParaCharStyles(style, parStyle, charStyle); + return wxRichTextAttr::SplitParaCharStyles(style, parStyle, charStyle); } /// Convert a decimal to Roman numerals @@ -6757,7 +7408,7 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f bool wxRichTextFileHandler::CanHandle(const wxString& filename) const { wxString path, file, ext; - wxSplitPath(filename, & path, & file, & ext); + wxFileName::SplitPath(filename, & path, & file, & ext); return (ext.Lower() == GetExtension()); } @@ -6836,26 +7487,21 @@ wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wx wxRichTextImageBlock::~wxRichTextImageBlock() { - if (m_data) - { - delete[] m_data; - m_data = NULL; - } + wxDELETEA(m_data); } void wxRichTextImageBlock::Init() { m_data = NULL; m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } void wxRichTextImageBlock::Clear() { - delete[] m_data; - m_data = NULL; + wxDELETEA(m_data); m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } @@ -6865,24 +7511,23 @@ void wxRichTextImageBlock::Clear() // If it's not a JPEG we can make use of 'image', already scaled, so we don't have to // load the image a 2nd time. -bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG) +bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType, + wxImage& image, bool convertToJPEG) { m_imageType = imageType; wxString filenameToRead(filename); bool removeFile = false; - if (imageType == -1) + if (imageType == wxBITMAP_TYPE_INVALID) return false; // Could not determine image type if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG) { - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; - - wxASSERT(success); + wxString tempFile = + wxFileName::CreateTempFileName(_("image")); - wxUnusedVar(success); + wxASSERT(!tempFile.IsEmpty()); image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG); filenameToRead = tempFile; @@ -6909,44 +7554,50 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp // Make an image block from the wxImage in the given // format. -bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality) +bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality) { - m_imageType = imageType; image.SetOption(wxT("quality"), quality); - if (imageType == -1) + if (imageType == wxBITMAP_TYPE_INVALID) return false; // Could not determine image type - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; + return DoMakeImageBlock(image, imageType); +} - wxASSERT(success); - wxUnusedVar(success); +// Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG) +bool wxRichTextImageBlock::MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType) +{ + if (imageType == wxBITMAP_TYPE_INVALID) + return false; // Could not determine image type + + return DoMakeImageBlock(image, imageType); +} - if (!image.SaveFile(tempFile, m_imageType)) +// Makes the image block +bool wxRichTextImageBlock::DoMakeImageBlock(const wxImage& image, wxBitmapType imageType) +{ + wxMemoryOutputStream memStream; + if (!image.SaveFile(memStream, imageType)) { - if (wxFileExists(tempFile)) - wxRemoveFile(tempFile); return false; } - wxFile file; - if (!file.Open(tempFile)) - return false; - - m_dataSize = (size_t) file.Length(); - file.Close(); + unsigned char* block = new unsigned char[memStream.GetSize()]; + if (!block) + return NULL; if (m_data) delete[] m_data; - m_data = ReadBlock(tempFile, m_dataSize); + m_data = block; - wxRemoveFile(tempFile); + m_imageType = imageType; + m_dataSize = memStream.GetSize(); + + memStream.CopyTo(m_data, m_dataSize); return (m_data != NULL); } - // Write to a file bool wxRichTextImageBlock::Write(const wxString& filename) { @@ -6956,11 +7607,7 @@ bool wxRichTextImageBlock::Write(const wxString& filename) void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block) { m_imageType = block.m_imageType; - if (m_data) - { - delete[] m_data; - m_data = NULL; - } + wxDELETEA(m_data); m_dataSize = block.m_dataSize; if (m_dataSize == 0) return; @@ -6988,9 +7635,8 @@ bool wxRichTextImageBlock::Load(wxImage& image) wxMemoryInputStream mstream(m_data, m_dataSize); bool success = image.LoadFile(mstream, GetImageType()); #else - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; - wxASSERT(success); + wxString tempFile = wxFileName::CreateTempFileName(_("image")); + wxASSERT(!tempFile.IsEmpty()); if (!WriteBlock(tempFile, m_data, m_dataSize)) { @@ -7037,14 +7683,17 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) } // Read data in hex from a stream -bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType) +bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType) { int dataSize = length/2; if (m_data) delete[] m_data; - wxChar str[2]; + // create a null terminated temporary string: + char str[3]; + str[2] = '\0'; + m_data = new unsigned char[dataSize]; int i; for (i = 0; i < dataSize; i ++) @@ -7205,8 +7854,7 @@ bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) { - delete m_richTextBuffer; - m_richTextBuffer = NULL; + wxDELETE(m_richTextBuffer); wxString bufXML((const char*) buf, wxConvUTF8); @@ -7217,8 +7865,7 @@ bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) { 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; + wxDELETE(m_richTextBuffer); return false; } @@ -7241,12 +7888,12 @@ class wxRichTextFontTableData: public wxObjectRefData public: wxRichTextFontTableData() {} - wxFont FindFont(const wxTextAttr& fontSpec); + wxFont FindFont(const wxRichTextAttr& fontSpec); wxRichTextFontTableHashMap m_hashMap; }; -wxFont wxRichTextFontTableData::FindFont(const wxTextAttr& fontSpec) +wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec) { wxString facename(fontSpec.GetFontFaceName()); wxString spec(wxString::Format(wxT("%d-%d-%d-%d-%s-%d"), fontSpec.GetFontSize(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), facename.c_str(), (int) fontSpec.GetFontEncoding())); @@ -7272,6 +7919,7 @@ wxRichTextFontTable::wxRichTextFontTable() } wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table) + : wxObject() { (*this) = table; } @@ -7291,7 +7939,7 @@ void wxRichTextFontTable::operator= (const wxRichTextFontTable& table) Ref(table); } -wxFont wxRichTextFontTable::FindFont(const wxTextAttr& fontSpec) +wxFont wxRichTextFontTable::FindFont(const wxRichTextAttr& fontSpec) { wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData; if (data) @@ -7307,5 +7955,963 @@ void wxRichTextFontTable::Clear() data->m_hashMap.clear(); } +// wxTextBoxAttr + + +void wxTextBoxAttr::Reset() +{ + m_flags = 0; + m_floatMode = 0; + m_clearMode = 0; + m_collapseMode = 0; + + m_margins.Reset(); + m_padding.Reset(); + m_position.Reset(); + + m_width.Reset(); + m_height.Reset(); + + m_border.Reset(); + m_outline.Reset(); +} + +// Equality test +bool wxTextBoxAttr::operator== (const wxTextBoxAttr& attr) const +{ + return ( + m_flags == attr.m_flags && + m_floatMode == attr.m_floatMode && + m_clearMode == attr.m_clearMode && + m_collapseMode == attr.m_collapseMode && + + m_margins == attr.m_margins && + m_padding == attr.m_padding && + m_position == attr.m_position && + + m_width == attr.m_width && + m_height == attr.m_height && + + m_border == attr.m_border && + m_outline == attr.m_outline + ); +} + +// Partial equality test +bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr) const +{ + if (attr.HasFloatMode() && HasFloatMode() && (GetFloatMode() != attr.GetFloatMode())) + return false; + + if (attr.HasClearMode() && HasClearMode() && (GetClearMode() != attr.GetClearMode())) + return false; + + if (attr.HasCollapseBorders() && HasCollapseBorders() && (attr.GetCollapseBorders() != GetCollapseBorders())) + return false; + + // Position + + if (!m_position.EqPartial(attr.m_position)) + return false; + + // Margins + + if (!m_margins.EqPartial(attr.m_margins)) + return false; + + // Padding + + if (!m_padding.EqPartial(attr.m_padding)) + return false; + + // Border + + if (!GetBorder().EqPartial(attr.GetBorder())) + return false; + + // Outline + + if (!GetOutline().EqPartial(attr.GetOutline())) + return false; + + return true; +} + +// Merges the given attributes. If compareWith +// is non-NULL, then it will be used to mask out those attributes that are the same in style +// and compareWith, for situations where we don't want to explicitly set inherited attributes. +bool wxTextBoxAttr::Apply(const wxTextBoxAttr& attr, const wxTextBoxAttr* compareWith) +{ + if (attr.HasFloatMode()) + { + if (!(compareWith && compareWith->HasFloatMode() && compareWith->GetFloatMode() == attr.GetFloatMode())) + SetFloatMode(attr.GetFloatMode()); + } + + if (attr.HasClearMode()) + { + if (!(compareWith && compareWith->HasClearMode() && compareWith->GetClearMode() == attr.GetClearMode())) + SetClearMode(attr.GetClearMode()); + } + + if (attr.HasCollapseBorders()) + { + if (!(compareWith && compareWith->HasCollapseBorders() && compareWith->GetCollapseBorders() == attr.GetCollapseBorders())) + SetCollapseBorders(true); + } + + m_margins.Apply(attr.m_margins, compareWith ? (& attr.m_margins) : (const wxTextBoxAttrDimensions*) NULL); + m_padding.Apply(attr.m_padding, compareWith ? (& attr.m_padding) : (const wxTextBoxAttrDimensions*) NULL); + m_position.Apply(attr.m_position, compareWith ? (& attr.m_position) : (const wxTextBoxAttrDimensions*) NULL); + + m_width.Apply(attr.m_width, compareWith ? (& attr.m_width) : (const wxTextAttrDimension*) NULL); + m_height.Apply(attr.m_height, compareWith ? (& attr.m_height) : (const wxTextAttrDimension*) NULL); + + m_border.Apply(attr.m_border, compareWith ? (& attr.m_border) : (const wxTextBoxAttrBorders*) NULL); + m_outline.Apply(attr.m_outline, compareWith ? (& attr.m_outline) : (const wxTextBoxAttrBorders*) NULL); + + return true; +} + +// Remove specified attributes from this object +bool wxTextBoxAttr::RemoveStyle(const wxTextBoxAttr& attr) +{ + if (attr.HasFloatMode()) + RemoveFlag(wxTEXT_BOX_ATTR_FLOAT); + + if (attr.HasClearMode()) + RemoveFlag(wxTEXT_BOX_ATTR_CLEAR); + + if (attr.HasCollapseBorders()) + RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); + + m_margins.RemoveStyle(attr.m_margins); + m_padding.RemoveStyle(attr.m_padding); + m_position.RemoveStyle(attr.m_position); + + if (attr.m_width.IsPresent()) + m_width.Reset(); + if (attr.m_height.IsPresent()) + m_height.Reset(); + + m_border.RemoveStyle(attr.m_border); + m_outline.RemoveStyle(attr.m_outline); + + return true; +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextBoxAttr::CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBoxAttr& clashingAttr, wxTextBoxAttr& absentAttr) +{ + if (attr.HasFloatMode()) + { + if (!clashingAttr.HasFloatMode() && !absentAttr.HasFloatMode()) + { + if (HasFloatMode()) + { + if (GetFloatMode() != attr.GetFloatMode()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT); + RemoveFlag(wxTEXT_BOX_ATTR_FLOAT); + } + } + else + SetFloatMode(attr.GetFloatMode()); + } + } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT); + + if (attr.HasClearMode()) + { + if (!clashingAttr.HasClearMode() && !absentAttr.HasClearMode()) + { + if (HasClearMode()) + { + if (GetClearMode() != attr.GetClearMode()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR); + RemoveFlag(wxTEXT_BOX_ATTR_CLEAR); + } + } + else + SetClearMode(attr.GetClearMode()); + } + } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR); + + if (attr.HasCollapseBorders()) + { + if (!clashingAttr.HasCollapseBorders() && !absentAttr.HasCollapseBorders()) + { + if (HasCollapseBorders()) + { + if (GetCollapseBorders() != attr.GetCollapseBorders()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); + RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); + } + } + else + SetCollapseBorders(attr.GetCollapseBorders()); + } + } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); + + m_margins.CollectCommonAttributes(attr.m_margins, clashingAttr.m_margins, absentAttr.m_margins); + m_padding.CollectCommonAttributes(attr.m_padding, clashingAttr.m_padding, absentAttr.m_padding); + m_position.CollectCommonAttributes(attr.m_position, clashingAttr.m_position, absentAttr.m_position); + + m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width); + m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height); + + m_border.CollectCommonAttributes(attr.m_border, clashingAttr.m_border, absentAttr.m_border); + m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline); +} + +// wxRichTextAttr + +void wxRichTextAttr::Copy(const wxRichTextAttr& attr) +{ + wxTextAttr::Copy(attr); + + m_textBoxAttr = attr.m_textBoxAttr; +} + +bool wxRichTextAttr::operator==(const wxRichTextAttr& attr) const +{ + if (!(wxTextAttr::operator==(attr))) + return false; + + return (m_textBoxAttr == attr.m_textBoxAttr); +} + +// Partial equality test taking comparison object into account +bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr) const +{ + if (!(wxTextAttr::EqPartial(attr))) + return false; + + return m_textBoxAttr.EqPartial(attr.m_textBoxAttr); +} + +// Merges the given attributes. If compareWith +// is non-NULL, then it will be used to mask out those attributes that are the same in style +// and compareWith, for situations where we don't want to explicitly set inherited attributes. +bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith) +{ + wxTextAttr::Apply(style, compareWith); + + return m_textBoxAttr.Apply(style.m_textBoxAttr, compareWith ? (& compareWith->m_textBoxAttr) : (const wxTextBoxAttr*) NULL); +} + +// Remove specified attributes from this object +bool wxRichTextAttr::RemoveStyle(const wxRichTextAttr& attr) +{ + wxTextAttr::RemoveStyle(*this, attr); + + return m_textBoxAttr.RemoveStyle(attr.m_textBoxAttr); +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxRichTextAttr::CollectCommonAttributes(const wxRichTextAttr& attr, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr) +{ + wxTextAttrCollectCommonAttributes(*this, attr, clashingAttr, absentAttr); + + m_textBoxAttr.CollectCommonAttributes(attr.m_textBoxAttr, clashingAttr.m_textBoxAttr, absentAttr.m_textBoxAttr); +} + +// Partial equality test +bool wxTextBoxAttrBorder::EqPartial(const wxTextBoxAttrBorder& border) const +{ + if (border.HasStyle() && !HasStyle() && (border.GetStyle() != GetStyle())) + return false; + + if (border.HasColour() && !HasColour() && (border.GetColourLong() != GetColourLong())) + return false; + + if (border.HasWidth() && !HasWidth() && !(border.GetWidth() == GetWidth())) + return false; + + return true; +} + +// Apply border to 'this', but not if the same as compareWith +bool wxTextBoxAttrBorder::Apply(const wxTextBoxAttrBorder& border, const wxTextBoxAttrBorder* compareWith) +{ + if (border.HasStyle()) + { + if (!(compareWith && (border.GetStyle() == compareWith->GetStyle()))) + SetStyle(border.GetStyle()); + } + if (border.HasColour()) + { + if (!(compareWith && (border.GetColourLong() == compareWith->GetColourLong()))) + SetColour(border.GetColourLong()); + } + if (border.HasWidth()) + { + if (!(compareWith && (border.GetWidth() == compareWith->GetWidth()))) + SetWidth(border.GetWidth()); + } + + return true; +} + +// Remove specified attributes from this object +bool wxTextBoxAttrBorder::RemoveStyle(const wxTextBoxAttrBorder& attr) +{ + if (attr.HasStyle() && HasStyle()) + SetFlags(GetFlags() & ~wxTEXT_BOX_ATTR_BORDER_STYLE); + if (attr.HasColour() && HasColour()) + SetFlags(GetFlags() & ~wxTEXT_BOX_ATTR_BORDER_COLOUR); + if (attr.HasWidth() && HasWidth()) + m_borderWidth.Reset(); + + return true; +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextBoxAttrBorder::CollectCommonAttributes(const wxTextBoxAttrBorder& attr, wxTextBoxAttrBorder& clashingAttr, wxTextBoxAttrBorder& absentAttr) +{ + if (attr.HasStyle()) + { + if (!clashingAttr.HasStyle() && !absentAttr.HasStyle()) + { + if (HasStyle()) + { + if (GetStyle() != attr.GetStyle()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); + RemoveFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); + } + } + else + SetStyle(attr.GetStyle()); + } + } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); + + if (attr.HasColour()) + { + if (!clashingAttr.HasColour() && !absentAttr.HasColour()) + { + if (HasColour()) + { + if (GetColour() != attr.GetColour()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR); + RemoveFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR); + } + } + else + SetColour(attr.GetColourLong()); + } + } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR); + + m_borderWidth.CollectCommonAttributes(attr.m_borderWidth, clashingAttr.m_borderWidth, absentAttr.m_borderWidth); +} + +// Partial equality test +bool wxTextBoxAttrBorders::EqPartial(const wxTextBoxAttrBorders& borders) const +{ + return m_left.EqPartial(borders.m_left) && m_right.EqPartial(borders.m_right) && + m_top.EqPartial(borders.m_top) && m_bottom.EqPartial(borders.m_bottom); +} + +// Apply border to 'this', but not if the same as compareWith +bool wxTextBoxAttrBorders::Apply(const wxTextBoxAttrBorders& borders, const wxTextBoxAttrBorders* compareWith) +{ + m_left.Apply(borders.m_left, compareWith ? (& compareWith->m_left) : (const wxTextBoxAttrBorder*) NULL); + m_right.Apply(borders.m_right, compareWith ? (& compareWith->m_right) : (const wxTextBoxAttrBorder*) NULL); + m_top.Apply(borders.m_top, compareWith ? (& compareWith->m_top) : (const wxTextBoxAttrBorder*) NULL); + m_bottom.Apply(borders.m_bottom, compareWith ? (& compareWith->m_bottom) : (const wxTextBoxAttrBorder*) NULL); + return true; +} + +// Remove specified attributes from this object +bool wxTextBoxAttrBorders::RemoveStyle(const wxTextBoxAttrBorders& attr) +{ + m_left.RemoveStyle(attr.m_left); + m_right.RemoveStyle(attr.m_right); + m_top.RemoveStyle(attr.m_top); + m_bottom.RemoveStyle(attr.m_bottom); + return true; +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextBoxAttrBorders::CollectCommonAttributes(const wxTextBoxAttrBorders& attr, wxTextBoxAttrBorders& clashingAttr, wxTextBoxAttrBorders& absentAttr) +{ + m_left.CollectCommonAttributes(attr.m_left, clashingAttr.m_left, absentAttr.m_left); + m_right.CollectCommonAttributes(attr.m_right, clashingAttr.m_right, absentAttr.m_right); + m_top.CollectCommonAttributes(attr.m_top, clashingAttr.m_top, absentAttr.m_top); + m_bottom.CollectCommonAttributes(attr.m_bottom, clashingAttr.m_bottom, absentAttr.m_bottom); +} + +// Set style of all borders +void wxTextBoxAttrBorders::SetStyle(int style) +{ + m_left.SetStyle(style); + m_right.SetStyle(style); + m_top.SetStyle(style); + m_bottom.SetStyle(style); +} + +// Set colour of all borders +void wxTextBoxAttrBorders::SetColour(unsigned long colour) +{ + m_left.SetColour(colour); + m_right.SetColour(colour); + m_top.SetColour(colour); + m_bottom.SetColour(colour); +} + +void wxTextBoxAttrBorders::SetColour(const wxColour& colour) +{ + m_left.SetColour(colour); + m_right.SetColour(colour); + m_top.SetColour(colour); + m_bottom.SetColour(colour); +} + +// Set width of all borders +void wxTextBoxAttrBorders::SetWidth(const wxTextAttrDimension& width) +{ + m_left.SetWidth(width); + m_right.SetWidth(width); + m_top.SetWidth(width); + m_bottom.SetWidth(width); +} + +// Partial equality test +bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim) const +{ + if (dim.IsPresent() && IsPresent() && !((*this) == dim)) + return false; + else + return true; +} + +bool wxTextAttrDimension::Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith) +{ + if (dim.IsPresent()) + { + if (!(compareWith && dim == (*compareWith))) + (*this) = dim; + } + + return true; +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextAttrDimension::CollectCommonAttributes(const wxTextAttrDimension& attr, wxTextAttrDimension& clashingAttr, wxTextAttrDimension& absentAttr) +{ + if (attr.IsPresent()) + { + if (!clashingAttr.IsPresent() && !absentAttr.IsPresent()) + { + if (IsPresent()) + { + if (!((*this) == attr)) + { + clashingAttr.SetPresent(true); + SetPresent(false); + } + } + else + (*this) = attr; + } + } + else + absentAttr.SetPresent(true); +} + +// Partial equality test +bool wxTextBoxAttrDimensions::EqPartial(const wxTextBoxAttrDimensions& dims) const +{ + if (!m_left.EqPartial(dims.m_left)) + return false; + + if (!m_right.EqPartial(dims.m_right)) + return false; + + if (!m_top.EqPartial(dims.m_top)) + return false; + + if (!m_bottom.EqPartial(dims.m_bottom)) + return false; + + return true; +} + +// Apply border to 'this', but not if the same as compareWith +bool wxTextBoxAttrDimensions::Apply(const wxTextBoxAttrDimensions& dims, const wxTextBoxAttrDimensions* compareWith) +{ + m_left.Apply(dims.m_left, compareWith ? (& compareWith->m_left) : (const wxTextAttrDimension*) NULL); + m_right.Apply(dims.m_right, compareWith ? (& compareWith->m_right): (const wxTextAttrDimension*) NULL); + m_top.Apply(dims.m_top, compareWith ? (& compareWith->m_top): (const wxTextAttrDimension*) NULL); + m_bottom.Apply(dims.m_bottom, compareWith ? (& compareWith->m_bottom): (const wxTextAttrDimension*) NULL); + + return true; +} + +// Remove specified attributes from this object +bool wxTextBoxAttrDimensions::RemoveStyle(const wxTextBoxAttrDimensions& attr) +{ + if (attr.m_left.IsPresent()) + m_left.Reset(); + if (attr.m_right.IsPresent()) + m_right.Reset(); + if (attr.m_top.IsPresent()) + m_top.Reset(); + if (attr.m_bottom.IsPresent()) + m_bottom.Reset(); + + return true; +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextBoxAttrDimensions::CollectCommonAttributes(const wxTextBoxAttrDimensions& attr, wxTextBoxAttrDimensions& clashingAttr, wxTextBoxAttrDimensions& absentAttr) +{ + m_left.CollectCommonAttributes(attr.m_left, clashingAttr.m_left, absentAttr.m_left); + m_right.CollectCommonAttributes(attr.m_right, clashingAttr.m_right, absentAttr.m_right); + m_top.CollectCommonAttributes(attr.m_top, clashingAttr.m_top, absentAttr.m_top); + m_bottom.CollectCommonAttributes(attr.m_bottom, clashingAttr.m_bottom, absentAttr.m_bottom); +} + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr) +{ + absentAttr.SetFlags(absentAttr.GetFlags() | (~attr.GetFlags() & wxTEXT_ATTR_ALL)); + absentAttr.SetTextEffectFlags(absentAttr.GetTextEffectFlags() | (~attr.GetTextEffectFlags() & 0xFFFF)); + + long forbiddenFlags = clashingAttr.GetFlags()|absentAttr.GetFlags(); + + if (attr.HasFont()) + { + if (attr.HasFontSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_SIZE)) + { + if (currentStyle.HasFontSize()) + { + if (currentStyle.GetFontSize() != attr.GetFontSize()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE); + } + } + else + currentStyle.SetFontSize(attr.GetFontSize()); + } + + if (attr.HasFontItalic() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_ITALIC)) + { + if (currentStyle.HasFontItalic()) + { + if (currentStyle.GetFontStyle() != attr.GetFontStyle()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_ITALIC); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_ITALIC); + } + } + else + currentStyle.SetFontStyle(attr.GetFontStyle()); + } + + if (attr.HasFontFamily() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_FAMILY)) + { + if (currentStyle.HasFontFamily()) + { + if (currentStyle.GetFontFamily() != attr.GetFontFamily()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_FAMILY); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_FAMILY); + } + } + else + currentStyle.SetFontFamily(attr.GetFontFamily()); + } + + if (attr.HasFontWeight() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_WEIGHT)) + { + if (currentStyle.HasFontWeight()) + { + if (currentStyle.GetFontWeight() != attr.GetFontWeight()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_WEIGHT); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_WEIGHT); + } + } + else + currentStyle.SetFontWeight(attr.GetFontWeight()); + } + + if (attr.HasFontFaceName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_FACE)) + { + if (currentStyle.HasFontFaceName()) + { + wxString faceName1(currentStyle.GetFontFaceName()); + wxString faceName2(attr.GetFontFaceName()); + + if (faceName1 != faceName2) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_FACE); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_FACE); + } + } + else + currentStyle.SetFontFaceName(attr.GetFontFaceName()); + } + + if (attr.HasFontUnderlined() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_UNDERLINE)) + { + if (currentStyle.HasFontUnderlined()) + { + if (currentStyle.GetFontUnderlined() != attr.GetFontUnderlined()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_FONT_UNDERLINE); + currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_UNDERLINE); + } + } + else + currentStyle.SetFontUnderlined(attr.GetFontUnderlined()); + } + } + + if (attr.HasTextColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TEXT_COLOUR)) + { + if (currentStyle.HasTextColour()) + { + if (currentStyle.GetTextColour() != attr.GetTextColour()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_TEXT_COLOUR); + currentStyle.RemoveFlag(wxTEXT_ATTR_TEXT_COLOUR); + } + } + else + currentStyle.SetTextColour(attr.GetTextColour()); + } + + if (attr.HasBackgroundColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BACKGROUND_COLOUR)) + { + if (currentStyle.HasBackgroundColour()) + { + if (currentStyle.GetBackgroundColour() != attr.GetBackgroundColour()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_BACKGROUND_COLOUR); + currentStyle.RemoveFlag(wxTEXT_ATTR_BACKGROUND_COLOUR); + } + } + else + currentStyle.SetBackgroundColour(attr.GetBackgroundColour()); + } + + if (attr.HasAlignment() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_ALIGNMENT)) + { + if (currentStyle.HasAlignment()) + { + if (currentStyle.GetAlignment() != attr.GetAlignment()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_ALIGNMENT); + currentStyle.RemoveFlag(wxTEXT_ATTR_ALIGNMENT); + } + } + else + currentStyle.SetAlignment(attr.GetAlignment()); + } + + if (attr.HasTabs() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TABS)) + { + if (currentStyle.HasTabs()) + { + if (!wxRichTextTabsEq(currentStyle.GetTabs(), attr.GetTabs())) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_TABS); + currentStyle.RemoveFlag(wxTEXT_ATTR_TABS); + } + } + else + currentStyle.SetTabs(attr.GetTabs()); + } + + if (attr.HasLeftIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LEFT_INDENT)) + { + if (currentStyle.HasLeftIndent()) + { + if (currentStyle.GetLeftIndent() != attr.GetLeftIndent() || currentStyle.GetLeftSubIndent() != attr.GetLeftSubIndent()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_LEFT_INDENT); + currentStyle.RemoveFlag(wxTEXT_ATTR_LEFT_INDENT); + } + } + else + currentStyle.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); + } + + if (attr.HasRightIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_RIGHT_INDENT)) + { + if (currentStyle.HasRightIndent()) + { + if (currentStyle.GetRightIndent() != attr.GetRightIndent()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_RIGHT_INDENT); + currentStyle.RemoveFlag(wxTEXT_ATTR_RIGHT_INDENT); + } + } + else + currentStyle.SetRightIndent(attr.GetRightIndent()); + } + + if (attr.HasParagraphSpacingAfter() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_AFTER)) + { + if (currentStyle.HasParagraphSpacingAfter()) + { + if (currentStyle.GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_PARA_SPACING_AFTER); + currentStyle.RemoveFlag(wxTEXT_ATTR_PARA_SPACING_AFTER); + } + } + else + currentStyle.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); + } + + if (attr.HasParagraphSpacingBefore() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_BEFORE)) + { + if (currentStyle.HasParagraphSpacingBefore()) + { + if (currentStyle.GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE); + currentStyle.RemoveFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE); + } + } + else + currentStyle.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); + } + + if (attr.HasLineSpacing() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LINE_SPACING)) + { + if (currentStyle.HasLineSpacing()) + { + if (currentStyle.GetLineSpacing() != attr.GetLineSpacing()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_LINE_SPACING); + currentStyle.RemoveFlag(wxTEXT_ATTR_LINE_SPACING); + } + } + else + currentStyle.SetLineSpacing(attr.GetLineSpacing()); + } + + if (attr.HasCharacterStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) + { + if (currentStyle.HasCharacterStyleName()) + { + if (currentStyle.GetCharacterStyleName() != attr.GetCharacterStyleName()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME); + currentStyle.RemoveFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME); + } + } + else + currentStyle.SetCharacterStyleName(attr.GetCharacterStyleName()); + } + + if (attr.HasParagraphStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME)) + { + if (currentStyle.HasParagraphStyleName()) + { + if (currentStyle.GetParagraphStyleName() != attr.GetParagraphStyleName()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME); + currentStyle.RemoveFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME); + } + } + else + currentStyle.SetParagraphStyleName(attr.GetParagraphStyleName()); + } + + if (attr.HasListStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LIST_STYLE_NAME)) + { + if (currentStyle.HasListStyleName()) + { + if (currentStyle.GetListStyleName() != attr.GetListStyleName()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_LIST_STYLE_NAME); + currentStyle.RemoveFlag(wxTEXT_ATTR_LIST_STYLE_NAME); + } + } + else + currentStyle.SetListStyleName(attr.GetListStyleName()); + } + + if (attr.HasBulletStyle() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_STYLE)) + { + if (currentStyle.HasBulletStyle()) + { + if (currentStyle.GetBulletStyle() != attr.GetBulletStyle()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_STYLE); + currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_STYLE); + } + } + else + currentStyle.SetBulletStyle(attr.GetBulletStyle()); + } + + if (attr.HasBulletNumber() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NUMBER)) + { + if (currentStyle.HasBulletNumber()) + { + if (currentStyle.GetBulletNumber() != attr.GetBulletNumber()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_NUMBER); + currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_NUMBER); + } + } + else + currentStyle.SetBulletNumber(attr.GetBulletNumber()); + } + + if (attr.HasBulletText() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_TEXT)) + { + if (currentStyle.HasBulletText()) + { + if (currentStyle.GetBulletText() != attr.GetBulletText()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_TEXT); + currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_TEXT); + } + } + else + { + currentStyle.SetBulletText(attr.GetBulletText()); + currentStyle.SetBulletFont(attr.GetBulletFont()); + } + } + + if (attr.HasBulletName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NAME)) + { + if (currentStyle.HasBulletName()) + { + if (currentStyle.GetBulletName() != attr.GetBulletName()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_NAME); + currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_NAME); + } + } + else + { + currentStyle.SetBulletName(attr.GetBulletName()); + } + } + + if (attr.HasURL() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_URL)) + { + if (currentStyle.HasURL()) + { + if (currentStyle.GetURL() != attr.GetURL()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_URL); + currentStyle.RemoveFlag(wxTEXT_ATTR_URL); + } + } + else + { + currentStyle.SetURL(attr.GetURL()); + } + } + + if (attr.HasTextEffects() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_EFFECTS)) + { + if (currentStyle.HasTextEffects()) + { + // We need to find the bits in the new attr that are different: + // just look at those bits that are specified by the new attr. + + // We need to remove the bits and flags that are not common between current attr + // and new attr. In so doing we need to take account of the styles absent from one or more of the + // previous styles. + + int currentRelevantTextEffects = currentStyle.GetTextEffects() & attr.GetTextEffectFlags(); + int newRelevantTextEffects = attr.GetTextEffects() & attr.GetTextEffectFlags(); + + if (currentRelevantTextEffects != newRelevantTextEffects) + { + // Find the text effects that were different, using XOR + int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects; + + // Clash of attr - mark as such + clashingAttr.SetTextEffectFlags(clashingAttr.GetTextEffectFlags() | differentEffects); + currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects); + } + } + else + { + currentStyle.SetTextEffects(attr.GetTextEffects()); + currentStyle.SetTextEffectFlags(attr.GetTextEffectFlags()); + } + + // Mask out the flags and values that cannot be common because they were absent in one or more objecrs + // that we've looked at so far + currentStyle.SetTextEffects(currentStyle.GetTextEffects() & ~absentAttr.GetTextEffectFlags()); + currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~absentAttr.GetTextEffectFlags()); + + if (currentStyle.GetTextEffectFlags() == 0) + currentStyle.RemoveFlag(wxTEXT_ATTR_EFFECTS); + } + + if (attr.HasOutlineLevel() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_OUTLINE_LEVEL)) + { + if (currentStyle.HasOutlineLevel()) + { + if (currentStyle.GetOutlineLevel() != attr.GetOutlineLevel()) + { + // Clash of attr - mark as such + clashingAttr.AddFlag(wxTEXT_ATTR_OUTLINE_LEVEL); + currentStyle.RemoveFlag(wxTEXT_ATTR_OUTLINE_LEVEL); + } + } + else + currentStyle.SetOutlineLevel(attr.GetOutlineLevel()); + } +} + + #endif // wxUSE_RICHTEXT