X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfa3b25626fbcb8794d4c009d86dea6e864440a8..7825e3217173eac7366a2b9bffc39f8d22603536:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 0921ba0ff1..0473d2f20e 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -28,21 +28,404 @@ #include "wx/module.h" #endif +#include "wx/settings.h" #include "wx/filename.h" #include "wx/clipbrd.h" #include "wx/wfstream.h" #include "wx/mstream.h" #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" +#include "wx/arrimpl.cpp" WX_DEFINE_LIST(wxRichTextObjectList) WX_DEFINE_LIST(wxRichTextLineList) +// Switch off if the platform doesn't like it for some reason +#define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1 + +// Use GetPartialTextExtents for platforms that support it natively +#define wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS 1 + +const wxChar wxRichTextLineBreakChar = (wxChar) 29; + +// 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()) + { + 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()) + { + if (font1.GetPointSize() == font.GetPointSize() && + font1.GetFamily() == font.GetFamily() && + 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); +} + +inline void wxCheckSetPen(wxDC& dc, const wxPen& pen) +{ + const wxPen& pen1 = dc.GetPen(); + if (pen1.IsOk() && pen.IsOk()) + { + if (pen1.GetWidth() == pen.GetWidth() && + pen1.GetStyle() == pen.GetStyle() && + pen1.GetColour() == pen.GetColour()) + return; + } + dc.SetPen(pen); +} + +inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush) +{ + const wxBrush& brush1 = dc.GetBrush(); + if (brush1.IsOk() && brush.IsOk()) + { + if (brush1.GetStyle() == brush.GetStyle() && + brush1.GetColour() == brush.GetColour()) + return; + } + dc.SetBrush(brush); +} + /*! * wxRichTextObject * This is the base for drawable objects. @@ -81,13 +464,8 @@ void wxRichTextObject::Copy(const wxRichTextObject& obj) m_dirty = obj.m_dirty; m_range = obj.m_range; m_attributes = obj.m_attributes; + m_properties = obj.m_properties; m_descent = obj.m_descent; -/* - if (!m_attributes.GetFont().Ok()) - wxLogDebug(wxT("No font!")); - if (!obj.m_attributes.GetFont().Ok()) - wxLogDebug(wxT("Parent has no font!")); -*/ } void wxRichTextObject::SetMargins(int margin) @@ -103,18 +481,300 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin m_bottomMargin = bottomMargin; } -// Convert units in tends of a millimetre to device units -int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) +// Convert units in tenths of a millimetre to device units +int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) const { - int ppi = dc.GetPPI().x; + // Unscale + double scale = 1.0; + if (GetBuffer()) + scale = GetBuffer()->GetScale(); + int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units, scale); + return p; +} + +// Convert units in tenths of a millimetre to device units +int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units, double scale) +{ // There are ppi pixels in 254.1 "1/10 mm" double pixels = ((double) units * (double)ppi) / 254.1; + if (scale != 1.0) + pixels /= scale; return (int) pixels; } +// Convert units in pixels to tenths of a millimetre +int wxRichTextObject::ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const +{ + int p = pixels; + double scale = 1.0; + if (GetBuffer()) + scale = GetBuffer()->GetScale(); + + return ConvertPixelsToTenthsMM(dc.GetPPI().x, p, scale); +} + +int wxRichTextObject::ConvertPixelsToTenthsMM(int ppi, int pixels, double scale) +{ + // There are ppi pixels in 254.1 "1/10 mm" + + double p = double(pixels); + + if (scale != 1.0) + p *= scale; + + int units = int( p * 254.1 / (double) ppi ); + return units; +} + +// Draw the borders and background for the given rectangle and attributes. +// Width and height are taken to be the content size, so excluding any +// border, margin and padding. +bool wxRichTextObject::DrawBoxAttributes(wxDC& dc, const wxRichTextAttr& attr, const wxRect& boxRect) +{ + // Assume boxRect is the area around the content + wxRect contentRect = boxRect; + wxRect marginRect, borderRect, paddingRect, outlineRect; + + GetBoxRects(dc, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect); + + // Margin is transparent. Draw background from margin. + if (attr.HasBackgroundColour()) + { + wxPen pen(attr.GetBackgroundColour()); + wxBrush brush(attr.GetBackgroundColour()); + + dc.SetPen(pen); + dc.SetBrush(brush); + dc.DrawRectangle(marginRect); + } + + if (attr.GetTextBoxAttr().GetBorder().HasBorder()) + DrawBorder(dc, attr.GetTextBoxAttr().GetBorder(), borderRect); + + if (attr.GetTextBoxAttr().GetOutline().HasBorder()) + DrawBorder(dc, attr.GetTextBoxAttr().GetOutline(), outlineRect); + + return true; +} + +// Draw a border +bool wxRichTextObject::DrawBorder(wxDC& dc, const wxTextAttrBorders& attr, const wxRect& rect) +{ + int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0; + wxTextAttrDimensionConverter converter(dc); + + if (attr.GetLeft().IsValid()) + { + borderLeft = converter.GetPixels(attr.GetLeft().GetWidth()); + wxColour col(attr.GetLeft().GetColour()); + + // If pen width is > 1, resorts to a solid rectangle. + if (borderLeft == 1) + { + int penStyle = wxSOLID; + if (attr.GetLeft().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED) + penStyle = wxDOT; + else if (attr.GetLeft().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED) + penStyle = wxLONG_DASH; + wxPen pen(col); + dc.SetPen(pen); + dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height); + + } + else if (borderLeft > 1) + { + wxPen pen(col); + wxBrush brush(col); + dc.SetPen(pen); + dc.SetBrush(brush); + dc.DrawRectangle(rect.x, rect.y, borderLeft, rect.height); + } + } + + if (attr.GetRight().IsValid()) + { + borderRight = converter.GetPixels(attr.GetRight().GetWidth()); + + wxColour col(attr.GetRight().GetColour()); + + // If pen width is > 1, resorts to a solid rectangle. + if (borderRight == 1) + { + int penStyle = wxSOLID; + if (attr.GetRight().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED) + penStyle = wxDOT; + else if (attr.GetRight().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED) + penStyle = wxLONG_DASH; + wxPen pen(col); + dc.SetPen(pen); + dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height); + + } + else if (borderRight > 1) + { + wxPen pen(col); + wxBrush brush(col); + dc.SetPen(pen); + dc.SetBrush(brush); + dc.DrawRectangle(rect.x - borderRight, rect.y, borderRight, rect.height); + } + } + + if (attr.GetTop().IsValid()) + { + borderTop = converter.GetPixels(attr.GetTop().GetWidth()); + + wxColour col(attr.GetTop().GetColour()); + + // If pen width is > 1, resorts to a solid rectangle. + if (borderTop == 1) + { + int penStyle = wxSOLID; + if (attr.GetTop().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED) + penStyle = wxDOT; + else if (attr.GetTop().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED) + penStyle = wxLONG_DASH; + wxPen pen(col); + dc.SetPen(pen); + dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y); + + } + else if (borderTop > 1) + { + wxPen pen(col); + wxBrush brush(col); + dc.SetPen(pen); + dc.SetBrush(brush); + dc.DrawRectangle(rect.x, rect.y, rect.width, borderTop); + } + } + + if (attr.GetBottom().IsValid()) + { + borderBottom = converter.GetPixels(attr.GetBottom().GetWidth()); + wxColour col(attr.GetTop().GetColour()); + + // If pen width is > 1, resorts to a solid rectangle. + if (borderBottom == 1) + { + int penStyle = wxSOLID; + if (attr.GetBottom().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED) + penStyle = wxDOT; + else if (attr.GetBottom().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED) + penStyle = wxLONG_DASH; + wxPen pen(col); + dc.SetPen(pen); + dc.DrawLine(rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height); + + } + else if (borderBottom > 1) + { + wxPen pen(col); + wxBrush brush(col); + dc.SetPen(pen); + dc.SetBrush(brush); + dc.DrawRectangle(rect.x, rect.y - rect.height - borderBottom, rect.width, borderBottom); + } + } + + return true; +} + +// Get the various rectangles of the box model in pixels. You can either specify contentRect (inner) +// or marginRect (outer), and the other must be the default rectangle (no width or height). +// Note that the outline doesn't affect the position of the rectangle, it's drawn in whatever space +// is available. +// +// | Margin | Border | Padding | CONTENT | Padding | Border | Margin | + +bool wxRichTextObject::GetBoxRects(wxDC& dc, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect) +{ + int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0; + int outlineLeft = 0, outlineRight = 0, outlineTop = 0, outlineBottom = 0; + int paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0; + int marginLeft = 0, marginRight = 0, marginTop = 0, marginBottom = 0; + + wxTextAttrDimensionConverter converter(dc); + + if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent()) + marginLeft = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetLeft()); + if (attr.GetTextBoxAttr().GetMargins().GetRight().IsPresent()) + marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight()); + if (attr.GetTextBoxAttr().GetMargins().GetTop().IsPresent()) + marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop()); + if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent()) + marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom()); + + if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent()) + borderLeft = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth()); + if (attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth().IsPresent()) + borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth()); + if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsPresent()) + borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth()); + if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent()) + borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth()); + + if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent()) + paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft()); + if (attr.GetTextBoxAttr().GetPadding().GetRight().IsPresent()) + paddingRight = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetRight()); + if (attr.GetTextBoxAttr().GetPadding().GetTop().IsPresent()) + paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop()); + if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent()) + paddingBottom = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetBottom()); + + if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent()) + outlineLeft = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth()); + if (attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth().IsPresent()) + outlineRight = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth()); + if (attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth().IsPresent()) + outlineTop = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth()); + if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent()) + outlineBottom = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetBottom().GetWidth()); + + int leftTotal = marginLeft + borderLeft + paddingLeft; + int rightTotal = marginRight + borderRight + paddingRight; + int topTotal = marginTop + borderTop + paddingTop; + int bottomTotal = marginBottom + borderBottom + paddingBottom; + + if (marginRect != wxRect()) + { + contentRect.x = marginRect.x + leftTotal; + contentRect.y = marginRect.y + topTotal; + contentRect.width = marginRect.width - (leftTotal + rightTotal); + contentRect.height = marginRect.height - (topTotal + bottomTotal); + } + else + { + marginRect.x = contentRect.x - leftTotal; + marginRect.y = contentRect.y - topTotal; + marginRect.width = contentRect.width + (leftTotal + rightTotal); + marginRect.height = contentRect.height + (topTotal + bottomTotal); + } + + borderRect.x = marginRect.x + marginLeft; + borderRect.y = marginRect.y + marginTop; + borderRect.width = marginRect.width - (marginLeft + marginRight); + borderRect.height = marginRect.height - (marginTop + marginBottom); + + paddingRect.x = marginRect.x + marginLeft + borderLeft; + paddingRect.y = marginRect.y + marginTop + borderTop; + paddingRect.width = marginRect.width - (marginLeft + marginRight + borderLeft + borderRight); + paddingRect.height = marginRect.height - (marginTop + marginBottom + borderTop + borderBottom); + + // The outline is outside the margin and doesn't influence the overall box position or content size. + outlineRect.x = marginRect.x - outlineLeft; + outlineRect.y = marginRect.y - outlineTop; + outlineRect.width = marginRect.width + (outlineLeft + outlineRight); + outlineRect.height = marginRect.height + (outlineTop + outlineBottom); + + return true; +} + + /// Dump to output stream for debugging void wxRichTextObject::Dump(wxTextOutputStream& stream) { @@ -123,6 +783,14 @@ void wxRichTextObject::Dump(wxTextOutputStream& stream) stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n"); } +/// Gets the containing buffer +wxRichTextBuffer* wxRichTextObject::GetBuffer() const +{ + const wxRichTextObject* obj = this; + while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer))) + obj = obj->GetParent(); + return wxDynamicCast(obj, wxRichTextBuffer); +} /*! * wxRichTextCompositeObject @@ -247,7 +915,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 @@ -359,26 +1028,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(); @@ -387,98 +1061,65 @@ bool wxRichTextCompositeObject::Defragment() node = node->GetNext(); } - return true; -} - -/// Dump to output stream for debugging -void wxRichTextCompositeObject::Dump(wxTextOutputStream& stream) -{ - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) + // Delete any remaining empty objects, but leave at least one empty object per composite object. + if (GetChildCount() > 1) { - wxRichTextObject* child = node->GetData(); - child->Dump(stream); - node = node->GetNext(); + node = m_children.GetFirst(); + while (node) + { + wxRichTextObjectList::compatibility_iterator next = node->GetNext(); + wxRichTextObject* child = node->GetData(); + if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range)) + { + if (child->IsEmpty()) + { + child->Dereference(); + m_children.Erase(node); + } + node = next; + } + else + node = node->GetNext(); + } } -} - - -/*! - * wxRichTextBox - * This defines a 2D space to lay out objects - */ - -IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject) - -wxRichTextBox::wxRichTextBox(wxRichTextObject* parent): - wxRichTextCompositeObject(parent) -{ -} - -/// Draw the item -bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style) -{ - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxRichTextObject* child = node->GetData(); - - wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize()); - child->Draw(dc, range, selectionRange, childRect, descent, style); - node = node->GetNext(); - } return true; } -/// Lay the item out -bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style) +/// Dump to output stream for debugging +void wxRichTextCompositeObject::Dump(wxTextOutputStream& stream) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { wxRichTextObject* child = node->GetData(); - child->Layout(dc, rect, style); - + child->Dump(stream); node = node->GetNext(); } - m_dirty = false; - return true; -} - -/// 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 -{ - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - if (node) - { - wxRichTextObject* child = node->GetData(); - return child->GetRangeSize(range, size, descent, dc, flags, position); - } - else - return false; } -/// Copy -void wxRichTextBox::Copy(const wxRichTextBox& obj) -{ - wxRichTextCompositeObject::Copy(obj); -} - - /*! * wxRichTextParagraphLayoutBox * This box knows how to lay out paragraphs. */ -IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextBox) +IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject) wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent): - wxRichTextBox(parent) + wxRichTextCompositeObject(parent) { Init(); } +wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox() +{ + if (m_floatCollector) + { + delete m_floatCollector; + m_floatCollector = NULL; + } +} + /// Initialize the object. void wxRichTextParagraphLayoutBox::Init() { @@ -493,11 +1134,82 @@ void wxRichTextParagraphLayoutBox::Init() m_topMargin = 4; m_bottomMargin = 4; m_partialParagraph = false; + m_floatCollector = NULL; +} + +void wxRichTextParagraphLayoutBox::Clear() +{ + DeleteChildren(); + + if (m_floatCollector) + delete m_floatCollector; + m_floatCollector = NULL; + m_partialParagraph = false; +} + +/// Copy +void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj) +{ + Clear(); + + wxRichTextCompositeObject::Copy(obj); + + m_partialParagraph = obj.m_partialParagraph; + m_defaultAttributes = obj.m_defaultAttributes; +} + +// 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, wxRichTextObject* 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) { @@ -508,12 +1220,17 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, { wxRect childRect(child->GetPosition(), child->GetCachedSize()); - if (childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop()) + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom()) + { + // Stop drawing + break; + } + else if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetBottom() < rect.GetTop()) { // Skip } else - child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style); + child->Draw(dc, range, selectionRange, rect, descent, style); } node = node->GetNext(); @@ -528,7 +1245,10 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT; // If only laying out a specific area, the passed rect has a different meaning: - // the visible part of the buffer. + // the visible part of the buffer. This is used in wxRichTextCtrl::OnSize, + // so that during a size, only the visible part will be relaid out, or + // it would take too long causing flicker. As an approximation, we assume that + // everything up to the start of the visible area is laid out correctly. if (formatRect) { availableSpace = wxRect(0 + m_leftMargin, @@ -568,7 +1288,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl if (invalidRange == wxRICHTEXT_ALL) layoutAll = true; else // If we know what range is affected, start laying out from that point on. - if (invalidRange.GetStart() > GetRange().GetStart()) + if (invalidRange.GetStart() >= GetRange().GetStart()) { wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart()); if (firstParagraph) @@ -577,10 +1297,13 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl wxRichTextObjectList::compatibility_iterator previousNode; if ( firstNode ) previousNode = firstNode->GetPrevious(); - if (firstNode && previousNode) + if (firstNode) { - wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph); - availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y; + if (previousNode) + { + wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph); + availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y; + } // Now we're going to start iterating from the first affected paragraph. node = firstNode; @@ -590,6 +1313,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; @@ -598,7 +1323,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 && @@ -657,16 +1382,8 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl return true; } -/// Copy -void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj) -{ - wxRichTextBox::Copy(obj); - - m_partialParagraph = obj.m_partialParagraph; -} - /// Get/set the size for the given range. -bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, 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; @@ -774,25 +1491,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); + + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); - wxRichTextRange range = line->GetAbsoluteRange(); + wxRichTextRange range = line->GetAbsoluteRange(); - if (range.Contains(pos) || + if (range.Contains(pos) || - // 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 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(); + node2 = node2->GetNext(); + } } node = node->GetNext(); @@ -876,23 +1597,30 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP /// Convenience function to add a paragraph of text -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxRichTextAttr* paraStyle) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); -#else - wxTextAttrEx style(GetAttributes()); + // be combined at display time. + // Divide into paragraph and character styles. - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); -#endif - wxRichTextParagraph* para = new wxRichTextParagraph(text, this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + 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); + + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; + + wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle); AppendChild(para); @@ -903,26 +1631,28 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, } /// Adds multiple paragraphs, based on newlines. -wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxRichTextAttr* paraStyle) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); -#else - wxTextAttrEx style(GetAttributes()); + // be combined at display time. + // Divide into paragraph and character styles. - //wxLogDebug("Initial style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Initial size = %d", style.GetFont().GetPointSize()); + wxRichTextAttr defaultCharStyle; + wxRichTextAttr defaultParaStyle; - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); + // If the default style is a named paragraph style, don't apply any character formatting + // to the initial text string. + if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName()); + if (def) + defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet()); + } + else + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); - //wxLogDebug("Style after applying default style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Size after applying default style = %d", style.GetFont().GetPointSize()); -#endif + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; wxRichTextParagraph* firstPara = NULL; wxRichTextParagraph* lastPara = NULL; @@ -932,9 +1662,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text size_t i = 0; size_t len = text.length(); wxString line; - wxRichTextParagraph* para = new wxRichTextParagraph(wxT(""), this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); AppendChild(para); @@ -946,20 +1674,18 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text wxChar ch = text[i]; if (ch == wxT('\n') || ch == wxT('\r')) { - wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); - plainText->SetText(line); - - para = new wxRichTextParagraph(wxT(""), this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + if (i != (len-1)) + { + wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); + plainText->SetText(line); - AppendChild(para); + para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); - //if (!firstPara) - // firstPara = para; + AppendChild(para); - lastPara = para; - line = wxEmptyString; + lastPara = para; + line = wxEmptyString; + } } else line += ch; @@ -973,18 +1699,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text plainText->SetText(line); } -/* - if (firstPara) - range.SetStart(firstPara->GetRange().GetStart()); - else if (lastPara) - range.SetStart(lastPara->GetRange().GetStart()); - - if (lastPara) - range.SetEnd(lastPara->GetRange().GetEnd()); - else if (firstPara) - range.SetEnd(firstPara->GetRange().GetEnd()); -*/ - UpdateRanges(); SetDirty(false); @@ -993,27 +1707,32 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text } /// Convenience function to add an image -wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle) +wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxRichTextAttr* paraStyle) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); -#else - wxTextAttrEx style(GetAttributes()); + // be combined at display time. + // Divide into paragraph and character styles. - // Apply default style. If the style has no attributes set, - // then the attributes will remain the 'basic style' (i.e. the - // layout box's style). - wxRichTextApplyStyle(style, GetDefaultStyle()); -#endif + wxRichTextAttr defaultCharStyle; + wxRichTextAttr defaultParaStyle; - wxRichTextParagraph* para = new wxRichTextParagraph(this, & style); - AppendChild(para); - para->AppendChild(new wxRichTextImage(image, this)); + // 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); - if (paraStyle) - para->SetAttributes(*paraStyle); + wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle; + wxRichTextAttr* cStyle = & defaultCharStyle; + + wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle); + AppendChild(para); + para->AppendChild(new wxRichTextImage(image, this, cStyle)); UpdateRanges(); SetDirty(true); @@ -1025,8 +1744,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT /// Insert fragment into this box at the given position. If partialParagraph is true, /// it is assumed that the last (or only) paragraph is just a piece of data with no paragraph /// marker. -/// TODO: if fragment is inserted inside styled fragment, must apply that style to -/// to the data (if it has a default style, anyway). bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment) { @@ -1036,6 +1753,8 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextParagraph* para = GetParagraphAtPosition(position); if (para) { + wxRichTextAttr originalAttr = para->GetAttributes(); + wxRichTextObjectList::compatibility_iterator node = m_children.Find(para); // Now split at this position, returning the object to insert the new @@ -1103,7 +1822,19 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph); wxASSERT(firstPara != NULL); + if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE)) + para->SetAttributes(firstPara->GetAttributes()); + + // Save empty paragraph attributes for appending later + // These are character attributes deliberately set for a new paragraph. Without this, + // we couldn't pass default attributes when appending a new paragraph. + wxRichTextAttr emptyParagraphAttributes; + wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst(); + + if (objectNode && firstPara->GetChildren().GetCount() == 1 && objectNode->GetData()->IsEmpty()) + emptyParagraphAttributes = objectNode->GetData()->GetAttributes(); + while (objectNode) { wxRichTextObject* newObj = objectNode->GetData()->Clone(); @@ -1123,53 +1854,57 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext(); wxRichTextParagraph* finalPara = para; + bool needExtraPara = (!i || !fragment.GetPartialParagraph()); + // If there was only one paragraph, we need to insert a new one. - if (!i) + while (i) { - finalPara = new wxRichTextParagraph; + wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph); + wxASSERT( para != NULL ); - // TODO: These attributes should come from the subsequent paragraph - // when originally deleted, since the subsequent para takes on - // the previous para's attributes. - finalPara->SetAttributes(firstPara->GetAttributes()); + finalPara = (wxRichTextParagraph*) para->Clone(); if (nextParagraph) InsertChild(finalPara, nextParagraph); else AppendChild(finalPara); + + i = i->GetNext(); } - else while (i) - { - wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph); - wxASSERT( para != NULL ); - finalPara = (wxRichTextParagraph*) para->Clone(); + // If there was only one paragraph, or we have full paragraphs in our fragment, + // we need to insert a new one. + if (needExtraPara) + { + finalPara = new wxRichTextParagraph; if (nextParagraph) InsertChild(finalPara, nextParagraph); else AppendChild(finalPara); - - i = i->GetNext(); } // 4. Add back the remaining content. if (finalPara) { - finalPara->MoveFromList(savedObjects); + if (nextObject) + finalPara->MoveFromList(savedObjects); // Ensure there's at least one object if (finalPara->GetChildCount() == 0) { wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); -#if !wxRICHTEXT_USE_DYNAMIC_STYLES - text->SetAttributes(finalPara->GetAttributes()); -#endif + text->SetAttributes(emptyParagraphAttributes); finalPara->AppendChild(text); } } + if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara) + finalPara->SetAttributes(firstPara->GetAttributes()); + else if (finalPara && finalPara != para) + finalPara->SetAttributes(originalAttr); + return true; } } @@ -1283,7 +2018,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 @@ -1353,6 +2088,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) { wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + wxRichTextParagraph* firstPara = NULL; while (node) { wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph); @@ -1367,58 +2103,82 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) // Deletes the content of this object within the given 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. - if (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd()) + if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd()) { // Delete the whole object RemoveChild(obj, true); + obj = NULL; } + else if (!firstPara) + firstPara = obj; + // If the range includes the paragraph end, we need to join this // and the next paragraph. - else if (range.Contains(obj->GetRange().GetEnd())) + if (range.GetEnd() <= thisRange.GetEnd()) { // We need to move the objects from the next paragraph // to this paragraph - if (next) + wxRichTextParagraph* nextParagraph = NULL; + if ((range.GetEnd() < thisRange.GetEnd()) && obj) + nextParagraph = obj; + else { - wxRichTextParagraph* nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph); - next = next->GetNext(); - if (nextParagraph) - { - // Delete the stuff we need to delete - nextParagraph->DeleteRange(range); + // We're ending at the end of the paragraph, so merge the _next_ paragraph. + if (next) + nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph); + } - // Move the objects to the previous para - wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst(); + bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara; - while (node1) - { - wxRichTextObject* obj1 = node1->GetData(); + wxRichTextAttr nextParaAttr; + if (applyFinalParagraphStyle) + { + // Special case when deleting the end of a paragraph - use _this_ paragraph's style, + // not the next one. + if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd()) + nextParaAttr = thisAttr; + else + nextParaAttr = nextParagraph->GetAttributes(); + } - // If the object is empty, optimise it out - if (obj1->IsEmpty()) - { - delete obj1; - } - else - { - obj->AppendChild(obj1); - } + if (firstPara && nextParagraph && firstPara != nextParagraph) + { + // Move the objects to the previous para + wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst(); - wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); - nextParagraph->GetChildren().Erase(node1); + while (node1) + { + wxRichTextObject* obj1 = node1->GetData(); - node1 = next1; - } + firstPara->AppendChild(obj1); - // Delete the paragraph - RemoveChild(nextParagraph, true); + wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); + nextParagraph->GetChildren().Erase(node1); + node1 = next1; } + + // Delete the paragraph + RemoveChild(nextParagraph, true); + } + + // Avoid empty paragraphs + if (firstPara && firstPara->GetChildren().GetCount() == 0) + { + wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); + firstPara->AppendChild(text); } + if (applyFinalParagraphStyle) + firstPara->SetAttributes(nextParaAttr); + + return true; } } @@ -1439,8 +2199,6 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra wxRichTextObject* child = node->GetData(); if (!child->GetRange().IsOutside(range)) { -// if (lineCount > 0) -// text += wxT("\n"); wxRichTextRange childRange = range; childRange.LimitTo(child->GetRange()); @@ -1448,7 +2206,7 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra text += childText; - if (childRange.GetEnd() == child->GetRange().GetEnd()) + if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext()) text += wxT("\n"); lineCount ++; @@ -1570,11 +2328,30 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0); bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0); + bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0); + bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0); + + // Apply paragraph style first, if any + wxRichTextAttr wholeStyle(style); + + if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet()) + { + wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName()); + if (def) + wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(GetStyleSheet())); + } // Limit the attributes to be set to the content to only character attributes. - wxRichTextAttr characterAttributes(style); + wxRichTextAttr characterAttributes(wholeStyle); characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER)); + if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet()) + { + wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName()); + if (def) + wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(GetStyleSheet())); + } + // If we are associated with a control, make undoable; otherwise, apply immediately // to the data. @@ -1618,21 +2395,32 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const else newPara = para; - if (paragraphStyle && !charactersOnly) + // If we're specifying paragraphs only, then we really mean character formatting + // to be included in the paragraph style + if ((paragraphStyle || parasOnly) && !charactersOnly) { - if (applyMinimal) + if (removeStyle) { - // Only apply attributes that will make a difference to the combined - // style as seen on the display - wxRichTextAttr combinedAttr(para->GetCombinedAttributes()); - wxRichTextApplyStyle(newPara->GetAttributes(), style, & combinedAttr); + // Removes the given style from the paragraph + wxRichTextRemoveStyle(newPara->GetAttributes(), style); } + else if (resetExistingStyle) + newPara->GetAttributes() = wholeStyle; else - wxRichTextApplyStyle(newPara->GetAttributes(), style); + { + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxRichTextAttr combinedAttr(para->GetCombinedAttributes()); + wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr); + } + else + wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle); + } } -#if wxRICHTEXT_USE_DYNAMIC_STYLES - // If applying paragraph styles dynamically, don't change the text objects' attributes + // When applying paragraph styles dynamically, don't change the text objects' attributes // since they will computed as needed. Only apply the character styling if it's _only_ // character styling. This policy is subject to change and might be put under user control. @@ -1642,11 +2430,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()) -#else - if (characterStyle && range.GetStart() != newPara->GetRange().GetEnd()) -#endif + if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd()) { wxRichTextRange childRange(range); childRange.LimitTo(newPara->GetRange()); @@ -1669,7 +2453,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 @@ -1694,15 +2478,25 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { wxRichTextObject* child = node2->GetData(); - if (applyMinimal) + if (removeStyle) { - // Only apply attributes that will make a difference to the combined - // style as seen on the display - wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); - wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr); + // Removes the given style from the paragraph + wxRichTextRemoveStyle(child->GetAttributes(), style); } + else if (resetExistingStyle) + child->GetAttributes() = characterAttributes; else - wxRichTextApplyStyle(child->GetAttributes(), characterAttributes); + { + if (applyMinimal) + { + // Only apply attributes that will make a difference to the combined + // style as seen on the display + wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes())); + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr); + } + else + wxRichTextApplyStyle(child->GetAttributes(), characterAttributes); + } if (node2 == lastNode) break; @@ -1723,53 +2517,50 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const return true; } -/// Set text attributes -bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags) +void wxRichTextParagraphLayoutBox::SetImageStyle(wxRichTextImage *image, const wxRichTextAttr& textAttr, int flags) { - wxRichTextAttr richStyle = style; - return SetStyle(range, richStyle, 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(); -/// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) -{ - return DoGetStyle(position, style, true); -} - -/// Get the text attributes for this position. -bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) -{ - wxTextAttrEx textAttrEx(style); - if (GetStyle(position, textAttrEx)) + if (haveControl && withUndo) { - style = textAttrEx; - return true; + 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 - return false; + newPara = para; + + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); } -/// Get the content (uncombined) attributes for this position. -bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style) +/// Get the text attributes for this position. +bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) { - return DoGetStyle(position, style, false); + return DoGetStyle(position, style, true); } bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style) { - wxTextAttrEx textAttrEx(style); - if (GetUncombinedStyle(position, textAttrEx)) - { - style = textAttrEx; - return true; - } - else - return false; + return DoGetStyle(position, style, false); } /// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and /// context attributes. -bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles) +bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles) { wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); @@ -1778,7 +2569,6 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style obj = GetParagraphAtPosition(position); if (obj) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES if (combineStyles) { // Start with the base style @@ -1789,9 +2579,7 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style } else style = obj->GetAttributes(); -#else - style = obj->GetAttributes(); -#endif + return true; } } @@ -1800,7 +2588,6 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style obj = GetLeafObjectAtPosition(position); if (obj) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES if (combineStyles) { wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph); @@ -1808,9 +2595,7 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style } else style = obj->GetAttributes(); -#else - style = obj->GetAttributes(); -#endif + return true; } } @@ -1824,337 +2609,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(wxTextAttrEx& currentStyle, const wxTextAttrEx& style, long& multipleStyleAttributes) +bool wxRichTextParagraphLayoutBox::CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr) { - if (style.HasFont()) - { - if (style.HasSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE)) - { - if (currentStyle.GetFont().Ok() && currentStyle.HasSize()) - { - if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_SIZE); - } - } - else - { - if (!currentStyle.GetFont().Ok()) - wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); - wxFont font(currentStyle.GetFont()); - font.SetPointSize(style.GetFont().GetPointSize()); - - wxSetFontPreservingStyles(currentStyle, font); - currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); - } - } - - if (style.HasItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC)) - { - if (currentStyle.GetFont().Ok() && currentStyle.HasItalic()) - { - if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_ITALIC); - } - } - else - { - if (!currentStyle.GetFont().Ok()) - wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); - wxFont font(currentStyle.GetFont()); - font.SetStyle(style.GetFont().GetStyle()); - wxSetFontPreservingStyles(currentStyle, font); - currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); - } - } - - if (style.HasWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT)) - { - if (currentStyle.GetFont().Ok() && currentStyle.HasWeight()) - { - if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT); - } - } - else - { - if (!currentStyle.GetFont().Ok()) - wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); - wxFont font(currentStyle.GetFont()); - font.SetWeight(style.GetFont().GetWeight()); - wxSetFontPreservingStyles(currentStyle, font); - currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); - } - } - - if (style.HasFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE)) - { - if (currentStyle.GetFont().Ok() && currentStyle.HasFaceName()) - { - wxString faceName1(currentStyle.GetFont().GetFaceName()); - wxString faceName2(style.GetFont().GetFaceName()); - - if (faceName1 != faceName2) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_FACE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_FACE); - } - } - else - { - if (!currentStyle.GetFont().Ok()) - wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); - wxFont font(currentStyle.GetFont()); - font.SetFaceName(style.GetFont().GetFaceName()); - wxSetFontPreservingStyles(currentStyle, font); - currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); - } - } - - if (style.HasUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE)) - { - if (currentStyle.GetFont().Ok() && currentStyle.HasUnderlined()) - { - if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_UNDERLINE); - } - } - else - { - if (!currentStyle.GetFont().Ok()) - wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT); - wxFont font(currentStyle.GetFont()); - font.SetUnderlined(style.GetFont().GetUnderlined()); - wxSetFontPreservingStyles(currentStyle, font); - currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); - } - } - } - - 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.HasParagraphSpacingAfter() != style.HasParagraphSpacingAfter()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_AFTER); - } - } - else - currentStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); - } - - if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE)) - { - if (currentStyle.HasParagraphSpacingBefore()) - { - if (currentStyle.HasParagraphSpacingBefore() != style.HasParagraphSpacingBefore()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_BEFORE); - } - } - else - currentStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); - } - - if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LINE_SPACING)) - { - if (currentStyle.HasLineSpacing()) - { - if (currentStyle.HasLineSpacing() != style.HasLineSpacing()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LINE_SPACING); - } - } - else - currentStyle.SetLineSpacing(style.GetLineSpacing()); - } - - if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME)) - { - if (currentStyle.HasCharacterStyleName()) - { - if (currentStyle.HasCharacterStyleName() != style.HasCharacterStyleName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER_STYLE_NAME); - } - } - else - currentStyle.SetCharacterStyleName(style.GetCharacterStyleName()); - } - - if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME)) - { - if (currentStyle.HasParagraphStyleName()) - { - if (currentStyle.HasParagraphStyleName() != style.HasParagraphStyleName()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARAGRAPH_STYLE_NAME); - } - } - else - currentStyle.SetParagraphStyleName(style.GetParagraphStyleName()); - } - - if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE)) - { - if (currentStyle.HasBulletStyle()) - { - if (currentStyle.HasBulletStyle() != style.HasBulletStyle()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_STYLE); - } - } - else - currentStyle.SetBulletStyle(style.GetBulletStyle()); - } - - if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER)) - { - if (currentStyle.HasBulletNumber()) - { - if (currentStyle.HasBulletNumber() != style.HasBulletNumber()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NUMBER); - } - } - else - currentStyle.SetBulletNumber(style.GetBulletNumber()); - } - - if (style.HasBulletSymbol() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_SYMBOL)) - { - if (currentStyle.HasBulletSymbol()) - { - if (currentStyle.HasBulletSymbol() != style.HasBulletSymbol()) - { - // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_SYMBOL; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_SYMBOL); - } - } - else - { - currentStyle.SetBulletSymbol(style.GetBulletSymbol()); - currentStyle.SetBulletFont(style.GetBulletFont()); - } - } + currentStyle.CollectCommonAttributes(style, clashingAttr, absentAttr); return true; } @@ -2163,12 +2620,12 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons /// that attribute is not present within the flags. /// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself /// nested. -bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttrEx& style) +bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style) { - style = wxTextAttrEx(); + style = wxRichTextAttr(); - // The attributes that aren't valid because of multiple styles within the range - long multipleStyleAttributes = 0; + wxRichTextAttr clashingAttr; + wxRichTextAttr absentAttrPara, absentAttrChar; wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst(); while (node) @@ -2178,9 +2635,9 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range { if (para->GetChildren().GetCount() == 0) { - wxTextAttrEx paraStyle = para->GetCombinedAttributes(); + wxRichTextAttr paraStyle = para->GetCombinedAttributes(); - CollectStyle(style, paraStyle, multipleStyleAttributes); + CollectStyle(style, paraStyle, clashingAttr, absentAttrPara); } else { @@ -2188,9 +2645,9 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range paraRange.LimitTo(range); // First collect paragraph attributes only - wxTextAttrEx paraStyle = para->GetCombinedAttributes(); + wxRichTextAttr paraStyle = para->GetCombinedAttributes(); paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH); - CollectStyle(style, paraStyle, multipleStyleAttributes); + CollectStyle(style, paraStyle, clashingAttr, absentAttrPara); wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst(); @@ -2199,12 +2656,12 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range wxRichTextObject* child = childNode->GetData(); if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart())) { - wxTextAttrEx 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); + CollectStyle(style, childStyle, clashingAttr, absentAttrChar); } childNode = childNode->GetNext(); @@ -2217,21 +2674,9 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range } /// Set default style -bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style) +bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxRichTextAttr& style) { - // I don't think the default style should be combined with the previous - // default style. m_defaultAttributes = style; - -#if 0 - // keep the old attributes if the new style doesn't specify them unless the - // new style is empty - then reset m_defaultStyle (as there is no other way - // to do it) - if ( style.IsDefault() ) - m_defaultAttributes = style; - else - m_defaultAttributes = wxTextAttrEx::CombineEx(style, m_defaultAttributes, NULL); -#endif return true; } @@ -2254,7 +2699,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)) { @@ -2263,15 +2708,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 ++; -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes()); -#else - const wxTextAttrEx& textAttr = child->GetAttributes(); -#endif - if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes()); + + if (wxTextAttrEqPartial(textAttr, style)) matchingCount ++; } @@ -2283,13 +2730,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& node = node->GetNext(); } - return foundCount == matchingCount; -} - -bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const -{ - wxRichTextAttr richStyle = style; - return HasCharacterAttributes(range, richStyle); + return foundCount == matchingCount && foundCount != 0; } /// Test if this whole range has paragraph attributes of the specified kind. If any @@ -2311,45 +2752,41 @@ 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)) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx textAttr = GetAttributes(); + wxRichTextAttr textAttr = GetAttributes(); // Apply the paragraph style wxRichTextApplyStyle(textAttr, para->GetAttributes()); -#else - const wxTextAttrEx& textAttr = para->GetAttributes(); -#endif foundCount ++; - if (wxTextAttrEqPartial(textAttr, style, style.GetFlags())) + if (wxTextAttrEqPartial(textAttr, style)) matchingCount ++; } } node = node->GetNext(); } - return foundCount == matchingCount; -} - -bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const -{ - wxRichTextAttr richStyle = style; - return HasParagraphAttributes(range, richStyle); -} - -void wxRichTextParagraphLayoutBox::Clear() -{ - DeleteChildren(); + return foundCount == matchingCount && foundCount != 0; } void wxRichTextParagraphLayoutBox::Reset() { Clear(); + wxRichTextBuffer* buffer = wxDynamicCast(this, wxRichTextBuffer); + if (buffer && GetRichTextCtrl()) + { + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, GetRichTextCtrl()->GetId()); + event.SetEventObject(GetRichTextCtrl()); + + buffer->SendEvent(event, true); + } + AddParagraph(wxEmptyString); + + Invalidate(wxRICHTEXT_ALL); } /// Invalidate the buffer. With no argument, invalidates whole buffer. @@ -2384,11 +2821,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; } @@ -2402,6 +2838,29 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh int foundCount = 0; + wxRichTextAttr attr(GetBasicStyle()); + if (GetBasicStyle().HasParagraphStyleName()) + { + wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName()); + if (paraDef) + { + attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet)); + SetBasicStyle(attr); + foundCount ++; + } + } + + if (GetBasicStyle().HasCharacterStyleName()) + { + wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName()); + if (charDef) + { + attr.Apply(charDef->GetStyleMergedWithBase(styleSheet)); + SetBasicStyle(attr); + foundCount ++; + } + } + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { @@ -2410,832 +2869,1546 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh if (para) { - if (!para->GetAttributes().GetParagraphStyleName().IsEmpty()) + // Combine paragraph and list styles. If there is a list style in the original attributes, + // the current indentation overrides anything else and is used to find the item indentation. + // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have, + // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list + // exception as above). + // Problem: when changing from one list style to another, there's a danger that the level info will get lost. + // So when changing a list style interactively, could retrieve level based on current style, then + // set appropriate indent and apply new style. + + 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()) { - wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); - if (def) + int currentIndent = para->GetAttributes().GetLeftIndent(); + + wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName()); + if (paraDef && !listDef) { - para->GetAttributes() = def->GetStyle(); + para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet); foundCount ++; } - } - } + else if (listDef && !paraDef) + { + // Set overall style defined for the list style definition + para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet); - node = node->GetNext(); - } - return foundCount != 0; -} + // Apply the style for this level + wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent))); + foundCount ++; + } + else if (listDef && paraDef) + { + // Combines overall list style, style for level, and paragraph style + para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyleMergedWithBase(styleSheet)); + foundCount ++; + } + } + else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) + { + int currentIndent = para->GetAttributes().GetLeftIndent(); -/*! - * wxRichTextParagraph - * This object represents a single paragraph (or in a straight text editor, a line). - */ + wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName()); -IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox) + // Overall list definition style + para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet); -wxArrayInt wxRichTextParagraph::sm_defaultTabs; + // Style for this level + wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent))); -wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style): - wxRichTextBox(parent) -{ - if (parent && !style) - SetAttributes(parent->GetAttributes()); - if (style) - SetAttributes(*style); -} + foundCount ++; + } + else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); + if (def) + { + para->GetAttributes() = def->GetStyleMergedWithBase(styleSheet); + foundCount ++; + } + } -wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): - wxRichTextBox(parent) -{ - if (parent && !style) - SetAttributes(parent->GetAttributes()); - if (style) - SetAttributes(*style); + if (outline != -1) + para->GetAttributes().SetOutlineLevel(outline); + if (num != -1) + para->GetAttributes().SetBulletNumber(num); + } - AppendChild(new wxRichTextPlainText(text, this)); + node = node->GetNext(); + } + return foundCount != 0; } -wxRichTextParagraph::~wxRichTextParagraph() +/// Set list style +bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) { - ClearLines(); -} + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); -/// Draw the item -bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) -{ -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr = GetCombinedAttributes(); -#else - const wxTextAttrEx& attr = GetAttributes(); -#endif + bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); + // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); + bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); + bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); - // Draw the bullet, if any - if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) + // Current number, if numbering + int n = startFrom; + + wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); + + // If we are associated with a control, make undoable; otherwise, apply immediately + // to the data. + + bool haveControl = (GetRichTextCtrl() != NULL); + + wxRichTextAction* action = NULL; + + if (haveControl && withUndo) { - if (attr.GetLeftSubIndent() != 0) + action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(range); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); + } + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); + + if (para && para->GetChildCount() > 0) { - int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); - int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); + // Stop searching if we're beyond the range of interest + if (para->GetRange().GetStart() > range.GetEnd()) + break; - if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) - { - // TODO - } - else + if (!para->GetRange().IsOutside(range)) { - wxString bulletText = GetBulletText(); - if (!bulletText.empty()) + // We'll be using a copy of the paragraph to make style changes, + // not updating the buffer directly. + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); + + if (haveControl && withUndo) { - // Get the combined font, or if a font is specified for a symbol bullet, - // create the font + newPara = new wxRichTextParagraph(*para); + action->GetNewParagraphs().AppendChild(newPara); + + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + } + else + newPara = para; - wxTextAttrEx bulletAttr(GetCombinedAttributes()); - wxFont font; - if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && bulletAttr.GetFont().Ok()) + if (def) + { + int thisIndent = newPara->GetAttributes().GetLeftIndent(); + int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent); + + // How is numbering going to work? + // If we are renumbering, or numbering for the first time, we need to keep + // track of the number for each level. But we might be simply applying a different + // list style. + // In Word, applying a style to several paragraphs, even if at different levels, + // reverts the level back to the same one. So we could do the same here. + // Renumbering will need to be done when we promote/demote a paragraph. + + // Apply the overall list style, and item style for this level + wxRichTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); + + // Now we need to do numbering + if (renumber) { - font = (*wxTheFontList->FindOrCreateFont(bulletAttr.GetFont().GetPointSize(), bulletAttr.GetFont().GetFamily(), - bulletAttr.GetFont().GetStyle(), bulletAttr.GetFont().GetWeight(), bulletAttr.GetFont().GetUnderlined(), - attr.GetBulletFont())); + newPara->GetAttributes().SetBulletNumber(n); } - else if (bulletAttr.GetFont().Ok()) - font = bulletAttr.GetFont(); - else - font = (*wxNORMAL_FONT); - - dc.SetFont(font); - if (bulletAttr.GetTextColour().Ok()) - dc.SetTextForeground(bulletAttr.GetTextColour()); + n ++; + } + else if (!newPara->GetAttributes().GetListStyleName().IsEmpty()) + { + // if def is NULL, remove list style, applying any associated paragraph style + // to restore the attributes - dc.SetBackgroundMode(wxTRANSPARENT); + newPara->GetAttributes().SetListStyleName(wxEmptyString); + newPara->GetAttributes().SetLeftIndent(0, 0); + newPara->GetAttributes().SetBulletText(wxEmptyString); - // Get line height from first line, if any - wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; + // Eliminate the main list-related attributes + newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_TEXT & wxTEXT_ATTR_LIST_STYLE_NAME); - wxPoint linePos; - int lineHeight wxDUMMY_INITIALIZE(0); - if (line) - { - lineHeight = line->GetSize().y; - linePos = line->GetPosition() + GetPosition(); - } - else + if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty()) { - lineHeight = dc.GetCharHeight(); - linePos = GetPosition(); - linePos.y += spaceBeforePara; + wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName()); + if (def) + { + newPara->GetAttributes() = def->GetStyleMergedWithBase(styleSheet); + } } - - int charHeight = dc.GetCharHeight(); - - int x = GetPosition().x + leftIndent; - int y = linePos.y + (lineHeight - charHeight); - - dc.DrawText(bulletText, x, y); } } } + + node = node->GetNext(); } - // Draw the range for each line, one object at a time. + // Do action, or delay it until end of batch. + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); - wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); - while (node) + return true; +} + +bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) +{ + if (GetStyleSheet()) { - wxRichTextLine* line = node->GetData(); - wxRichTextRange lineRange = line->GetAbsoluteRange(); + wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName); + if (def) + return SetListStyle(range, def, flags, startFrom, specifiedLevel); + } + return false; +} - int maxDescent = line->GetDescent(); +/// Clear list for given range +bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags) +{ + return SetListStyle(range, NULL, flags); +} - // Lines are specified relative to the paragraph +/// Number/renumber any list elements in the given range +bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + return DoNumberList(range, range, 0, def, flags, startFrom, specifiedLevel); +} - wxPoint linePosition = line->GetPosition() + GetPosition(); - wxPoint objectPosition = linePosition; +/// Number/renumber any list elements in the given range. Also do promotion or demotion of items, if specified +bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy, + wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel) +{ + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); - // 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().IsOutside(lineRange)) - { - // Draw this part of the line at the correct position - wxRichTextRange objectRange(child->GetRange()); - objectRange.LimitTo(lineRange); + bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); + // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); +#if wxDEBUG_LEVEL + bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); +#endif - wxSize objectSize; - int descent = 0; - child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); + bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); - // 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); + // Max number of levels + const int maxLevels = 10; - 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; + // The level we're looking at now + int currentLevel = -1; - node2 = node2->GetNext(); - } + // The item number for each level + int levels[maxLevels]; + int i; - node = node->GetNext(); + // Reset all numbering + for (i = 0; i < maxLevels; i++) + { + if (startFrom != -1) + levels[i] = startFrom-1; + else if (renumber) // start again + levels[i] = 0; + else + levels[i] = -1; // start from the number we found, if any } - return true; -} - -/// Lay the item out -bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) -{ -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr = GetCombinedAttributes(); -#else - const wxTextAttrEx& attr = GetAttributes(); -#endif + wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); - // ClearLines(); + // If we are associated with a control, make undoable; otherwise, apply immediately + // to the data. - // Increase the size of the paragraph due to spacing - int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); - int spaceAfterPara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingAfter()); - int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); - int leftSubIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftSubIndent()); - int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + bool haveControl = (GetRichTextCtrl() != NULL); - int lineSpacing = 0; + wxRichTextAction* action = NULL; - // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc. - if (attr.GetLineSpacing() > 10 && attr.GetFont().Ok()) + if (haveControl && withUndo) { - dc.SetFont(attr.GetFont()); - lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10; + action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl()); + action->SetRange(range); + action->SetPosition(GetRichTextCtrl()->GetCaretPosition()); } - // 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; + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph); + wxASSERT (para != NULL); - // Start position for each line relative to the paragraph - int startPositionFirstLine = leftIndent; - int startPositionSubsequentLines = leftIndent + leftSubIndent; + if (para && para->GetChildCount() > 0) + { + // Stop searching if we're beyond the range of interest + if (para->GetRange().GetStart() > range.GetEnd()) + break; - // If we have a bullet in this paragraph, the start position for the first line's text - // is actually leftIndent + leftSubIndent. - if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) - startPositionFirstLine = startPositionSubsequentLines; + if (!para->GetRange().IsOutside(range)) + { + // We'll be using a copy of the paragraph to make style changes, + // not updating the buffer directly. + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); - long lastEndPos = GetRange().GetStart()-1; - long lastCompletedEndPos = lastEndPos; + if (haveControl && withUndo) + { + newPara = new wxRichTextParagraph(*para); + action->GetNewParagraphs().AppendChild(newPara); - int currentWidth = 0; - SetPosition(rect.GetPosition()); + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + } + else + newPara = para; - wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph - int lineHeight = 0; - int maxWidth = 0; - int maxDescent = 0; + wxRichTextListStyleDefinition* defToUse = def; + if (!defToUse) + { + if (styleSheet && !newPara->GetAttributes().GetListStyleName().IsEmpty()) + defToUse = styleSheet->FindListStyle(newPara->GetAttributes().GetListStyleName()); + } - int lineCount = 0; + if (defToUse) + { + int thisIndent = newPara->GetAttributes().GetLeftIndent(); + int thisLevel = defToUse->FindLevelForIndent(thisIndent); - // Split up lines + // If we've specified a level to apply to all, change the level. + if (specifiedLevel != -1) + thisLevel = specifiedLevel; - // We may need to go back to a previous child, in which case create the new line, - // find the child corresponding to the start position of the string, and - // continue. + // Do promotion if specified + if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange)) + { + thisLevel = thisLevel - promoteBy; + if (thisLevel < 0) + thisLevel = 0; + if (thisLevel > 9) + thisLevel = 9; + } - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxRichTextObject* child = node->GetData(); + // Apply the overall list style, and item style for this level + wxRichTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet)); + wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); - // 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? - // since for example if position is dependent on vertical line size, we - // can't tell the position until the size is determined. So possibly introduce - // another layout phase. + // OK, we've (re)applied the style, now let's get the numbering right. - child->Layout(dc, rect, style); + if (currentLevel == -1) + currentLevel = thisLevel; - // Available width depends on whether we're on the first or subsequent lines - int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines); + // Same level as before, do nothing except increment level's number afterwards + if (currentLevel == thisLevel) + { + } + // A deeper level: start renumbering all levels after current level + else if (thisLevel > currentLevel) + { + for (i = currentLevel+1; i <= thisLevel; i++) + { + levels[i] = 0; + } + currentLevel = thisLevel; + } + else if (thisLevel < currentLevel) + { + currentLevel = thisLevel; + } - currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); + // Use the current numbering if -1 and we have a bullet number already + if (levels[currentLevel] == -1) + { + if (newPara->GetAttributes().HasBulletNumber()) + levels[currentLevel] = newPara->GetAttributes().GetBulletNumber(); + else + levels[currentLevel] = 1; + } + else + { + levels[currentLevel] ++; + } - // 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. + newPara->GetAttributes().SetBulletNumber(levels[currentLevel]); - wxSize childSize; - int childDescent = 0; - if (lastEndPos == child->GetRange().GetStart() - 1) - { - childSize = child->GetCachedSize(); - childDescent = child->GetDescent(); - } - else - GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED,rect.GetPosition()); - - if (childSize.x + currentWidth > availableSpaceForText) - { - long wrapPosition = 0; - - // Find a place to wrap. This may walk back to previous children, - // for example if a word spans several objects. - if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition)) - { - // If the function failed, just cut it off at the end of this child. - wrapPosition = child->GetRange().GetEnd(); + // Create the bullet text if an outline list + if (listStyle.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + wxString text; + for (i = 0; i <= currentLevel; i++) + { + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), levels[i]); + } + newPara->GetAttributes().SetBulletText(text); + } + } } - - // FindWrapPosition can still return a value that will put us in an endless wrapping loop - if (wrapPosition <= lastCompletedEndPos) - wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd()); - - // wxLogDebug(wxT("Split at %ld"), wrapPosition); - - // Let's find the actual size of the current line now - wxSize actualSize; - wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition); - GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); - currentWidth = actualSize.x; - lineHeight = wxMax(lineHeight, actualSize.y); - maxDescent = wxMax(childDescent, maxDescent); - - // Add a new line - wxRichTextLine* line = AllocateLine(lineCount); - - // Set relative range so we won't have to change line ranges when paragraphs are moved - line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); - line->SetPosition(currentPosition); - line->SetSize(wxSize(currentWidth, lineHeight)); - line->SetDescent(maxDescent); - - // Now move down a line. TODO: add margins, spacing - currentPosition.y += lineHeight; - currentPosition.y += lineSpacing; - currentWidth = 0; - maxDescent = 0; - maxWidth = wxMax(maxWidth, currentWidth); - - lineCount ++; - - // TODO: account for zero-length objects, such as fields - wxASSERT(wrapPosition > lastCompletedEndPos); - - lastEndPos = wrapPosition; - lastCompletedEndPos = lastEndPos; - - lineHeight = 0; - - // May need to set the node back to a previous one, due to searching back in wrapping - wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1); - if (childAfterWrapPosition) - node = m_children.Find(childAfterWrapPosition); - else - node = node->GetNext(); - } - else - { - // We still fit, so don't add a line, and keep going - currentWidth += childSize.x; - lineHeight = wxMax(lineHeight, childSize.y); - maxDescent = wxMax(childDescent, maxDescent); - - maxWidth = wxMax(maxWidth, currentWidth); - lastEndPos = child->GetRange().GetEnd(); - - node = node->GetNext(); - } - } - - // Add the last line - it's the current pos -> last para pos - // Substract -1 because the last position is always the end-paragraph position. - if (lastCompletedEndPos <= GetRange().GetEnd()-1) - { - currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); - - wxRichTextLine* line = AllocateLine(lineCount); - - wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); - - // Set relative range so we won't have to change line ranges when paragraphs are moved - line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); - - line->SetPosition(currentPosition); - - if (lineHeight == 0) - { - if (attr.GetFont().Ok()) - dc.SetFont(attr.GetFont()); - lineHeight = dc.GetCharHeight(); - } - if (maxDescent == 0) - { - int w, h; - dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent); } - line->SetSize(wxSize(currentWidth, lineHeight)); - line->SetDescent(maxDescent); - currentPosition.y += lineHeight; - currentPosition.y += lineSpacing; - lineCount ++; + node = node->GetNext(); } - // Remove remaining unused line objects, if any - ClearUnusedLines(lineCount); - - // Apply styles to wrapped lines - ApplyParagraphStyle(attr, rect); - - SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara)); - - m_dirty = false; + // Do action, or delay it until end of batch. + if (haveControl && withUndo) + GetRichTextCtrl()->GetBuffer().SubmitAction(action); return true; } -/// Apply paragraph styles, such as centering, to wrapped lines -void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wxRect& rect) +bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel) { - if (!attr.HasAlignment()) - return; - - wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); - while (node) + if (GetStyleSheet()) { - wxRichTextLine* line = node->GetData(); + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return NumberList(range, def, flags, startFrom, specifiedLevel); + } + return false; +} - wxPoint pos = line->GetPosition(); - wxSize size = line->GetSize(); +/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1 +bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel) +{ + // TODO + // One strategy is to first work out the range within which renumbering must occur. Then could pass these two ranges + // to NumberList with a flag indicating promotion is required within one of the ranges. + // Find first and last paragraphs in range. Then for first, calculate new indentation and look back until we find + // a paragraph that either has no list style, or has one that is different or whose indentation is less. + // We start renumbering from the para after that different para we found. We specify that the numbering of that + // list position will start from 1. + // Similarly, we look after the last para in the promote range for an indentation that is less (or no list style). + // We can end the renumbering at this point. - // centering, right-justification - if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) - { - pos.x = (rect.GetWidth() - size.x)/2 + pos.x; - line->SetPosition(pos); - } - else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) - { - pos.x = rect.GetRight() - size.x; - line->SetPosition(pos); - } + // For now, only renumber within the promotion range. - node = node->GetNext(); - } + return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel); } -/// Insert text at the given position -bool wxRichTextParagraph::InsertText(long pos, const wxString& text) +bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel) { - wxRichTextObject* childToUse = NULL; - wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator(); - - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) + if (GetStyleSheet()) { - wxRichTextObject* child = node->GetData(); - if (child->GetRange().Contains(pos) && child->GetRange().GetLength() > 0) - { - childToUse = child; - nodeToUse = node; - break; - } - - node = node->GetNext(); + wxRichTextListStyleDefinition* def = NULL; + if (!defName.IsEmpty()) + def = GetStyleSheet()->FindListStyle(defName); + return PromoteList(promoteBy, range, def, flags, specifiedLevel); } + return false; +} - if (childToUse) +/// 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, wxRichTextAttr& attr) const +{ + if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) + return false; + + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); + if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty()) { - wxRichTextPlainText* textObject = wxDynamicCast(childToUse, wxRichTextPlainText); - if (textObject) + wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName()); + if (def) { - int posInString = pos - textObject->GetRange().GetStart(); - - wxString newText = textObject->GetText().Mid(0, posInString) + - text + textObject->GetText().Mid(posInString); - textObject->SetText(newText); + // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent(); + // int thisLevel = def->FindLevelForIndent(thisIndent); - int textLength = text.length(); + bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0; - textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(), - textObject->GetRange().GetEnd() + textLength)); + attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME)); + if (previousParagraph->GetAttributes().HasBulletName()) + attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName()); + attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle()); + attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName()); - // Increment the end range of subsequent fragments in this paragraph. - // We'll set the paragraph range itself at a higher level. + int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1; + attr.SetBulletNumber(nextNumber); - wxRichTextObjectList::compatibility_iterator node = nodeToUse->GetNext(); - while (node) + if (isOutline) { - wxRichTextObject* child = node->GetData(); - child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength, - textObject->GetRange().GetEnd() + textLength)); - - node = node->GetNext(); + wxString text = previousParagraph->GetAttributes().GetBulletText(); + if (!text.IsEmpty()) + { + int pos = text.Find(wxT('.'), true); + if (pos != wxNOT_FOUND) + { + text = text.Mid(0, text.Length() - pos - 1); + } + else + text = wxEmptyString; + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), nextNumber); + attr.SetBulletText(text); + } } return true; } else - { - // TODO: if not a text object, insert at closest position, e.g. in front of it - } + return false; } else - { - // Add at end. - // Don't pass parent initially to suppress auto-setting of parent range. - // We'll do that at a higher level. - wxRichTextPlainText* textObject = new wxRichTextPlainText(text, this); + return false; +} - AppendChild(textObject); - return true; - } +/*! + * wxRichTextParagraph + * This object represents a single paragraph (or in a straight text editor, a line). + */ - return false; +IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox) + +wxArrayInt wxRichTextParagraph::sm_defaultTabs; + +wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxRichTextAttr* style): + wxRichTextBox(parent) +{ + if (style) + SetAttributes(*style); } -void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj) +wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* paraStyle, wxRichTextAttr* charStyle): + wxRichTextBox(parent) { - wxRichTextBox::Copy(obj); + if (paraStyle) + SetAttributes(*paraStyle); + + AppendChild(new wxRichTextPlainText(text, this, charStyle)); } -/// Clear the cached lines -void wxRichTextParagraph::ClearLines() +wxRichTextParagraph::~wxRichTextParagraph() { - WX_CLEAR_LIST(wxRichTextLineList, m_cachedLines); + 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 +/// Draw the item +bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int style) { - if (!range.IsWithin(GetRange())) - return false; + wxRichTextAttr attr = GetCombinedAttributes(); - if (flags & wxRICHTEXT_UNFORMATTED) + // Draw the bullet, if any + if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) { - // Just use unformatted data, assume no line breaks - // TODO: take into account line breaks - - wxSize sz; - - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) + if (attr.GetLeftSubIndent() != 0) { - wxRichTextObject* child = node->GetData(); - if (!child->GetRange().IsOutside(range)) - { - wxSize childSize; + int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); + int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); - wxRichTextRange rangeToUse = range; - rangeToUse.LimitTo(child->GetRange()); - int childDescent = 0; + wxRichTextAttr bulletAttr(GetCombinedAttributes()); - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position)) + // 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->IsFloatable() && firstObj->GetAttributes().HasFont()) { - sz.y = wxMax(sz.y, childSize.y); - sz.x += childSize.x; - descent = wxMax(descent, childDescent); + wxRichTextApplyStyle(bulletAttr, firstObj->GetAttributes()); } } - node = node->GetNext(); - } - size = sz; - } - else - { - // Use formatted data, with line breaks - wxSize sz; - - // We're going to loop through each line, and then for each line, - // call GetRangeSize for the fragment that comprises that line. - // Only we have to do that multiple times within the line, because - // the line may be broken into pieces. For now ignore line break commands - // (so we can assume that getting the unformatted size for a fragment - // within a line is the actual size) + // Get line height from first line, if any + wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : NULL; - wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); - while (node) - { - wxRichTextLine* line = node->GetData(); - wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (!lineRange.IsOutside(range)) + wxPoint linePos; + int lineHeight wxDUMMY_INITIALIZE(0); + if (line) { - wxSize lineSize; - - wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - while (node2) - { - wxRichTextObject* child = node2->GetData(); - - if (!child->GetRange().IsOutside(lineRange)) - { - wxRichTextRange rangeToUse = lineRange; - rangeToUse.LimitTo(child->GetRange()); - - wxSize childSize; - int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position)) - { - lineSize.y = wxMax(lineSize.y, childSize.y); - lineSize.x += childSize.x; - } - descent = wxMax(descent, childDescent); - } - - node2 = node2->GetNext(); - } - - // Increase size by a line (TODO: paragraph spacing) - sz.y += lineSize.y; - sz.x = wxMax(sz.x, lineSize.x); + lineHeight = line->GetSize().y; + linePos = line->GetPosition() + GetPosition(); } - node = node->GetNext(); - } - size = sz; - } - return true; -} - -/// Finds the absolute position and row height for the given character position -bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart) -{ - if (index == -1) - { - wxRichTextLine* line = ((wxRichTextParagraphLayoutBox*)GetParent())->GetLineAtPosition(0); - if (line) - *height = line->GetSize().y; - else - *height = dc.GetCharHeight(); - - // -1 means 'the start of the buffer'. - pt = GetPosition(); - if (line) - pt = pt + line->GetPosition(); - - return true; - } - - // The final position in a paragraph is taken to mean the position - // at the start of the next paragraph. - if (index == GetRange().GetEnd()) - { - wxRichTextParagraphLayoutBox* parent = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox); - wxASSERT( parent != NULL ); + else + { + wxFont font; + if (bulletAttr.HasFont() && GetBuffer()) + font = GetBuffer()->GetFontTable().FindFont(bulletAttr); + else + font = (*wxNORMAL_FONT); - // Find the height at the next paragraph, if any - wxRichTextLine* line = parent->GetLineAtPosition(index + 1); - if (line) - { - *height = line->GetSize().y; - pt = line->GetAbsolutePosition(); - } - else - { - *height = dc.GetCharHeight(); - int indent = ConvertTenthsMMToPixels(dc, m_attributes.GetLeftIndent()); - pt = wxPoint(indent, GetCachedSize().y); - } + wxCheckSetFont(dc, font); - return true; - } + lineHeight = dc.GetCharHeight(); + linePos = GetPosition(); + linePos.y += spaceBeforePara; + } - if (index < GetRange().GetStart() || index > GetRange().GetEnd()) - return false; + wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight); - wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); - while (node) - { - wxRichTextLine* line = node->GetData(); - wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (index >= lineRange.GetStart() && index <= lineRange.GetEnd()) - { - // If this is the last point in the line, and we're forcing the - // returned value to be the start of the next line, do the required - // thing. - if (index == lineRange.GetEnd() && forceLineStart) + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) { - if (node->GetNext()) - { - wxRichTextLine* nextLine = node->GetNext()->GetData(); - *height = nextLine->GetSize().y; - pt = nextLine->GetAbsolutePosition(); - return true; - } + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect); } - - pt.y = line->GetPosition().y + GetPosition().y; - - wxRichTextRange r(lineRange.GetStart(), index); - wxSize rangeSize; - int descent = 0; - - // We find the size of the line up to this point, - // then we can add this size to the line start position and - // paragraph start position to find the actual position. - - if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition())) + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD) { - pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x; - *height = line->GetSize().y; - - return true; + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect); } + else + { + wxString bulletText = GetBulletText(); + if (!bulletText.empty() && wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText); + } } - - node = node->GetNext(); } - return false; -} - -/// Hit-testing: returns a flag indicating hit test details, plus -/// information about position -int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition) -{ - wxPoint paraPos = GetPosition(); + // Draw the range for each line, one object at a time. wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); while (node) { wxRichTextLine* line = node->GetData(); - wxPoint linePos = paraPos + line->GetPosition(); - wxSize lineSize = line->GetSize(); wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y) - { - if (pt.x < linePos.x) - { - textPosition = lineRange.GetStart(); - return wxRICHTEXT_HITTEST_BEFORE; - } - else if (pt.x >= (linePos.x + lineSize.x)) - { - textPosition = lineRange.GetEnd(); - return wxRICHTEXT_HITTEST_AFTER; - } - else - { - long i; - int lastX = linePos.x; - for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++) - { - wxSize childSize; - int descent = 0; + // Lines are specified relative to the paragraph - wxRichTextRange rangeToUse(lineRange.GetStart(), i); + wxPoint linePosition = line->GetPosition() + GetPosition(); - GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos); + // 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)) + { + wxPoint objectPosition = linePosition; + int maxDescent = line->GetDescent(); - int nextX = childSize.x + linePos.x; + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - if (pt.x >= lastX && pt.x <= nextX) - { - textPosition = i; + int i = 0; + while (node2) + { + wxRichTextObject* child = node2->GetData(); - // 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. + 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); - int midPoint = (nextX - lastX)/2 + lastX; - if (pt.x >= midPoint) - return wxRICHTEXT_HITTEST_AFTER; - else - return wxRICHTEXT_HITTEST_BEFORE; + 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 { - lastX = nextX; + int descent = 0; + child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); } + + // Use the child object's width, but the whole line's height + wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); + child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); + + objectPosition.x += objectSize.x; + i ++; } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; + + node2 = node2->GetNext(); } } node = node->GetNext(); } - return wxRICHTEXT_HITTEST_NONE; + return true; } -/// Split an object at this position if necessary, and return -/// the previous object, or NULL if inserting at beginning. -wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** previousObject) +// Get the range width using partial extents calculated for the whole paragraph. +static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents) { - wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - while (node) - { - wxRichTextObject* child = node->GetData(); - - if (pos == child->GetRange().GetStart()) - { - if (previousObject) - { - if (node->GetPrevious()) - *previousObject = node->GetPrevious()->GetData(); - else - *previousObject = NULL; - } - - return child; - } + wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength()); - if (child->GetRange().Contains(pos)) - { - // This should create a new object, transferring part of - // the content to the old object and the rest to the new object. - wxRichTextObject* newObject = child->DoSplit(pos); + if (partialExtents.GetCount() < (size_t) range.GetLength()) + return 0; - // If we couldn't split this object, just insert in front of it. - if (!newObject) - { - // Maybe this is an empty string, try the next one - // return child; - } - else - { - // Insert the new object after 'child' - if (node->GetNext()) - m_children.Insert(node->GetNext(), newObject); - else - m_children.Append(newObject); - newObject->SetParent(this); + int leftMostPos = 0; + if (range.GetStart() - para.GetRange().GetStart() > 0) + leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1]; - if (previousObject) - *previousObject = child; + int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()]; - return newObject; - } - } + int w = rightMostPos - leftMostPos; - node = node->GetNext(); - } - if (previousObject) - *previousObject = NULL; - return NULL; + return w; } -/// Move content to a list from obj on -void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list) +/// Lay the item out +bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { - wxRichTextObjectList::compatibility_iterator node = m_children.Find(obj); - while (node) - { - wxRichTextObject* child = node->GetData(); - list.Append(child); + // 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); - wxRichTextObjectList::compatibility_iterator oldNode = node; + wxRichTextAttr attr = GetCombinedAttributes(); + + // ClearLines(); + + // Increase the size of the paragraph due to spacing + int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); + int spaceAfterPara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingAfter()); + int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); + int leftSubIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftSubIndent()); + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + + int lineSpacing = 0; + + // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc. + if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().Ok()) + { + wxCheckSetFont(dc, attr.GetFont()); + lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0)); + } + + // 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. + if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE) + startPositionFirstLine = startPositionSubsequentLines; + + long lastEndPos = GetRange().GetStart()-1; + long lastCompletedEndPos = lastEndPos; + + int currentWidth = 0; + SetPosition(rect.GetPosition()); + + 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; + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxUnusedVar(style); + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents); +#else + node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + + child->SetCachedSize(wxDefaultSize); + child->Layout(dc, rect, style); + + node = node->GetNext(); + } + +#endif + + // Split up lines + + // We may need to go back to a previous child, in which case create the new line, + // find the child corresponding to the start position of the string, and + // continue. + + node = m_children.GetFirst(); + while (node) + { + 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? + // since for example if position is dependent on vertical line size, we + // can't tell the position until the size is determined. So possibly introduce + // another layout phase. + + // 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. + + long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1); + long lastPosToUse = child->GetRange().GetEnd(); + bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd()); + + if (lineBreakInThisObject) + lastPosToUse = nextBreakPos; + + wxSize childSize; + int childDescent = 0; + + if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing + { + childSize = child->GetCachedSize(); + 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 <= 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. + // 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(); + } + + // FindWrapPosition can still return a value that will put us in an endless wrapping loop + if (wrapPosition <= lastCompletedEndPos) + wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd()); + + // wxLogDebug(wxT("Split at %ld"), wrapPosition); + + // Let's find the actual size of the current line now + wxSize actualSize; + wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition); + + /// 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; + maxDescent = wxMax(childDescent, maxDescent); + maxAscent = wxMax(actualSize.y-childDescent, maxAscent); + lineHeight = maxDescent + maxAscent; + + // Add a new line + wxRichTextLine* line = AllocateLine(lineCount); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); + line->SetPosition(currentPosition); + line->SetSize(wxSize(currentWidth, lineHeight)); + line->SetDescent(maxDescent); + + // Now move down a line. TODO: add margins, spacing + currentPosition.y += lineHeight; + currentPosition.y += lineSpacing; + currentWidth = 0; + maxDescent = 0; + maxAscent = 0; + maxWidth = wxMax(maxWidth, currentWidth); + + lineCount ++; + + // TODO: account for zero-length objects, such as fields + wxASSERT(wrapPosition > lastCompletedEndPos); + + lastEndPos = wrapPosition; + lastCompletedEndPos = lastEndPos; + + lineHeight = 0; + + // May need to set the node back to a previous one, due to searching back in wrapping + wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1); + if (childAfterWrapPosition) + node = m_children.Find(childAfterWrapPosition); + else + node = node->GetNext(); + } + else + { + // We still fit, so don't add a line, and keep going + currentWidth += childSize.x; + maxDescent = wxMax(childDescent, maxDescent); + maxAscent = wxMax(childSize.y-childDescent, maxAscent); + lineHeight = maxDescent + maxAscent; + + maxWidth = wxMax(maxWidth, currentWidth); + lastEndPos = child->GetRange().GetEnd(); + + node = node->GetNext(); + } + } + + // Add the last line - it's the current pos -> last para pos + // Substract -1 because the last position is always the end-paragraph position. + if (lastCompletedEndPos <= GetRange().GetEnd()-1) + { + currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines); + + wxRichTextLine* line = AllocateLine(lineCount); + + wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); + + line->SetPosition(currentPosition); + + if (lineHeight == 0 && GetBuffer()) + { + wxFont font(GetBuffer()->GetFontTable().FindFont(attr)); + wxCheckSetFont(dc, font); + lineHeight = dc.GetCharHeight(); + } + if (maxDescent == 0) + { + int w, h; + dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent); + } + + line->SetSize(wxSize(currentWidth, lineHeight)); + line->SetDescent(maxDescent); + currentPosition.y += lineHeight; + currentPosition.y += lineSpacing; + lineCount ++; + } + + // Remove remaining unused line objects, if any + ClearUnusedLines(lineCount); + + // Apply styles to wrapped lines + ApplyParagraphStyle(attr, rect, dc); + + 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 wxRichTextAttr& attr, const wxRect& rect, wxDC& dc) +{ + if (!attr.HasAlignment()) + return; + + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); + while (node) + { + wxRichTextLine* line = node->GetData(); + + wxPoint pos = line->GetPosition(); + wxSize size = line->GetSize(); + + // centering, right-justification + if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) + { + 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) + { + int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); + pos.x = rect.GetWidth() - size.x - rightIndent; + line->SetPosition(pos); + } + + node = node->GetNext(); + } +} + +/// Insert text at the given position +bool wxRichTextParagraph::InsertText(long pos, const wxString& text) +{ + wxRichTextObject* childToUse = NULL; + wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator(); + + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + if (child->GetRange().Contains(pos) && child->GetRange().GetLength() > 0) + { + childToUse = child; + nodeToUse = node; + break; + } + + node = node->GetNext(); + } + + if (childToUse) + { + wxRichTextPlainText* textObject = wxDynamicCast(childToUse, wxRichTextPlainText); + if (textObject) + { + int posInString = pos - textObject->GetRange().GetStart(); + + wxString newText = textObject->GetText().Mid(0, posInString) + + text + textObject->GetText().Mid(posInString); + textObject->SetText(newText); + + int textLength = text.length(); + + textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(), + textObject->GetRange().GetEnd() + textLength)); + + // Increment the end range of subsequent fragments in this paragraph. + // We'll set the paragraph range itself at a higher level. + + wxRichTextObjectList::compatibility_iterator node = nodeToUse->GetNext(); + while (node) + { + wxRichTextObject* child = node->GetData(); + child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength, + textObject->GetRange().GetEnd() + textLength)); + + node = node->GetNext(); + } + + return true; + } + else + { + // TODO: if not a text object, insert at closest position, e.g. in front of it + } + } + else + { + // Add at end. + // Don't pass parent initially to suppress auto-setting of parent range. + // We'll do that at a higher level. + wxRichTextPlainText* textObject = new wxRichTextPlainText(text, this); + + AppendChild(textObject); + return true; + } + + return false; +} + +void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj) +{ + wxRichTextCompositeObject::Copy(obj); +} + +/// Clear the cached lines +void wxRichTextParagraph::ClearLines() +{ + WX_CLEAR_LIST(wxRichTextLineList, m_cachedLines); +} + +/// 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, wxArrayInt* partialExtents) const +{ + if (!range.IsWithin(GetRange())) + return false; + + if (flags & wxRICHTEXT_UNFORMATTED) + { + // Just use unformatted data, assume no line breaks + // TODO: take into account line breaks + + 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; + + // 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(); + } + size = sz; + } + else + { + // Use formatted data, with line breaks + wxSize sz; + + // We're going to loop through each line, and then for each line, + // call GetRangeSize for the fragment that comprises that line. + // Only we have to do that multiple times within the line, because + // the line may be broken into pieces. For now ignore line break commands + // (so we can assume that getting the unformatted size for a fragment + // within a line is the actual size) + + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); + while (node) + { + wxRichTextLine* line = node->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (!lineRange.IsOutside(range)) + { + wxSize lineSize; + + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); + while (node2) + { + wxRichTextObject* child = node2->GetData(); + + if (!child->IsFloating() && !child->GetRange().IsOutside(lineRange)) + { + wxRichTextRange rangeToUse = lineRange; + rangeToUse.LimitTo(child->GetRange()); + + wxSize childSize; + int childDescent = 0; + if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y))) + { + lineSize.y = wxMax(lineSize.y, childSize.y); + lineSize.x += childSize.x; + } + descent = wxMax(descent, childDescent); + } + + node2 = node2->GetNext(); + } + + // Increase size by a line (TODO: paragraph spacing) + sz.y += lineSize.y; + sz.x = wxMax(sz.x, lineSize.x); + } + node = node->GetNext(); + } + size = sz; + } + return true; +} + +/// Finds the absolute position and row height for the given character position +bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart) +{ + if (index == -1) + { + wxRichTextLine* line = ((wxRichTextParagraphLayoutBox*)GetParent())->GetLineAtPosition(0); + if (line) + *height = line->GetSize().y; + else + *height = dc.GetCharHeight(); + + // -1 means 'the start of the buffer'. + pt = GetPosition(); + if (line) + pt = pt + line->GetPosition(); + + return true; + } + + // The final position in a paragraph is taken to mean the position + // at the start of the next paragraph. + if (index == GetRange().GetEnd()) + { + wxRichTextParagraphLayoutBox* parent = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox); + wxASSERT( parent != NULL ); + + // Find the height at the next paragraph, if any + wxRichTextLine* line = parent->GetLineAtPosition(index + 1); + if (line) + { + *height = line->GetSize().y; + pt = line->GetAbsolutePosition(); + } + else + { + *height = dc.GetCharHeight(); + int indent = ConvertTenthsMMToPixels(dc, m_attributes.GetLeftIndent()); + pt = wxPoint(indent, GetCachedSize().y); + } + + return true; + } + + if (index < GetRange().GetStart() || index > GetRange().GetEnd()) + return false; + + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); + while (node) + { + wxRichTextLine* line = node->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (index >= lineRange.GetStart() && index <= lineRange.GetEnd()) + { + // If this is the last point in the line, and we're forcing the + // returned value to be the start of the next line, do the required + // thing. + if (index == lineRange.GetEnd() && forceLineStart) + { + if (node->GetNext()) + { + wxRichTextLine* nextLine = node->GetNext()->GetData(); + *height = nextLine->GetSize().y; + pt = nextLine->GetAbsolutePosition(); + return true; + } + } + + pt.y = line->GetPosition().y + GetPosition().y; + + wxRichTextRange r(lineRange.GetStart(), index); + wxSize rangeSize; + int descent = 0; + + // We find the size of the line up to this point, + // then we can add this size to the line start position and + // paragraph start position to find the actual position. + + if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition())) + { + pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x; + *height = line->GetSize().y; + + return true; + } + + } + + node = node->GetNext(); + } + + return false; +} + +/// Hit-testing: returns a flag indicating hit test details, plus +/// information about position +int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition) +{ + wxPoint paraPos = GetPosition(); + + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst(); + while (node) + { + wxRichTextLine* line = node->GetData(); + wxPoint linePos = paraPos + line->GetPosition(); + wxSize lineSize = line->GetSize(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); + + if (pt.y <= linePos.y + lineSize.y) + { + if (pt.x < linePos.x) + { + textPosition = lineRange.GetStart(); + return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE; + } + else if (pt.x >= (linePos.x + lineSize.x)) + { + textPosition = lineRange.GetEnd(); + return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE; + } + else + { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + wxArrayInt partialExtents; + + wxSize paraSize; + int paraDescent; + + // This calculates the partial text extents + GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & partialExtents); + + int lastX = linePos.x; + size_t i; + for (i = 0; i < partialExtents.GetCount(); i++) + { + int nextX = partialExtents[i] + linePos.x; + + if (pt.x >= lastX && pt.x <= nextX) + { + textPosition = i + lineRange.GetStart(); // minus 1? + + // So now we know it's between i-1 and i. + // Let's see if we can be more precise about + // which side of the position it's on. + + int midPoint = (nextX + lastX)/2; + 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++) + { + wxSize childSize; + int descent = 0; + + wxRichTextRange rangeToUse(lineRange.GetStart(), i); + + GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos); + + int nextX = childSize.x + linePos.x; + + if (pt.x >= lastX && pt.x <= nextX) + { + textPosition = i; + + // 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; + } + else + { + lastX = nextX; + } + } +#endif + } + } + + node = node->GetNext(); + } + + return wxRICHTEXT_HITTEST_NONE; +} + +/// Split an object at this position if necessary, and return +/// the previous object, or NULL if inserting at beginning. +wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** previousObject) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + + if (pos == child->GetRange().GetStart()) + { + if (previousObject) + { + if (node->GetPrevious()) + *previousObject = node->GetPrevious()->GetData(); + else + *previousObject = NULL; + } + + return child; + } + + if (child->GetRange().Contains(pos)) + { + // This should create a new object, transferring part of + // the content to the old object and the rest to the new object. + wxRichTextObject* newObject = child->DoSplit(pos); + + // If we couldn't split this object, just insert in front of it. + if (!newObject) + { + // Maybe this is an empty string, try the next one + // return child; + } + else + { + // Insert the new object after 'child' + if (node->GetNext()) + m_children.Insert(node->GetNext(), newObject); + else + m_children.Append(newObject); + newObject->SetParent(this); + + if (previousObject) + *previousObject = child; + + return newObject; + } + } + + node = node->GetNext(); + } + if (previousObject) + *previousObject = NULL; + return NULL; +} + +/// Move content to a list from obj on +void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.Find(obj); + while (node) + { + wxRichTextObject* child = node->GetData(); + list.Append(child); + + wxRichTextObjectList::compatibility_iterator oldNode = node; node = node->GetNext(); @@ -3298,7 +4471,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text += textObj->GetTextForRange(range); } else - return true; + { + text += wxT(" "); + } } node = node->GetNext(); @@ -3318,7 +4493,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex text = textObj->GetTextForRange(range) + text; } else - return true; + { + text = wxT(" ") + text; + } } node = node->GetPrevious(); @@ -3329,21 +4506,85 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex } /// Find a suitable wrap position. -bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition) +bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents) { + if (range.GetLength() <= 0) + return false; + // Find the first position where the line exceeds the available space. wxSize sz; - long i; long breakPosition = range.GetEnd(); - for (i = range.GetStart(); i <= range.GetEnd(); i++) + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (partialExtents && partialExtents->GetCount() >= (size_t) (GetRange().GetLength()-1)) // the final position in a paragraph is the newline { - int descent = 0; - GetRangeSize(wxRichTextRange(range.GetStart(), i), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + int widthBefore; - if (sz.x > availableSpace) + 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++) { - breakPosition = i-1; - break; + int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore; + + if (widthFromStartOfThisRange > availableSpace) + { + breakPosition = i-1; + break; + } + } + } + else +#endif + { + // Binary chop for speed + long minPos = range.GetStart(); + long maxPos = range.GetEnd(); + while (true) + { + if (minPos == maxPos) + { + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + breakPosition = minPos - 1; + break; + } + else if ((maxPos - minPos) == 1) + { + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + breakPosition = minPos - 1; + else + { + GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + if (sz.x > availableSpace) + breakPosition = maxPos-1; + } + break; + } + else + { + long nextPos = minPos + ((maxPos - minPos) / 2); + + int descent = 0; + GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED); + + if (sz.x > availableSpace) + { + maxPos = nextPos; + } + else + { + minPos = nextPos; + } + } } } @@ -3353,11 +4594,21 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d wxString plainText; if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false)) { - int spacePos = plainText.Find(wxT(' '), true); - if (spacePos != wxNOT_FOUND) + int newLinePos = plainText.Find(wxRichTextLineBreakChar); + if (newLinePos != wxNOT_FOUND) + { + breakPosition = wxMax(0, range.GetStart() + newLinePos); + } + else { - int positionsFromEndOfString = plainText.length() - spacePos - 1; - breakPosition = breakPosition - positionsFromEndOfString; + int spacePos = plainText.Find(wxT(' '), true); + int tabPos = plainText.Find(wxT('\t'), true); + int pos = wxMax(spacePos, tabPos); + if (pos != wxNOT_FOUND) + { + int positionsFromEndOfString = plainText.length() - pos - 1; + breakPosition = breakPosition - positionsFromEndOfString; + } } } @@ -3376,7 +4627,7 @@ wxString wxRichTextParagraph::GetBulletText() int number = GetAttributes().GetBulletNumber(); wxString text; - if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) + if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)) { text.Printf(wxT("%d"), number); } @@ -3401,13 +4652,28 @@ wxString wxRichTextParagraph::GetBulletText() } else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) { - text = GetAttributes().GetBulletSymbol(); + text = GetAttributes().GetBulletText(); + } + + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + // The outline style relies on the text being computed statically, + // since it depends on other levels points (e.g. 1.2.1.1). So normally the bullet text + // should be stored in the attributes; if not, just use the number for this + // level, as previously computed. + if (!GetAttributes().GetBulletText().IsEmpty()) + text = GetAttributes().GetBulletText(); } if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES) { text = wxT("(") + text + wxT(")"); } + else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS) + { + text = text + wxT(")"); + } + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD) { text += wxT("."); @@ -3452,9 +4718,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. -wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& contentStyle) const +wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle) const { - wxTextAttrEx attr; + wxRichTextAttr attr; wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); if (buf) { @@ -3469,9 +4735,9 @@ wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& cont } /// Get combined attributes of the base style and paragraph style. -wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes() const +wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes() const { - wxTextAttrEx attr; + wxRichTextAttr attr; wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer); if (buf) { @@ -3500,6 +4766,74 @@ 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) + { + wxRichTextObject* anchored = node->GetData(); + 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); + } + + 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) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* obj = node->GetData(); + if (pos >= obj->GetRange().GetStart() && pos <= obj->GetRange().GetEnd()) + { + wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); + if (textObj) + { + long breakPos = textObj->GetFirstLineBreakPosition(pos); + if (breakPos > -1) + return breakPos; + } + } + node = node->GetNext(); + } + return -1; +} /*! * wxRichTextLine @@ -3521,12 +4855,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 @@ -3550,11 +4890,9 @@ wxRichTextRange wxRichTextLine::GetAbsoluteRange() const IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject) -wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): +wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* style): wxRichTextObject(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); if (style) SetAttributes(*style); @@ -3563,33 +4901,67 @@ wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* #define USE_KERNING_FIX 1 +// If insufficient tabs are defined, this is the tab width used +#define WIDTH_FOR_DEFAULT_TABS 50 + /// Draw the item bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style)) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); wxASSERT (para != NULL); - wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); -#else - wxTextAttrEx textAttr(GetAttributes()); -#endif + wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); int offset = GetRange().GetStart(); - long len = range.GetLength(); - wxString stringChunk = m_text.Mid(range.GetStart() - offset, (size_t) len); - - int charHeight = dc.GetCharHeight(); + // Replace line break characters with spaces + wxString str = m_text; + wxString toRemove = wxRichTextLineBreakChar; + str.Replace(toRemove, wxT(" ")); + if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) + str.MakeUpper(); - int x = rect.x; - int y = rect.y + (rect.height - charHeight - (descent - m_descent)); + long len = range.GetLength(); + wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len); // Test for the optimized situations where all is selected, or none // is selected. - if (textAttr.GetFont().Ok()) - dc.SetFont(textAttr.GetFont()); + wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr)); + wxCheckSetFont(dc, textFont); + int charHeight = dc.GetCharHeight(); + + int x, y; + if ( textFont.Ok() ) + { + if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + y = rect.y; + wxCheckSetFont(dc, textFont); + } + else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) + { + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + x = rect.x; + int sub_height = static_cast( static_cast(charHeight) / wxSCRIPT_MUL_FACTOR); + y = rect.y + (rect.height - sub_height + (descent - m_descent)); + wxCheckSetFont(dc, textFont); + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } + } + else + { + x = rect.x; + y = rect.y + (rect.height - charHeight - (descent - m_descent)); + } // (a) All selected. if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd()) @@ -3607,7 +4979,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()) @@ -3616,8 +4988,10 @@ 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 = m_text.Mid(r1 - offset, fragmentLen); + } + wxString stringFragment = str.Mid(r1 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); @@ -3625,14 +4999,14 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND) { // Compensate for kerning difference - wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1)); - wxString stringFragment3(m_text.Mid(r1 - offset + fragmentLen, 1)); - + wxString stringFragment2(str.Mid(r1 - offset, fragmentLen+1)); + wxString stringFragment3(str.Mid(r1 - offset + fragmentLen, 1)); + wxCoord w1, h1, w2, h2, w3, h3; dc.GetTextExtent(stringFragment, & w1, & h1); dc.GetTextExtent(stringFragment2, & w2, & h2); dc.GetTextExtent(stringFragment3, & w3, & h3); - + int kerningDiff = (w1 + w3) - w2; x = x - kerningDiff; } @@ -3647,8 +5021,10 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = s2 - s1 + 1; if (fragmentLen < 0) + { wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen); - wxString stringFragment = m_text.Mid(s1 - offset, fragmentLen); + } + wxString stringFragment = str.Mid(s1 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true); @@ -3656,14 +5032,14 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND) { // Compensate for kerning difference - wxString stringFragment2(m_text.Mid(s1 - offset, fragmentLen+1)); - wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1)); - + wxString stringFragment2(str.Mid(s1 - offset, fragmentLen+1)); + wxString stringFragment3(str.Mid(s1 - offset + fragmentLen, 1)); + wxCoord w1, h1, w2, h2, w3, h3; dc.GetTextExtent(stringFragment, & w1, & h1); dc.GetTextExtent(stringFragment2, & w2, & h2); dc.GetTextExtent(stringFragment3, & w3, & h3); - + int kerningDiff = (w1 + w3) - w2; x = x - kerningDiff; } @@ -3678,8 +5054,10 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int fragmentLen = r2 - s2 + 1; if (fragmentLen < 0) + { wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen); - wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen); + } + wxString stringFragment = str.Mid(s2 - offset, fragmentLen); DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false); } @@ -3688,7 +5066,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR return true; } -bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& 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); @@ -3718,17 +5096,28 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c if (selected) { - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.SetTextForeground(*wxWHITE); - dc.SetBackgroundMode(wxTRANSPARENT); + wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); + wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + + wxCheckSetBrush(dc, wxBrush(highlightColour)); + wxCheckSetPen(dc, wxPen(highlightColour)); + dc.SetTextForeground(highlightTextColour); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); } else { dc.SetTextForeground(attr.GetTextColour()); - dc.SetBackgroundMode(wxTRANSPARENT); + + if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk()) + { + dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); + dc.SetTextBackground(attr.GetBackgroundColour()); + } + else + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); } + wxCoord x_orig = x; while (hasTabs) { // the string has a tab @@ -3740,9 +5129,19 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c bool not_found = true; for (int i = 0; i < tabCount && not_found; ++i) { - nextTabPos = tabArray.Item(i); - if (nextTabPos > tabPos) + 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. + + if (nextTabPos > tabPos || (i == (tabCount - 1))) { + if (nextTabPos <= tabPos) + { + int defaultTabWidth = ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS); + nextTabPos = tabPos + defaultTabWidth; + } + not_found = false; if (selected) { @@ -3751,6 +5150,15 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c dc.DrawRectangle(selRect); } dc.DrawText(stringChunk, x, y); + + if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)) + { + wxPen oldPen = dc.GetPen(); + wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1)); + dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5)); + wxCheckSetPen(dc, oldPen); + } + x = nextTabPos; } } @@ -3766,6 +5174,15 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c dc.DrawRectangle(selRect); } dc.DrawText(str, x, y); + + if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)) + { + wxPen oldPen = dc.GetPen(); + wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1)); + dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5)); + wxCheckSetPen(dc, oldPen); + } + x += w; } return true; @@ -3775,21 +5192,9 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c /// Lay the item out bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style)) { -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); - wxASSERT (para != NULL); - - wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); -#else - wxTextAttrEx textAttr(GetAttributes()); -#endif - - if (textAttr.GetFont().Ok()) - dc.SetFont(textAttr.GetFont()); - - wxCoord w, h; - dc.GetTextExtent(m_text, & w, & h, & m_descent); - m_size = wxSize(w, dc.GetCharHeight()); + // Only lay out if we haven't already cached the size + if (m_size.x == -1) + GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0)); return true; } @@ -3804,30 +5209,52 @@ 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; -#if wxRICHTEXT_USE_DYNAMIC_STYLES wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph); wxASSERT (para != NULL); - wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes()); -#else - wxTextAttrEx textAttr(GetAttributes()); -#endif + 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 - if (textAttr.GetFont().Ok()) - dc.SetFont(textAttr.GetFont()); + bool bScript(false); + wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr)); + if (font.Ok()) + { + if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) ) + { + wxFont textFont = font; + double size = static_cast(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR; + textFont.SetPointSize( static_cast(size) ); + wxCheckSetFont(dc, textFont); + bScript = true; + } + else + { + wxCheckSetFont(dc, font); + } + } + bool haveDescent = false; int startPos = range.GetStart() - GetRange().GetStart(); long len = range.GetLength(); - wxString stringChunk = m_text.Mid(startPos, (size_t) len); + + wxString str(m_text); + wxString toReplace = wxRichTextLineBreakChar; + str.Replace(toReplace, wxT(" ")); + + wxString stringChunk = str.Mid(startPos, (size_t) len); + + if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) + stringChunk.MakeUpper(); + wxCoord w, h; int width = 0; if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND) @@ -3840,40 +5267,123 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz tabArray = textAttr.GetTabs(); int tabCount = tabArray.GetCount(); - + for (int i = 0; i < tabCount; ++i) { int pos = tabArray[i]; pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos); tabArray[i] = pos; } - + int nextTabPos = -1; while (stringChunk.Find(wxT('\t')) >= 0) { + int absoluteWidth = 0; + // the string has a tab // break up the string at the Tab wxString stringFragment = stringChunk.BeforeFirst(wxT('\t')); stringChunk = stringChunk.AfterFirst(wxT('\t')); - 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) { nextTabPos = tabArray.Item(i); - if (nextTabPos > absoluteWidth) + + // Find the next tab position. + // Even if we're at the end of the tab array, we must still process the chunk. + + if (nextTabPos > absoluteWidth || (i == (tabCount - 1))) { + if (nextTabPos <= absoluteWidth) + { + int defaultTabWidth = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS); + nextTabPos = absoluteWidth + defaultTabWidth; + } + notFound = false; width = nextTabPos - position.x; + + if (partialExtents) + partialExtents->Add(width); } } } } - dc.GetTextExtent(stringChunk, & w, & h, & descent); - width += w; - size = wxSize(width, dc.GetCharHeight()); + + if (!stringChunk.IsEmpty()) + { + if (partialExtents) + { + int oldWidth; + if (partialExtents->GetCount() > 0) + oldWidth = (*partialExtents)[partialExtents->GetCount()-1]; + else + oldWidth = 0; + + // Add these partial extents + wxArrayInt p; + dc.GetPartialTextExtents(stringChunk, p); + size_t j; + for (j = 0; j < p.GetCount(); j++) + partialExtents->Add(oldWidth + p[j]); + } + else + { + dc.GetTextExtent(stringChunk, & w, & h, & descent); + width += w; + haveDescent = true; + } + } + + if (partialExtents) + { + int charHeight = dc.GetCharHeight(); + if ((*partialExtents).GetCount() > 0) + w = (*partialExtents)[partialExtents->GetCount()-1]; + else + w = 0; + size = wxSize(w, charHeight); + } + else + { + size = wxSize(width, dc.GetCharHeight()); + } + + if (!haveDescent) + dc.GetTextExtent(wxT("X"), & w, & h, & descent); + + if ( bScript ) + dc.SetFont(font); return true; } @@ -3882,7 +5392,8 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz /// the first part in 'this'. wxRichTextObject* wxRichTextPlainText::DoSplit(long pos) { - int index = pos - GetRange().GetStart(); + long index = pos - GetRange().GetStart(); + if (index < 0 || index >= (int) m_text.length()) return NULL; @@ -3957,6 +5468,7 @@ bool wxRichTextPlainText::Merge(wxRichTextObject* object) if (textObject) { m_text += textObject->GetText(); + wxRichTextApplyStyle(m_attributes, textObject->GetAttributes()); return true; } else @@ -3970,6 +5482,23 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream) stream << m_text << wxT("\n"); } +/// Get the first position from pos that has a line break character. +long wxRichTextPlainText::GetFirstLineBreakPosition(long pos) +{ + int i; + int len = m_text.length(); + int startPos = pos - m_range.GetStart(); + for (i = startPos; i < len; i++) + { + wxChar ch = m_text[i]; + if (ch == wxRichTextLineBreakChar) + { + return i + m_range.GetStart(); + } + } + return -1; +} + /*! * wxRichTextBuffer * This is a kind of box, used to represent the whole buffer @@ -3977,7 +5506,10 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox) -wxList wxRichTextBuffer::sm_handlers; +wxList wxRichTextBuffer::sm_handlers; +wxRichTextRenderer* wxRichTextBuffer::sm_renderer = NULL; +int wxRichTextBuffer::sm_bulletRightMargin = 20; +float wxRichTextBuffer::sm_bulletProportion = (float) 0.3; /// Initialisation void wxRichTextBuffer::Init() @@ -3988,6 +5520,8 @@ void wxRichTextBuffer::Init() m_batchedCommandDepth = 0; m_batchedCommand = NULL; m_suppressUndo = 0; + m_handlerFlags = 0; + m_scale = 1.0; } /// Initialisation @@ -3997,21 +5531,15 @@ wxRichTextBuffer::~wxRichTextBuffer() delete m_batchedCommand; ClearStyleStack(); + ClearEventHandlers(); } -void wxRichTextBuffer::Clear() +void wxRichTextBuffer::ResetAndClearCommands() { - DeleteChildren(); - GetCommandProcessor()->ClearCommands(); - Modify(false); - Invalidate(wxRICHTEXT_ALL); -} + Reset(); -void wxRichTextBuffer::Reset() -{ - DeleteChildren(); - AddParagraph(wxEmptyString); GetCommandProcessor()->ClearCommands(); + Modify(false); Invalidate(wxRICHTEXT_ALL); } @@ -4022,49 +5550,76 @@ void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj) m_styleSheet = obj.m_styleSheet; m_modified = obj.m_modified; - m_batchedCommandDepth = obj.m_batchedCommandDepth; - m_batchedCommand = obj.m_batchedCommand; + m_batchedCommandDepth = 0; + if (m_batchedCommand) + delete m_batchedCommand; + m_batchedCommand = NULL; m_suppressUndo = obj.m_suppressUndo; } +/// Push style sheet to top of stack +bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet) +{ + if (m_styleSheet) + styleSheet->InsertSheet(m_styleSheet); + + SetStyleSheet(styleSheet); + + return true; +} + +/// Pop style sheet from top of stack +wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet() +{ + if (m_styleSheet) + { + wxRichTextStyleSheet* oldSheet = m_styleSheet; + m_styleSheet = oldSheet->GetNextSheet(); + oldSheet->Unlink(); + + return oldSheet; + } + else + return NULL; +} + /// Submit command to insert paragraphs bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx* p = NULL; - wxTextAttrEx paraAttr; + wxRichTextAttr attr(GetDefaultStyle()); + + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos); if (!paraAttr.IsDefault()) p = & paraAttr; } - -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif + else + p = & attr; action->GetNewParagraphs() = paragraphs; - if (p) + if (p && !p->IsDefault()) { - wxRichTextObjectList::compatibility_iterator node = m_children.GetLast(); - while (node) + for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext()) { - wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData(); - obj->SetAttributes(*p); - node = node->GetPrevious(); + wxRichTextObject* child = node->GetData(); + child->SetAttributes(*p); } } action->SetPosition(pos); + wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1); + if (!paragraphs.GetPartialParagraph()) + range.SetEnd(range.GetEnd()+1); + // Set the range we'll need to delete in Undo - action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1)); + action->SetRange(range); SubmitAction(action); @@ -4076,22 +5631,16 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx* p = NULL; - wxTextAttrEx paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { - paraAttr = GetStyleForNewParagraph(pos); + // Get appropriate paragraph style + paraAttr = GetStyleForNewParagraph(pos, false, false); if (!paraAttr.IsDefault()) p = & paraAttr; } -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif - action->GetNewParagraphs().AddParagraphs(text, p); int length = action->GetNewParagraphs().GetRange().GetLength(); @@ -4102,6 +5651,8 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich length --; action->GetNewParagraphs().SetPartialParagraph(true); } + else if (text.length() > 0 && text.Last() == wxT('\n')) + length --; action->SetPosition(pos); @@ -4118,8 +5669,82 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx* p = NULL; - wxTextAttrEx paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; + if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) + { + paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */); + if (!paraAttr.IsDefault()) + p = & paraAttr; + } + + wxRichTextAttr attr(GetDefaultStyle()); + + wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr); + action->GetNewParagraphs().AppendChild(newPara); + action->GetNewParagraphs().UpdateRanges(); + action->GetNewParagraphs().SetPartialParagraph(false); + wxRichTextParagraph* para = GetParagraphAtPosition(pos, false); + long pos1 = pos; + + if (p) + newPara->SetAttributes(*p); + + if (flags & wxRICHTEXT_INSERT_INTERACTIVE) + { + if (para && para->GetRange().GetEnd() == pos) + pos1 ++; + + // Now see if we need to number the paragraph. + if (newPara->GetAttributes().HasBulletNumber()) + { + wxRichTextAttr numberingAttr; + if (FindNextParagraphNumber(para, numberingAttr)) + wxRichTextApplyStyle(newPara->GetAttributes(), (const wxRichTextAttr&) numberingAttr); + } + } + + action->SetPosition(pos); + + // Use the default character style + // Use the default character style + if (!GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst()) + { + // Check whether the default style merely reflects the paragraph/basic style, + // in which case don't apply it. + wxRichTextAttr defaultStyle(GetDefaultStyle()); + wxRichTextAttr toApply; + if (para) + { + wxRichTextAttr combinedAttr = para->GetCombinedAttributes(); + wxRichTextAttr newAttr; + // This filters out attributes that are accounted for by the current + // paragraph/basic style + wxRichTextApplyStyle(toApply, defaultStyle, & combinedAttr); + } + else + toApply = defaultStyle; + + if (!toApply.IsDefault()) + newPara->GetChildren().GetFirst()->GetData()->SetAttributes(toApply); + } + + // Set the range we'll need to delete in Undo + action->SetRange(wxRichTextRange(pos1, pos1)); + + SubmitAction(action); + + return true; +} + +/// Submit command to insert the given image +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); + + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos); @@ -4127,21 +5752,21 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int p = & paraAttr; } -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif + wxRichTextAttr attr(GetDefaultStyle()); + + wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); + if (p) + newPara->SetAttributes(*p); - wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr); + wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara); + newPara->AppendChild(imageObject); + imageObject->SetAttributes(textAttr); action->GetNewParagraphs().AppendChild(newPara); action->GetNewParagraphs().UpdateRanges(); - action->GetNewParagraphs().SetPartialParagraph(false); - action->SetPosition(pos); - if (p) - newPara->SetAttributes(*p); + action->GetNewParagraphs().SetPartialParagraph(true); + + action->SetPosition(pos); // Set the range we'll need to delete in Undo action->SetRange(wxRichTextRange(pos, pos)); @@ -4151,13 +5776,13 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int return true; } -/// Submit command to insert the given image -bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags) +// 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 Image"), wxRICHTEXT_INSERT, this, ctrl, false); + wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert object"), wxRICHTEXT_INSERT, this, ctrl, false); - wxTextAttrEx* p = NULL; - wxTextAttrEx paraAttr; + wxRichTextAttr* p = NULL; + wxRichTextAttr paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) { paraAttr = GetStyleForNewParagraph(pos); @@ -4165,19 +5790,13 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& p = & paraAttr; } -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif + wxRichTextAttr attr(GetDefaultStyle()); wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr); if (p) newPara->SetAttributes(*p); - wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara); - newPara->AppendChild(imageObject); + newPara->AppendChild(object); action->GetNewParagraphs().AppendChild(newPara); action->GetNewParagraphs().UpdateRanges(); @@ -4192,33 +5811,72 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& return true; } - /// Get the style that is appropriate for a new paragraph at this position. /// If the previous paragraph has a paragraph style name, look up the next-paragraph /// style. -wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition) const +wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const { wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); if (para) { - if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) + wxRichTextAttr attr; + bool foundAttributes = false; + + // Look for a matching paragraph style + if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) { wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); - if (paraDef && !paraDef->GetNextStyle().IsEmpty()) + if (paraDef) + { + // If we're not at the end of the paragraph, then we apply THIS style, and not the designated next style. + if (para->GetRange().GetEnd() == pos && !paraDef->GetNextStyle().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); + if (nextParaDef) + { + foundAttributes = true; + attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet()); + } + } + + // If we didn't find the 'next style', use this style instead. + if (!foundAttributes) + { + foundAttributes = true; + attr = paraDef->GetStyleMergedWithBase(GetStyleSheet()); + } + } + } + + // Also apply list style if present + if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet()) + { + wxRichTextListStyleDefinition* listDef = GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName()); + if (listDef) { - wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); - if (nextParaDef) - return nextParaDef->GetStyle(); + 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()); } } - wxRichTextAttr attr(para->GetAttributes()); - int flags = attr.GetFlags(); - // Eliminate character styles - flags &= ( (~ wxTEXT_ATTR_FONT) | + if (!foundAttributes) + { + attr = para->GetAttributes(); + int flags = attr.GetFlags(); + + // Eliminate character styles + flags &= ( (~ wxTEXT_ATTR_FONT) | (~ wxTEXT_ATTR_TEXT_COLOUR) | (~ wxTEXT_ATTR_BACKGROUND_COLOUR) ); - attr.SetFlags(flags); + attr.SetFlags(flags); + } return attr; } @@ -4227,11 +5885,11 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos } /// Submit command to delete this range -bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl) +bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl) { wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl); - action->SetPosition(initialCaretPosition); + action->SetPosition(ctrl->GetCaretPosition()); // Set the range to delete action->SetRange(range); @@ -4239,22 +5897,18 @@ bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long in // 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); } } } @@ -4272,7 +5926,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); } @@ -4292,7 +5946,7 @@ bool wxRichTextBuffer::EndBatchUndo() if (m_batchedCommandDepth == 0) { - GetCommandProcessor()->Submit(m_batchedCommand); + GetCommandProcessor()->Store(m_batchedCommand); m_batchedCommand = NULL; } @@ -4303,7 +5957,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()); @@ -4333,20 +5995,18 @@ bool wxRichTextBuffer::EndSuppressUndo() } /// Begin using a style -bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style) +bool wxRichTextBuffer::BeginStyle(const wxRichTextAttr& style) { - wxTextAttrEx newStyle(GetDefaultStyle()); + wxRichTextAttr newStyle(GetDefaultStyle()); // Save the old default style - m_attributeStack.Append((wxObject*) new wxTextAttrEx(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; } @@ -4360,7 +6020,7 @@ bool wxRichTextBuffer::EndStyle() } wxList::compatibility_iterator node = m_attributeStack.GetLast(); - wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData(); + wxRichTextAttr* attr = (wxRichTextAttr*)node->GetData(); m_attributeStack.Erase(node); SetDefaultStyle(*attr); @@ -4381,18 +6041,15 @@ bool wxRichTextBuffer::EndAllStyles() void wxRichTextBuffer::ClearStyleStack() { for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext()) - delete (wxTextAttrEx*) node->GetData(); + delete (wxRichTextAttr*) node->GetData(); m_attributeStack.Clear(); } /// Begin using bold bool wxRichTextBuffer::BeginBold() { - wxFont font(GetBasicStyle().GetFont()); - font.SetWeight(wxBOLD); - - wxTextAttrEx attr; - attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT); + wxRichTextAttr attr; + attr.SetFontWeight(wxFONTWEIGHT_BOLD); return BeginStyle(attr); } @@ -4400,11 +6057,8 @@ bool wxRichTextBuffer::BeginBold() /// Begin using italic bool wxRichTextBuffer::BeginItalic() { - wxFont font(GetBasicStyle().GetFont()); - font.SetStyle(wxITALIC); - - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC); + wxRichTextAttr attr; + attr.SetFontStyle(wxFONTSTYLE_ITALIC); return BeginStyle(attr); } @@ -4412,11 +6066,8 @@ bool wxRichTextBuffer::BeginItalic() /// Begin using underline bool wxRichTextBuffer::BeginUnderline() { - wxFont font(GetBasicStyle().GetFont()); - font.SetUnderlined(true); - - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE); + wxRichTextAttr attr; + attr.SetFontUnderlined(true); return BeginStyle(attr); } @@ -4424,11 +6075,8 @@ bool wxRichTextBuffer::BeginUnderline() /// Begin using point size bool wxRichTextBuffer::BeginFontSize(int pointSize) { - wxFont font(GetBasicStyle().GetFont()); - font.SetPointSize(pointSize); - - wxTextAttrEx attr; - attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE); + wxRichTextAttr attr; + attr.SetFontSize(pointSize); return BeginStyle(attr); } @@ -4436,8 +6084,7 @@ bool wxRichTextBuffer::BeginFontSize(int pointSize) /// Begin using this font bool wxRichTextBuffer::BeginFont(const wxFont& font) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_FONT); + wxRichTextAttr attr; attr.SetFont(font); return BeginStyle(attr); @@ -4446,7 +6093,7 @@ bool wxRichTextBuffer::BeginFont(const wxFont& font) /// Begin using this colour bool wxRichTextBuffer::BeginTextColour(const wxColour& colour) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR); attr.SetTextColour(colour); @@ -4456,7 +6103,7 @@ bool wxRichTextBuffer::BeginTextColour(const wxColour& colour) /// Begin using alignment bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_ALIGNMENT); attr.SetAlignment(alignment); @@ -4466,7 +6113,7 @@ bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment) /// Begin left indent bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -4476,7 +6123,7 @@ bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent) /// Begin right indent bool wxRichTextBuffer::BeginRightIndent(int rightIndent) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT); attr.SetRightIndent(rightIndent); @@ -4492,7 +6139,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after) if (after != 0) flags |= wxTEXT_ATTR_PARA_SPACING_AFTER; - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(flags); attr.SetParagraphSpacingBefore(before); attr.SetParagraphSpacingAfter(after); @@ -4503,7 +6150,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after) /// Begin line spacing bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) { - wxTextAttrEx attr; + wxRichTextAttr attr; attr.SetFlags(wxTEXT_ATTR_LINE_SPACING); attr.SetLineSpacing(lineSpacing); @@ -4513,8 +6160,8 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) /// Begin numbered bullet bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_LEFT_INDENT); + wxRichTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetBulletNumber(bulletNumber); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -4523,13 +6170,25 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int } /// Begin symbol bullet -bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle) +bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle) +{ + wxRichTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); + attr.SetBulletStyle(bulletStyle); + attr.SetLeftIndent(leftIndent, leftSubIndent); + attr.SetBulletText(symbol); + + return BeginStyle(attr); +} + +/// Begin standard bullet +bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle) { - wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT); + wxRichTextAttr attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); - attr.SetBulletSymbol(symbol); + attr.SetBulletName(bulletName); return BeginStyle(attr); } @@ -4542,8 +6201,7 @@ bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle) wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); if (def) { - wxTextAttrEx attr; - def->GetStyle().CopyTo(attr); + wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); return BeginStyle(attr); } } @@ -4558,14 +6216,49 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle) wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle); if (def) { - wxTextAttrEx attr; - def->GetStyle().CopyTo(attr); + wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet()); + return BeginStyle(attr); + } + } + return false; +} + +/// Begin named list style +bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number) +{ + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle); + if (def) + { + wxRichTextAttr attr(def->GetCombinedStyleForLevel(level)); + + attr.SetBulletNumber(number); + return BeginStyle(attr); } } return false; } +/// Begin URL +bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle) +{ + wxRichTextAttr attr; + + if (!characterStyle.IsEmpty() && GetStyleSheet()) + { + wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); + if (def) + { + attr = def->GetStyleMergedWithBase(GetStyleSheet()); + } + } + attr.SetURL(url); + + return BeginStyle(attr); +} + /// Adds a handler to the end void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler) { @@ -4593,14 +6286,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 @@ -4623,7 +6317,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) @@ -4638,7 +6332,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) @@ -4682,7 +6376,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) { @@ -4716,13 +6410,13 @@ 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(wxTextAttrEx()); - + SetDefaultStyle(wxRichTextAttr()); + handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, filename); Invalidate(wxRICHTEXT_ALL); return success; @@ -4732,22 +6426,26 @@ 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) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, filename); + } else return false; } /// Load from a stream -bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) +bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) { - SetDefaultStyle(wxTextAttrEx()); + SetDefaultStyle(wxRichTextAttr()); + handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, stream); Invalidate(wxRICHTEXT_ALL); return success; @@ -4757,11 +6455,14 @@ 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) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, stream); + } else return false; } @@ -4828,7 +6529,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; } } @@ -4837,9 +6540,23 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxTextDataObject data; wxTheClipboard->GetData(data); wxString text(data.GetText()); - text.Replace(_T("\r\n"), _T("\n")); +#ifdef __WXMSW__ + wxString text2; + text2.Alloc(text.Length()+1); + size_t i; + for (i = 0; i < text.Length(); i++) + { + wxChar ch = text[i]; + if (ch != wxT('\r')) + text2 += ch; + } +#else + wxString text2 = text; +#endif + InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); - InsertTextWithUndo(position+1, text, GetRichTextCtrl()); + if (GetRichTextCtrl()) + GetRichTextCtrl()->ShowPosition(position + text2.Length()); success = true; } @@ -4857,10 +6574,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); @@ -4897,17 +6614,313 @@ bool wxRichTextBuffer::CanPasteFromClipboard() const /// Dumps contents of buffer for debugging purposes void wxRichTextBuffer::Dump() { - wxString text; + wxString text; + { + wxStringOutputStream stream(& text); + wxTextOutputStream textStream(stream); + Dump(textStream); + } + + wxLogDebug(text); +} + +/// Add an event handler +bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler) +{ + m_eventHandlers.Append(handler); + return true; +} + +/// Remove an event handler +bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler) +{ + wxList::compatibility_iterator node = m_eventHandlers.Find(handler); + if (node) + { + m_eventHandlers.Erase(node); + if (deleteHandler) + delete handler; + + return true; + } + else + return false; +} + +/// Clear event handlers +void wxRichTextBuffer::ClearEventHandlers() +{ + m_eventHandlers.Clear(); +} + +/// Send event to event handlers. If sendToAll is true, will send to all event handlers, +/// otherwise will stop at the first successful one. +bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll) +{ + bool success = false; + for (wxList::compatibility_iterator node = m_eventHandlers.GetFirst(); node; node = node->GetNext()) + { + wxEvtHandler* handler = (wxEvtHandler*) node->GetData(); + if (handler->ProcessEvent(event)) + { + success = true; + if (!sendToAll) + return true; + } + } + return success; +} + +/// Set style sheet and notify of the change +bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet) +{ + wxRichTextStyleSheet* oldSheet = GetStyleSheet(); + + wxWindowID id = wxID_ANY; + if (GetRichTextCtrl()) + id = GetRichTextCtrl()->GetId(); + + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id); + event.SetEventObject(GetRichTextCtrl()); + event.SetOldStyleSheet(oldSheet); + event.SetNewStyleSheet(sheet); + event.Allow(); + + if (SendEvent(event) && !event.IsAllowed()) + { + if (sheet != oldSheet) + delete sheet; + + return false; + } + + if (oldSheet && oldSheet != sheet) + delete oldSheet; + + SetStyleSheet(sheet); + + event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED); + event.SetOldStyleSheet(NULL); + event.Allow(); + + return SendEvent(event); +} + +/// Set renderer, deleting old one +void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer) +{ + if (sm_renderer) + delete sm_renderer; + sm_renderer = renderer; +} + +bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect) +{ + if (bulletAttr.GetTextColour().Ok()) + { + wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour())); + wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour())); + } + else + { + wxCheckSetPen(dc, *wxBLACK_PEN); + wxCheckSetBrush(dc, *wxBLACK_BRUSH); + } + + wxFont font; + if (bulletAttr.HasFont()) + { + font = paragraph->GetBuffer()->GetFontTable().FindFont(bulletAttr); + } + else + font = (*wxNORMAL_FONT); + + wxCheckSetFont(dc, font); + + int charHeight = dc.GetCharHeight(); + + int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion()); + int bulletHeight = bulletWidth; + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // Calculate where the bullet should be positioned + y = y + (charHeight+1)/2 - (bulletHeight+1)/2; + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = rect.x + rect.width - bulletWidth - margin; + else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - bulletWidth/2; + + if (bulletAttr.GetBulletName() == wxT("standard/square")) + { + dc.DrawRectangle(x, y, bulletWidth, bulletHeight); + } + else if (bulletAttr.GetBulletName() == wxT("standard/diamond")) + { + wxPoint pts[5]; + pts[0].x = x; pts[0].y = y + bulletHeight/2; + pts[1].x = x + bulletWidth/2; pts[1].y = y; + pts[2].x = x + bulletWidth; pts[2].y = y + bulletHeight/2; + pts[3].x = x + bulletWidth/2; pts[3].y = y + bulletHeight; + + dc.DrawPolygon(4, pts); + } + else if (bulletAttr.GetBulletName() == wxT("standard/triangle")) + { + wxPoint pts[3]; + pts[0].x = x; pts[0].y = y; + pts[1].x = x + bulletWidth; pts[1].y = y + bulletHeight/2; + pts[2].x = x; pts[2].y = y + bulletHeight; + + dc.DrawPolygon(3, pts); + } + else // "standard/circle", and catch-all + { + dc.DrawEllipse(x, y, bulletWidth, bulletHeight); + } + + return true; +} + +bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const 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()) + { + wxRichTextAttr fontAttr; + fontAttr.SetFontSize(attr.GetFontSize()); + fontAttr.SetFontStyle(attr.GetFontStyle()); + fontAttr.SetFontWeight(attr.GetFontWeight()); + fontAttr.SetFontUnderlined(attr.GetFontUnderlined()); + fontAttr.SetFontFaceName(attr.GetBulletFont()); + font = paragraph->GetBuffer()->GetFontTable().FindFont(fontAttr); + } + else if (attr.HasFont()) + font = paragraph->GetBuffer()->GetFontTable().FindFont(attr); + else + font = (*wxNORMAL_FONT); + + wxCheckSetFont(dc, font); + + if (attr.GetTextColour().Ok()) + dc.SetTextForeground(attr.GetTextColour()); + + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + + int charHeight = dc.GetCharHeight(); + wxCoord tw, th; + dc.GetTextExtent(text, & tw, & th); + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = (rect.x + rect.width) - tw - margin; + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - tw/2; + + dc.DrawText(text, x, y); + + return true; + } + else + return false; +} + +bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const 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. + return false; +} + +/// Enumerate the standard bullet names currently supported +bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames) +{ + bulletNames.Add(wxTRANSLATE("standard/circle")); + bulletNames.Add(wxTRANSLATE("standard/square")); + bulletNames.Add(wxTRANSLATE("standard/diamond")); + bulletNames.Add(wxTRANSLATE("standard/triangle")); + + return true; +} + +/*! + * wxRichTextBox + */ + +IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject) + +wxRichTextBox::wxRichTextBox(wxRichTextObject* parent): + wxRichTextCompositeObject(parent) +{ +} + +/// Draw the item +bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + + wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize()); + child->Draw(dc, range, selectionRange, childRect, descent, style); + + node = node->GetNext(); + } + return true; +} + +/// Lay the item out +bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style) +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxRichTextObject* child = node->GetData(); + child->Layout(dc, rect, style); + + node = node->GetNext(); + } + m_dirty = false; + return true; + +} + +/// Copy +void wxRichTextBox::Copy(const wxRichTextBox& obj) +{ + wxRichTextCompositeObject::Copy(obj); +} + +/// 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, wxArrayInt* partialExtents) const +{ + wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); + if (node) { - wxStringOutputStream stream(& text); - wxTextOutputStream textStream(stream); - Dump(textStream); + wxRichTextObject* child = node->GetData(); + return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents); } - - wxLogDebug(text); + else + return false; } - /* * Module to initialise and clean up handlers */ @@ -4919,21 +6932,35 @@ public: wxRichTextModule() {} bool OnInit() { + wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer); wxRichTextBuffer::InitStandardHandlers(); wxRichTextParagraph::InitDefaultTabs(); return true; - }; + } void OnExit() { wxRichTextBuffer::CleanUpHandlers(); wxRichTextDecimalToRoman(-1); wxRichTextParagraph::ClearDefaultTabs(); - }; + wxRichTextCtrl::ClearAvailableFontNames(); + wxRichTextBuffer::SetRenderer(NULL); + } }; IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule) +// If the richtext lib is dynamically loaded after the app has already started +// (such as from wxPython) then the built-in module system will not init this +// module. Provide this function to do it manually. +void wxRichTextModuleInit() +{ + wxModule* module = new wxRichTextModule; + module->Init(); + wxModule::RegisterModule(module); +} + + /*! * Commands for undo/redo * @@ -5011,6 +7038,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); @@ -5019,9 +7098,18 @@ bool wxRichTextAction::Do() { case wxRICHTEXT_INSERT: { - m_buffer->InsertFragment(GetPosition(), m_newParagraphs); + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + + m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs); m_buffer->UpdateRanges(); - m_buffer->Invalidate(GetRange()); + m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd())); long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength(); @@ -5031,20 +7119,56 @@ bool wxRichTextAction::Do() // Don't take into account the last newline if (m_newParagraphs.GetPartialParagraph()) newCaretPosition --; + else + if (m_newParagraphs.GetChildren().GetCount() > 1) + { + wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData(); + if (p->GetRange().GetLength() == 1) + newCaretPosition --; + } newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); - 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, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } @@ -5055,6 +7179,15 @@ bool wxRichTextAction::Do() UpdateAppearance(GetPosition()); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); + break; } default: @@ -5072,25 +7205,55 @@ bool wxRichTextAction::Undo() { case wxRICHTEXT_INSERT: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); long newCaretPosition = GetPosition() - 1; - // if (m_newParagraphs.GetPartialParagraph()) - // newCaretPosition --; - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs); m_buffer->UpdateRanges(); m_buffer->Invalidate(GetRange()); - UpdateAppearance(GetPosition(), true /* send update event */); + UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); + + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); break; } @@ -5101,6 +7264,15 @@ bool wxRichTextAction::Undo() UpdateAppearance(GetPosition()); + wxRichTextEvent cmdEvent( + wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, + m_ctrl ? m_ctrl->GetId() : -1); + cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer); + cmdEvent.SetRange(GetRange()); + cmdEvent.SetPosition(GetRange().GetStart()); + + m_buffer->SendEvent(cmdEvent); + break; } default: @@ -5111,7 +7283,7 @@ bool wxRichTextAction::Undo() } /// Update the control appearance -void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent) +void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* WXUNUSED(optimizationLineCharPositions), wxArrayInt* WXUNUSED(optimizationLineYPositions), bool WXUNUSED(isDoCmd)) { if (m_ctrl) { @@ -5119,11 +7291,14 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent if (!m_ctrl->IsFrozen()) { m_ctrl->LayoutContent(); - m_ctrl->PositionCaret(); + // TODO Refresh the whole client area now m_ctrl->Refresh(false); +#if wxRICHTEXT_USE_OWN_CARET + m_ctrl->PositionCaret(); +#endif if (sendUpdateEvent) - m_ctrl->SendTextUpdatedEvent(); + wxTextCtrl::SendTextUpdatedEvent(m_ctrl); } } } @@ -5179,1643 +7354,2004 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range) } /*! - * wxRichTextImage implementation - * This object represents an image. + * wxRichTextImage implementation + * This object represents an image. + */ + +IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject) + +wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxRichTextAttr* charStyle): + wxRichTextObject(parent) +{ + m_imageBlock.MakeImageBlockDefaultQuality(image, wxBITMAP_TYPE_PNG); + if (charStyle) + SetAttributes(*charStyle); +} + +wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxRichTextAttr* charStyle): + wxRichTextObject(parent) +{ + m_imageBlock = imageBlock; + if (charStyle) + SetAttributes(*charStyle); +} + +/// Create a cached image at the required size +bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache) +{ + if (resetCache || !m_imageCache.IsOk() /* || m_imageCache.GetWidth() != size.x || m_imageCache.GetHeight() != size.y */) + { + if (!m_imageBlock.IsOk()) + return false; + + wxImage image; + m_imageBlock.Load(image); + if (!image.IsOk()) + return false; + + 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)) +{ + // Don't need cached size AFAIK + // wxSize size = GetCachedSize(); + if (!LoadImageCache(dc)) + return false; + + int y = rect.y + (rect.height - m_imageCache.GetHeight()); + + dc.DrawBitmap(m_imageCache, rect.x, y, true); + + if (selectionRange.Contains(range.GetStart())) + { + wxCheckSetBrush(dc, *wxBLACK_BRUSH); + wxCheckSetPen(dc, *wxBLACK_PEN); + dc.SetLogicalFunction(wxINVERT); + dc.DrawRectangle(rect); + dc.SetLogicalFunction(wxCOPY); + } + + return true; +} + +/// Lay the item out +bool wxRichTextImage::Layout(wxDC& dc, const wxRect& rect, int WXUNUSED(style)) +{ + if (!LoadImageCache(dc)) + return false; + + 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& dc, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const +{ + if (!range.IsWithin(GetRange())) + return false; + + if (!((wxRichTextImage*)this)->LoadImageCache(dc)) + { + size.x = 0; size.y = 0; + if (partialExtents) + partialExtents->Add(0); + return false; + } + + int width = m_imageCache.GetWidth(); + int height = m_imageCache.GetHeight(); + + if (partialExtents) + partialExtents->Add(width); + + size.x = width; + size.y = height; + + return true; +} + +/// Copy +void wxRichTextImage::Copy(const wxRichTextImage& obj) +{ + wxRichTextObject::Copy(obj); + + 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 wxRichTextAttr& attr1, const wxRichTextAttr& attr2) +{ + return (attr1 == attr2); +} + +// Partial equality test taking flags into account +bool wxTextAttrEqPartial(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2) +{ + return attr1.EqPartial(attr2); +} + +/// Compare tabs +bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) +{ + if (tabs1.GetCount() != tabs2.GetCount()) + return false; + + size_t i; + for (i = 0; i < tabs1.GetCount(); i++) + { + if (tabs1[i] != tabs2[i]) + return false; + } + return true; +} + +bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) +{ + return destStyle.Apply(style, compareWith); +} + +// Remove attributes +bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& 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 wxRichTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB); +} + +/// Compare two bitlists +bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags) +{ + return wxRichTextAttr::BitlistsEqPartial(valueA, valueB, flags); +} + +/// Split into paragraph and character styles +bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle) +{ + return wxRichTextAttr::SplitParaCharStyles(style, parStyle, charStyle); +} + +/// Convert a decimal to Roman numerals +wxString wxRichTextDecimalToRoman(long n) +{ + static wxArrayInt decimalNumbers; + static wxArrayString romanNumbers; + + // Clean up arrays + if (n == -1) + { + decimalNumbers.Clear(); + romanNumbers.Clear(); + return wxEmptyString; + } + + if (decimalNumbers.GetCount() == 0) + { + #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r); + + wxRichTextAddDecRom(1000, wxT("M")); + wxRichTextAddDecRom(900, wxT("CM")); + wxRichTextAddDecRom(500, wxT("D")); + wxRichTextAddDecRom(400, wxT("CD")); + wxRichTextAddDecRom(100, wxT("C")); + wxRichTextAddDecRom(90, wxT("XC")); + wxRichTextAddDecRom(50, wxT("L")); + wxRichTextAddDecRom(40, wxT("XL")); + wxRichTextAddDecRom(10, wxT("X")); + wxRichTextAddDecRom(9, wxT("IX")); + wxRichTextAddDecRom(5, wxT("V")); + wxRichTextAddDecRom(4, wxT("IV")); + wxRichTextAddDecRom(1, wxT("I")); + } + + int i = 0; + wxString roman; + + while (n > 0 && i < 13) + { + if (n >= decimalNumbers[i]) + { + n -= decimalNumbers[i]; + roman += romanNumbers[i]; + } + else + { + i ++; + } + } + if (roman.IsEmpty()) + roman = wxT("0"); + return roman; +} + +/*! + * wxRichTextFileHandler + * Base class for file handlers */ -IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject) +IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject) -wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent): - wxRichTextObject(parent) +#if wxUSE_FFILE && wxUSE_STREAMS +bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename) { - m_image = image; -} + wxFFileInputStream stream(filename); + if (stream.Ok()) + return LoadFile(buffer, stream); -wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent): - wxRichTextObject(parent) -{ - m_imageBlock = imageBlock; - m_imageBlock.Load(m_image); + return false; } -/// Load wxImage from the block -bool wxRichTextImage::LoadFromBlock() +bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) { - m_imageBlock.Load(m_image); - return m_imageBlock.Ok(); + wxFFileOutputStream stream(filename); + if (stream.Ok()) + return SaveFile(buffer, stream); + + return false; } +#endif // wxUSE_FFILE && wxUSE_STREAMS -/// Make block from the wxImage -bool wxRichTextImage::MakeBlock() +/// Can we handle this filename (if using files)? By default, checks the extension. +bool wxRichTextFileHandler::CanHandle(const wxString& filename) const { - if (m_imageBlock.GetImageType() == wxBITMAP_TYPE_ANY || m_imageBlock.GetImageType() == -1) - m_imageBlock.SetImageType(wxBITMAP_TYPE_PNG); + wxString path, file, ext; + wxFileName::SplitPath(filename, & path, & file, & ext); - m_imageBlock.MakeImageBlock(m_image, m_imageBlock.GetImageType()); - return m_imageBlock.Ok(); + return (ext.Lower() == GetExtension()); } +/*! + * wxRichTextTextHandler + * Plain text handler + */ -/// 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(); +IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler) - if (!m_image.Ok()) +#if wxUSE_STREAMS +bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) +{ + if (!stream.IsOk()) return false; - if (m_image.Ok() && !m_bitmap.Ok()) - m_bitmap = wxBitmap(m_image); - - int y = rect.y + (rect.height - m_image.GetHeight()); - - if (m_bitmap.Ok()) - dc.DrawBitmap(m_bitmap, rect.x, y, true); + wxString str; + int lastCh = 0; - if (selectionRange.Contains(range.GetStart())) + while (!stream.Eof()) { - dc.SetBrush(*wxBLACK_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.SetLogicalFunction(wxINVERT); - dc.DrawRectangle(rect); - dc.SetLogicalFunction(wxCOPY); - } + int ch = stream.GetC(); - return true; -} + if (!stream.Eof()) + { + if (ch == 10 && lastCh != 13) + str += wxT('\n'); -/// Lay the item out -bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style)) -{ - if (!m_image.Ok()) - LoadFromBlock(); + if (ch > 0 && ch != 10) + str += wxChar(ch); - if (m_image.Ok()) - { - SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight())); - SetPosition(rect.GetPosition()); + lastCh = ch; + } } + buffer->ResetAndClearCommands(); + buffer->Clear(); + buffer->AddParagraphs(str); + buffer->UpdateRanges(); + 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 wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { - if (!range.IsWithin(GetRange())) - return false; - - if (!m_image.Ok()) + if (!stream.IsOk()) return false; - size.x = m_image.GetWidth(); - size.y = m_image.GetHeight(); + wxString text = buffer->GetText(); - return true; -} + wxString newLine = wxRichTextLineBreakChar; + text.Replace(newLine, wxT("\n")); -/// Copy -void wxRichTextImage::Copy(const wxRichTextImage& obj) -{ - wxRichTextObject::Copy(obj); + wxCharBuffer buf = text.ToAscii(); - m_image = obj.m_image; - m_imageBlock = obj.m_imageBlock; + stream.Write((const char*) buf, text.length()); + return true; } +#endif // wxUSE_STREAMS -/*! - * Utilities - * +/* + * Stores information about an image, in binary in-memory form */ -/// Compare two attribute objects -bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2) -{ - return ( - attr1.GetTextColour() == attr2.GetTextColour() && - attr1.GetBackgroundColour() == attr2.GetBackgroundColour() && - attr1.GetFont() == attr2.GetFont() && - attr1.GetAlignment() == attr2.GetAlignment() && - attr1.GetLeftIndent() == attr2.GetLeftIndent() && - attr1.GetRightIndent() == attr2.GetRightIndent() && - attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() && - wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()) && - attr1.GetLineSpacing() == attr2.GetLineSpacing() && - attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() && - attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() && - attr1.GetBulletStyle() == attr2.GetBulletStyle() && - attr1.GetBulletNumber() == attr2.GetBulletNumber() && - attr1.GetBulletSymbol() == attr2.GetBulletSymbol() && - attr1.GetBulletFont() == attr2.GetBulletFont() && - attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && - attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName()); -} - -bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2) +wxRichTextImageBlock::wxRichTextImageBlock() { - return ( - attr1.GetTextColour() == attr2.GetTextColour() && - attr1.GetBackgroundColour() == attr2.GetBackgroundColour() && - attr1.GetFont().GetPointSize() == attr2.GetFontSize() && - attr1.GetFont().GetStyle() == attr2.GetFontStyle() && - attr1.GetFont().GetWeight() == attr2.GetFontWeight() && - attr1.GetFont().GetFaceName() == attr2.GetFontFaceName() && - attr1.GetFont().GetUnderlined() == attr2.GetFontUnderlined() && - attr1.GetAlignment() == attr2.GetAlignment() && - attr1.GetLeftIndent() == attr2.GetLeftIndent() && - attr1.GetRightIndent() == attr2.GetRightIndent() && - attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() && - wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()) && - attr1.GetLineSpacing() == attr2.GetLineSpacing() && - attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() && - attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() && - attr1.GetBulletStyle() == attr2.GetBulletStyle() && - attr1.GetBulletNumber() == attr2.GetBulletNumber() && - attr1.GetBulletSymbol() == attr2.GetBulletSymbol() && - attr1.GetBulletFont() == attr2.GetBulletFont() && - attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && - attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName()); -} - -/// Compare two attribute objects, but take into account the flags -/// specifying attributes of interest. -bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, int flags) -{ - if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour()) - return false; - - if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour()) - return false; + Init(); +} - if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetFaceName() != attr2.GetFont().GetFaceName()) - return false; +wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject() +{ + Init(); + Copy(block); +} - if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetPointSize() != attr2.GetFont().GetPointSize()) - return false; +wxRichTextImageBlock::~wxRichTextImageBlock() +{ + wxDELETEA(m_data); +} - if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetWeight() != attr2.GetFont().GetWeight()) - return false; +void wxRichTextImageBlock::Init() +{ + m_data = NULL; + m_dataSize = 0; + m_imageType = wxBITMAP_TYPE_INVALID; +} - if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetStyle() != attr2.GetFont().GetStyle()) - return false; +void wxRichTextImageBlock::Clear() +{ + wxDELETEA(m_data); + m_dataSize = 0; + m_imageType = wxBITMAP_TYPE_INVALID; +} - if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() && - attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined()) - return false; - if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment()) - return false; +// Load the original image into a memory block. +// If the image is not a JPEG, we must convert it into a JPEG +// to conserve space. +// 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. - if ((flags & wxTEXT_ATTR_LEFT_INDENT) && - ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent()))) - return false; +bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType, + wxImage& image, bool convertToJPEG) +{ + m_imageType = imageType; - if ((flags & wxTEXT_ATTR_RIGHT_INDENT) && - (attr1.GetRightIndent() != attr2.GetRightIndent())) - return false; + wxString filenameToRead(filename); + bool removeFile = false; - if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && - (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) - return false; + if (imageType == wxBITMAP_TYPE_INVALID) + return false; // Could not determine image type - if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && - (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) - return false; + if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG) + { + wxString tempFile = + wxFileName::CreateTempFileName(_("image")); - if ((flags & wxTEXT_ATTR_LINE_SPACING) && - (attr1.GetLineSpacing() != attr2.GetLineSpacing())) - return false; + wxASSERT(!tempFile.IsEmpty()); - if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && - (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) - return false; + image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG); + filenameToRead = tempFile; + removeFile = true; - if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && - (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) + m_imageType = wxBITMAP_TYPE_JPEG; + } + wxFile file; + if (!file.Open(filenameToRead)) return false; - if ((flags & wxTEXT_ATTR_BULLET_STYLE) && - (attr1.GetBulletStyle() != attr2.GetBulletStyle())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_NUMBER) && - (attr1.GetBulletNumber() != attr2.GetBulletNumber())) - return false; - - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) - return false; + m_dataSize = (size_t) file.Length(); + file.Close(); - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletFont() != attr2.GetBulletFont())) - return false; + if (m_data) + delete[] m_data; + m_data = ReadBlock(filenameToRead, m_dataSize); - if ((flags & wxTEXT_ATTR_TABS) && - !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) - return false; + if (removeFile) + wxRemoveFile(filenameToRead); - return true; + return (m_data != NULL); } -bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, int flags) +// Make an image block from the wxImage in the given +// format. +bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality) { - if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour()) - return false; - - if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour()) - return false; - - if ((flags & (wxTEXT_ATTR_FONT)) && !attr1.GetFont().Ok()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && - attr1.GetFont().GetFaceName() != attr2.GetFontFaceName()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && - attr1.GetFont().GetPointSize() != attr2.GetFontSize()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && - attr1.GetFont().GetWeight() != attr2.GetFontWeight()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && - attr1.GetFont().GetStyle() != attr2.GetFontStyle()) - return false; - - if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && - attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined()) - return false; + image.SetOption(wxT("quality"), quality); - if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment()) - return false; + if (imageType == wxBITMAP_TYPE_INVALID) + return false; // Could not determine image type - if ((flags & wxTEXT_ATTR_LEFT_INDENT) && - ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent()))) - return false; + return DoMakeImageBlock(image, imageType); +} - if ((flags & wxTEXT_ATTR_RIGHT_INDENT) && - (attr1.GetRightIndent() != attr2.GetRightIndent())) - return false; +// 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 - if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && - (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) - return false; + return DoMakeImageBlock(image, imageType); +} - if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && - (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) +// Makes the image block +bool wxRichTextImageBlock::DoMakeImageBlock(const wxImage& image, wxBitmapType imageType) +{ + wxMemoryOutputStream memStream; + if (!image.SaveFile(memStream, imageType)) + { return false; + } - if ((flags & wxTEXT_ATTR_LINE_SPACING) && - (attr1.GetLineSpacing() != attr2.GetLineSpacing())) - return false; + unsigned char* block = new unsigned char[memStream.GetSize()]; + if (!block) + return NULL; - if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && - (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) - return false; + if (m_data) + delete[] m_data; + m_data = block; - if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && - (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) - return false; + m_imageType = imageType; + m_dataSize = memStream.GetSize(); - if ((flags & wxTEXT_ATTR_BULLET_STYLE) && - (attr1.GetBulletStyle() != attr2.GetBulletStyle())) - return false; + memStream.CopyTo(m_data, m_dataSize); - if ((flags & wxTEXT_ATTR_BULLET_NUMBER) && - (attr1.GetBulletNumber() != attr2.GetBulletNumber())) - return false; + return (m_data != NULL); +} - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) - return false; +// Write to a file +bool wxRichTextImageBlock::Write(const wxString& filename) +{ + return WriteBlock(filename, m_data, m_dataSize); +} - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletFont() != attr2.GetBulletFont())) - return false; +void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block) +{ + m_imageType = block.m_imageType; + wxDELETEA(m_data); + m_dataSize = block.m_dataSize; + if (m_dataSize == 0) + return; - if ((flags & wxTEXT_ATTR_TABS) && - !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) - return false; + m_data = new unsigned char[m_dataSize]; + unsigned int i; + for (i = 0; i < m_dataSize; i++) + m_data[i] = block.m_data[i]; +} - return true; +//// Operators +void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block) +{ + Copy(block); } -/// Compare tabs -bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2) +// Load a wxImage from the block +bool wxRichTextImageBlock::Load(wxImage& image) { - if (tabs1.GetCount() != tabs2.GetCount()) + if (!m_data) return false; - size_t i; - for (i = 0; i < tabs1.GetCount(); i++) - { - if (tabs1[i] != tabs2[i]) - return false; - } - return true; -} - + // Read in the image. +#if wxUSE_STREAMS + wxMemoryInputStream mstream(m_data, m_dataSize); + bool success = image.LoadFile(mstream, GetImageType()); +#else + wxString tempFile = wxFileName::CreateTempFileName(_("image")); + wxASSERT(!tempFile.IsEmpty()); -/// Apply one style to another -bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style) -{ - // Whole font - if (style.GetFont().Ok() && ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT))) - destStyle.SetFont(style.GetFont()); - else if (style.GetFont().Ok()) + if (!WriteBlock(tempFile, m_data, m_dataSize)) { - wxFont font = destStyle.GetFont(); + return false; + } + success = image.LoadFile(tempFile, GetImageType()); + wxRemoveFile(tempFile); +#endif - if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); - font.SetFaceName(style.GetFont().GetFaceName()); - } + return success; +} - if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); - font.SetPointSize(style.GetFont().GetPointSize()); - } +// Write data in hex to a stream +bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) +{ + const int bufSize = 512; + char buf[bufSize+1]; - if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) + int left = m_dataSize; + int n, i, j; + j = 0; + while (left > 0) + { + if (left*2 > bufSize) { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); - font.SetStyle(style.GetFont().GetStyle()); + n = bufSize; left -= (bufSize/2); } - - if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) + else { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); - font.SetWeight(style.GetFont().GetWeight()); + n = left*2; left = 0; } - if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) + char* b = buf; + for (i = 0; i < (n/2); i++) { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); - font.SetUnderlined(style.GetFont().GetUnderlined()); + wxDecToHex(m_data[j], b, b+1); + b += 2; j ++; } - if (font != destStyle.GetFont()) - { - int oldFlags = destStyle.GetFlags(); - - destStyle.SetFont(font); - - destStyle.SetFlags(oldFlags); - } + buf[n] = 0; + stream.Write((const char*) buf, n); } + return true; +} - if ( style.GetTextColour().Ok() && style.HasTextColour()) - destStyle.SetTextColour(style.GetTextColour()); - - if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); - - if (style.HasAlignment()) - destStyle.SetAlignment(style.GetAlignment()); - - if (style.HasTabs()) - destStyle.SetTabs(style.GetTabs()); - - if (style.HasLeftIndent()) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); +// Read data in hex from a stream +bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType) +{ + int dataSize = length/2; - if (style.HasRightIndent()) - destStyle.SetRightIndent(style.GetRightIndent()); + if (m_data) + delete[] m_data; - if (style.HasParagraphSpacingAfter()) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); + // create a null terminated temporary string: + char str[3]; + str[2] = '\0'; - if (style.HasParagraphSpacingBefore()) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); + m_data = new unsigned char[dataSize]; + int i; + for (i = 0; i < dataSize; i ++) + { + str[0] = (char)stream.GetC(); + str[1] = (char)stream.GetC(); - if (style.HasLineSpacing()) - destStyle.SetLineSpacing(style.GetLineSpacing()); + m_data[i] = (unsigned char)wxHexToDec(str); + } - if (style.HasCharacterStyleName()) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); + m_dataSize = dataSize; + m_imageType = imageType; - if (style.HasParagraphStyleName()) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); + return true; +} - if (style.HasBulletStyle()) - { - destStyle.SetBulletStyle(style.GetBulletStyle()); - destStyle.SetBulletSymbol(style.GetBulletSymbol()); - destStyle.SetBulletFont(style.GetBulletFont()); - } +// Allocate and read from stream as a block of memory +unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size) +{ + unsigned char* block = new unsigned char[size]; + if (!block) + return NULL; - if (style.HasBulletNumber()) - destStyle.SetBulletNumber(style.GetBulletNumber()); + stream.Read(block, size); - return true; + return block; } -bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style) +unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size) { - wxTextAttrEx destStyle2; - destStyle.CopyTo(destStyle2); - wxRichTextApplyStyle(destStyle2, style); - destStyle = destStyle2; - return true; + wxFileInputStream stream(filename); + if (!stream.Ok()) + return NULL; + + return ReadBlock(stream, size); } -bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) +// Write memory block to stream +bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size) { - // Whole font. Avoiding setting individual attributes if possible, since - // it recreates the font each time. - if (((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) && !compareWith) - { - destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT, - style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName())); - } - else if (style.GetFlags() & (wxTEXT_ATTR_FONT)) - { - wxFont font = destStyle.GetFont(); + stream.Write((void*) block, size); + return stream.IsOk(); - if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE) - { - if (compareWith && compareWith->HasFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()) - { - // The same as currently displayed, so don't set - } - else - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE); - font.SetFaceName(style.GetFontFaceName()); - } - } +} - if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE) - { - if (compareWith && compareWith->HasSize() && compareWith->GetFontSize() == style.GetFontSize()) - { - // The same as currently displayed, so don't set - } - else - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE); - font.SetPointSize(style.GetFontSize()); - } - } +// Write memory block to file +bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size) +{ + wxFileOutputStream outStream(filename); + if (!outStream.Ok()) + return false; - if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC) - { - if (compareWith && compareWith->HasItalic() && compareWith->GetFontStyle() == style.GetFontStyle()) - { - // The same as currently displayed, so don't set - } - else - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC); - font.SetStyle(style.GetFontStyle()); - } - } + return WriteBlock(outStream, block, size); +} - if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT) - { - if (compareWith && compareWith->HasWeight() && compareWith->GetFontWeight() == style.GetFontWeight()) - { - // The same as currently displayed, so don't set - } - else - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT); - font.SetWeight(style.GetFontWeight()); - } - } +// Gets the extension for the block's type +wxString wxRichTextImageBlock::GetExtension() const +{ + wxImageHandler* handler = wxImage::FindHandler(GetImageType()); + if (handler) + return handler->GetExtension(); + else + return wxEmptyString; +} - if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE) - { - if (compareWith && compareWith->HasUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()) - { - // The same as currently displayed, so don't set - } - else - { - destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE); - font.SetUnderlined(style.GetFontUnderlined()); - } - } +#if wxUSE_DATAOBJ - if (font != destStyle.GetFont()) - { - int oldFlags = destStyle.GetFlags(); +/*! + * The data object for a wxRichTextBuffer + */ - destStyle.SetFont(font); +const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape"); - destStyle.SetFlags(oldFlags); - } - } +wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer) +{ + m_richTextBuffer = richTextBuffer; - if (style.GetTextColour().Ok() && style.HasTextColour()) - { - if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) - destStyle.SetTextColour(style.GetTextColour()); - } + // this string should uniquely identify our format, but is otherwise + // arbitrary + m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId()); - if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) - { - if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour())) - destStyle.SetBackgroundColour(style.GetBackgroundColour()); - } + SetFormat(m_formatRichTextBuffer); +} - if (style.HasAlignment()) - { - if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment())) - destStyle.SetAlignment(style.GetAlignment()); - } +wxRichTextBufferDataObject::~wxRichTextBufferDataObject() +{ + delete m_richTextBuffer; +} - if (style.HasTabs()) - { - if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs()))) - destStyle.SetTabs(style.GetTabs()); - } +// after a call to this function, the richTextBuffer is owned by the caller and it +// is responsible for deleting it! +wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer() +{ + wxRichTextBuffer* richTextBuffer = m_richTextBuffer; + m_richTextBuffer = NULL; - if (style.HasLeftIndent()) - { - if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent() - && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent())) - destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent()); - } + return richTextBuffer; +} - if (style.HasRightIndent()) - { - if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent())) - destStyle.SetRightIndent(style.GetRightIndent()); - } +wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const +{ + return m_formatRichTextBuffer; +} - if (style.HasParagraphSpacingAfter()) - { - if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter())) - destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter()); - } +size_t wxRichTextBufferDataObject::GetDataSize() const +{ + if (!m_richTextBuffer) + return 0; - if (style.HasParagraphSpacingBefore()) - { - if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore())) - destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore()); - } + wxString bufXML; - if (style.HasLineSpacing()) { - if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing())) - destStyle.SetLineSpacing(style.GetLineSpacing()); + wxStringOutputStream stream(& bufXML); + if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) + { + wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); + return 0; + } } - if (style.HasCharacterStyleName()) - { - if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName())) - destStyle.SetCharacterStyleName(style.GetCharacterStyleName()); - } +#if wxUSE_UNICODE + wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); + return strlen(buffer) + 1; +#else + return bufXML.Length()+1; +#endif +} - if (style.HasParagraphStyleName()) - { - if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName())) - destStyle.SetParagraphStyleName(style.GetParagraphStyleName()); - } +bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const +{ + if (!pBuf || !m_richTextBuffer) + return false; - if (style.HasBulletStyle()) - { - if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle())) - destStyle.SetBulletStyle(style.GetBulletStyle()); - } + wxString bufXML; - if (style.HasBulletSymbol()) { - if (!(compareWith && compareWith->HasBulletSymbol() && compareWith->GetBulletSymbol() == style.GetBulletSymbol())) + wxStringOutputStream stream(& bufXML); + if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) { - destStyle.SetBulletSymbol(style.GetBulletSymbol()); - destStyle.SetBulletFont(style.GetBulletFont()); + wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); + return 0; } } - if (style.HasBulletNumber()) - { - if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber())) - destStyle.SetBulletNumber(style.GetBulletNumber()); - } +#if wxUSE_UNICODE + wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); + size_t len = strlen(buffer); + memcpy((char*) pBuf, (const char*) buffer, len); + ((char*) pBuf)[len] = 0; +#else + size_t len = bufXML.Length(); + memcpy((char*) pBuf, (const char*) bufXML.c_str(), len); + ((char*) pBuf)[len] = 0; +#endif return true; } -void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font) +bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) { - long flags = attr.GetFlags(); - attr.SetFont(font); - attr.SetFlags(flags); -} + wxDELETE(m_richTextBuffer); -/// Convert a decimal to Roman numerals -wxString wxRichTextDecimalToRoman(long n) -{ - static wxArrayInt decimalNumbers; - static wxArrayString romanNumbers; + wxString bufXML((const char*) buf, wxConvUTF8); - // Clean up arrays - if (n == -1) - { - decimalNumbers.Clear(); - romanNumbers.Clear(); - return wxEmptyString; - } + m_richTextBuffer = new wxRichTextBuffer; - if (decimalNumbers.GetCount() == 0) + wxStringInputStream stream(bufXML); + if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML)) { - #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r); + wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler.")); - wxRichTextAddDecRom(1000, wxT("M")); - wxRichTextAddDecRom(900, wxT("CM")); - wxRichTextAddDecRom(500, wxT("D")); - wxRichTextAddDecRom(400, wxT("CD")); - wxRichTextAddDecRom(100, wxT("C")); - wxRichTextAddDecRom(90, wxT("XC")); - wxRichTextAddDecRom(50, wxT("L")); - wxRichTextAddDecRom(40, wxT("XL")); - wxRichTextAddDecRom(10, wxT("X")); - wxRichTextAddDecRom(9, wxT("IX")); - wxRichTextAddDecRom(5, wxT("V")); - wxRichTextAddDecRom(4, wxT("IV")); - wxRichTextAddDecRom(1, wxT("I")); + wxDELETE(m_richTextBuffer); + + return false; } + return true; +} + +#endif + // wxUSE_DATAOBJ + + +/* + * wxRichTextFontTable + * Manages quick access to a pool of fonts for rendering rich text + */ - int i = 0; - wxString roman; +WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxFont, wxRichTextFontTableHashMap, class WXDLLIMPEXP_RICHTEXT); - while (n > 0 && i < 13) +class wxRichTextFontTableData: public wxObjectRefData +{ +public: + wxRichTextFontTableData() {} + + wxFont FindFont(const wxRichTextAttr& fontSpec); + + wxRichTextFontTableHashMap m_hashMap; +}; + +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())); + wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec); + + if ( entry == m_hashMap.end() ) { - if (n >= decimalNumbers[i]) - { - n -= decimalNumbers[i]; - roman += romanNumbers[i]; - } - else - { - i ++; - } + wxFont font(fontSpec.GetFontSize(), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str()); + m_hashMap[spec] = font; + return font; + } + else + { + return entry->second; } - if (roman.IsEmpty()) - roman = wxT("0"); - return roman; } +IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject) -/*! - * wxRichTextAttr stores attributes without a wxFont object, so is a much more - * efficient way to query styles. - */ +wxRichTextFontTable::wxRichTextFontTable() +{ + m_refData = new wxRichTextFontTableData; +} -// ctors -wxRichTextAttr::wxRichTextAttr(const wxColour& colText, - const wxColour& colBack, - wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack) +wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table) + : wxObject() { - Init(); + (*this) = table; +} - if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; - if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; - if (alignment != wxTEXT_ALIGNMENT_DEFAULT) - m_flags |= wxTEXT_ATTR_ALIGNMENT; +wxRichTextFontTable::~wxRichTextFontTable() +{ + UnRef(); } -wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr) +bool wxRichTextFontTable::operator == (const wxRichTextFontTable& table) const { - Init(); + return (m_refData == table.m_refData); +} + +void wxRichTextFontTable::operator= (const wxRichTextFontTable& table) +{ + Ref(table); +} - (*this) = attr; +wxFont wxRichTextFontTable::FindFont(const wxRichTextAttr& fontSpec) +{ + wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData; + if (data) + return data->FindFont(fontSpec); + else + return wxFont(); +} + +void wxRichTextFontTable::Clear() +{ + wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData; + if (data) + data->m_hashMap.clear(); } -// operations -void wxRichTextAttr::Init() +// wxTextBoxAttr + + +void wxTextBoxAttr::Reset() { - m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT; m_flags = 0; - m_leftIndent = 0; - m_leftSubIndent = 0; - m_rightIndent = 0; - - m_fontSize = 12; - m_fontStyle = wxNORMAL; - m_fontWeight = wxNORMAL; - m_fontUnderlined = false; - - m_paragraphSpacingAfter = 0; - m_paragraphSpacingBefore = 0; - m_lineSpacing = 0; - m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; - m_bulletNumber = 0; - m_bulletSymbol = wxT('*'); -} - -// operators -void wxRichTextAttr::operator= (const wxRichTextAttr& attr) -{ - m_colText = attr.m_colText; - m_colBack = attr.m_colBack; - m_textAlignment = attr.m_textAlignment; - m_leftIndent = attr.m_leftIndent; - m_leftSubIndent = attr.m_leftSubIndent; - m_rightIndent = attr.m_rightIndent; - m_tabs = attr.m_tabs; - m_flags = attr.m_flags; - - m_fontSize = attr.m_fontSize; - m_fontStyle = attr.m_fontStyle; - m_fontWeight = attr.m_fontWeight; - m_fontUnderlined = attr.m_fontUnderlined; - m_fontFaceName = attr.m_fontFaceName; - - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_characterStyleName = attr.m_characterStyleName; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; - m_bulletFont = attr.m_bulletFont; -} - -// operators -void wxRichTextAttr::operator= (const wxTextAttrEx& attr) -{ - m_colText = attr.GetTextColour(); - m_colBack = attr.GetBackgroundColour(); - m_textAlignment = attr.GetAlignment(); - m_leftIndent = attr.GetLeftIndent(); - m_leftSubIndent = attr.GetLeftSubIndent(); - m_rightIndent = attr.GetRightIndent(); - m_tabs = attr.GetTabs(); - m_flags = attr.GetFlags(); - - m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter(); - m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore(); - m_lineSpacing = attr.GetLineSpacing(); - m_characterStyleName = attr.GetCharacterStyleName(); - m_paragraphStyleName = attr.GetParagraphStyleName(); - m_bulletStyle = attr.GetBulletStyle(); - m_bulletNumber = attr.GetBulletNumber(); - m_bulletSymbol = attr.GetBulletSymbol(); - m_bulletFont = attr.GetBulletFont(); - - if (attr.GetFont().Ok()) - GetFontAttributes(attr.GetFont()); -} - -// Making a wxTextAttrEx object. -wxRichTextAttr::operator wxTextAttrEx () const -{ - wxTextAttrEx attr; - CopyTo(attr); - return attr; + 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 wxRichTextAttr::operator== (const wxRichTextAttr& attr) const -{ - return GetFlags() == attr.GetFlags() && - - GetTextColour() == attr.GetTextColour() && - GetBackgroundColour() == attr.GetBackgroundColour() && - - GetAlignment() == attr.GetAlignment() && - GetLeftIndent() == attr.GetLeftIndent() && - GetLeftSubIndent() == attr.GetLeftSubIndent() && - GetRightIndent() == attr.GetRightIndent() && - wxRichTextTabsEq(GetTabs(), attr.GetTabs()) && - - GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() && - GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() && - GetLineSpacing() == attr.GetLineSpacing() && - GetCharacterStyleName() == attr.GetCharacterStyleName() && - GetParagraphStyleName() == attr.GetParagraphStyleName() && - - GetBulletStyle() == attr.GetBulletStyle() && - GetBulletSymbol() == attr.GetBulletSymbol() && - GetBulletNumber() == attr.GetBulletNumber() && - GetBulletFont() == attr.GetBulletFont() && - - m_fontSize == attr.m_fontSize && - m_fontStyle == attr.m_fontStyle && - m_fontWeight == attr.m_fontWeight && - m_fontUnderlined == attr.m_fontUnderlined && - m_fontFaceName == attr.m_fontFaceName; -} - -// Copy to a wxTextAttr -void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const -{ - attr.SetTextColour(GetTextColour()); - attr.SetBackgroundColour(GetBackgroundColour()); - attr.SetAlignment(GetAlignment()); - attr.SetTabs(GetTabs()); - attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent()); - attr.SetRightIndent(GetRightIndent()); - attr.SetFont(CreateFont()); - - attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter); - attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore); - attr.SetLineSpacing(m_lineSpacing); - attr.SetBulletStyle(m_bulletStyle); - attr.SetBulletNumber(m_bulletNumber); - attr.SetBulletSymbol(m_bulletSymbol); - attr.SetBulletFont(m_bulletFont); - attr.SetCharacterStyleName(m_characterStyleName); - attr.SetParagraphStyleName(m_paragraphStyleName); - - attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags -} - -// Create font from font attributes. -wxFont wxRichTextAttr::CreateFont() const -{ - wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName); -#ifdef __WXMAC__ - font.SetNoAntiAliasing(true); -#endif - return font; +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 + ); } -// Get attributes from font. -bool wxRichTextAttr::GetFontAttributes(const wxFont& font) +// Partial equality test +bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr) const { - if (!font.Ok()) + 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; - m_fontSize = font.GetPointSize(); - m_fontStyle = font.GetStyle(); - m_fontWeight = font.GetWeight(); - m_fontUnderlined = font.GetUnderlined(); - m_fontFaceName = font.GetFaceName(); + // 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; } -wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, - const wxRichTextAttr& attrDef, - const wxTextCtrlBase *text) +// 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) { - wxColour colFg = attr.GetTextColour(); - if ( !colFg.Ok() ) + if (attr.HasFloatMode()) { - colFg = attrDef.GetTextColour(); - - if ( text && !colFg.Ok() ) - colFg = text->GetForegroundColour(); + if (!(compareWith && compareWith->HasFloatMode() && compareWith->GetFloatMode() == attr.GetFloatMode())) + SetFloatMode(attr.GetFloatMode()); } - wxColour colBg = attr.GetBackgroundColour(); - if ( !colBg.Ok() ) + if (attr.HasClearMode()) { - colBg = attrDef.GetBackgroundColour(); + if (!(compareWith && compareWith->HasClearMode() && compareWith->GetClearMode() == attr.GetClearMode())) + SetClearMode(attr.GetClearMode()); + } - if ( text && !colBg.Ok() ) - colBg = text->GetBackgroundColour(); + if (attr.HasCollapseBorders()) + { + if (!(compareWith && compareWith->HasCollapseBorders() && compareWith->GetCollapseBorders() == attr.GetCollapseBorders())) + SetCollapseBorders(true); } - wxRichTextAttr newAttr(colFg, colBg); + m_margins.Apply(attr.m_margins, compareWith ? (& attr.m_margins) : (const wxTextAttrDimensions*) NULL); + m_padding.Apply(attr.m_padding, compareWith ? (& attr.m_padding) : (const wxTextAttrDimensions*) NULL); + m_position.Apply(attr.m_position, compareWith ? (& attr.m_position) : (const wxTextAttrDimensions*) NULL); - if (attr.HasWeight()) - newAttr.SetFontWeight(attr.GetFontWeight()); + 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); - if (attr.HasSize()) - newAttr.SetFontSize(attr.GetFontSize()); + m_border.Apply(attr.m_border, compareWith ? (& attr.m_border) : (const wxTextAttrBorders*) NULL); + m_outline.Apply(attr.m_outline, compareWith ? (& attr.m_outline) : (const wxTextAttrBorders*) NULL); - if (attr.HasItalic()) - newAttr.SetFontStyle(attr.GetFontStyle()); + return true; +} - if (attr.HasUnderlined()) - newAttr.SetFontUnderlined(attr.GetFontUnderlined()); +// Remove specified attributes from this object +bool wxTextBoxAttr::RemoveStyle(const wxTextBoxAttr& attr) +{ + if (attr.HasFloatMode()) + RemoveFlag(wxTEXT_BOX_ATTR_FLOAT); - if (attr.HasFaceName()) - newAttr.SetFontFaceName(attr.GetFontFaceName()); + if (attr.HasClearMode()) + RemoveFlag(wxTEXT_BOX_ATTR_CLEAR); - if (attr.HasAlignment()) - newAttr.SetAlignment(attr.GetAlignment()); - else if (attrDef.HasAlignment()) - newAttr.SetAlignment(attrDef.GetAlignment()); + if (attr.HasCollapseBorders()) + RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); - if (attr.HasTabs()) - newAttr.SetTabs(attr.GetTabs()); - else if (attrDef.HasTabs()) - newAttr.SetTabs(attrDef.GetTabs()); + m_margins.RemoveStyle(attr.m_margins); + m_padding.RemoveStyle(attr.m_padding); + m_position.RemoveStyle(attr.m_position); - if (attr.HasLeftIndent()) - newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); - else if (attrDef.HasLeftIndent()) - newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent()); + if (attr.m_width.IsPresent()) + m_width.Reset(); + if (attr.m_height.IsPresent()) + m_height.Reset(); - if (attr.HasRightIndent()) - newAttr.SetRightIndent(attr.GetRightIndent()); - else if (attrDef.HasRightIndent()) - newAttr.SetRightIndent(attrDef.GetRightIndent()); + m_border.RemoveStyle(attr.m_border); + m_outline.RemoveStyle(attr.m_outline); - // NEW ATTRIBUTES + return true; +} - if (attr.HasParagraphSpacingAfter()) - newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); +// 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.HasParagraphSpacingBefore()) - newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); + 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.HasLineSpacing()) - newAttr.SetLineSpacing(attr.GetLineSpacing()); + 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); - if (attr.HasCharacterStyleName()) - newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); + 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); - if (attr.HasParagraphStyleName()) - newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); + m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width); + m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height); - if (attr.HasBulletStyle()) - newAttr.SetBulletStyle(attr.GetBulletStyle()); + m_border.CollectCommonAttributes(attr.m_border, clashingAttr.m_border, absentAttr.m_border); + m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline); +} - if (attr.HasBulletNumber()) - newAttr.SetBulletNumber(attr.GetBulletNumber()); +// wxRichTextAttr - if (attr.HasBulletSymbol()) - { - newAttr.SetBulletSymbol(attr.GetBulletSymbol()); - newAttr.SetBulletFont(attr.GetBulletFont()); - } +void wxRichTextAttr::Copy(const wxRichTextAttr& attr) +{ + wxTextAttr::Copy(attr); - return newAttr; + m_textBoxAttr = attr.m_textBoxAttr; } -/*! - * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes. - */ +bool wxRichTextAttr::operator==(const wxRichTextAttr& attr) const +{ + if (!(wxTextAttr::operator==(attr))) + return false; + + return (m_textBoxAttr == attr.m_textBoxAttr); +} -wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr) +// Partial equality test taking comparison object into account +bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr) const { - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_characterStyleName = attr.m_characterStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; - m_bulletFont = attr.m_bulletFont; + if (!(wxTextAttr::EqPartial(attr))) + return false; + + return m_textBoxAttr.EqPartial(attr.m_textBoxAttr); } -// Initialise this object. -void wxTextAttrEx::Init() +// 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) { - m_paragraphSpacingAfter = 0; - m_paragraphSpacingBefore = 0; - m_lineSpacing = 0; - m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; - m_bulletNumber = 0; - m_bulletSymbol = 0; - m_bulletSymbol = wxT('*'); + wxTextAttr::Apply(style, compareWith); + + return m_textBoxAttr.Apply(style.m_textBoxAttr, compareWith ? (& compareWith->m_textBoxAttr) : (const wxTextBoxAttr*) NULL); } -// Assignment from a wxTextAttrEx object -void wxTextAttrEx::operator= (const wxTextAttrEx& attr) +// Remove specified attributes from this object +bool wxRichTextAttr::RemoveStyle(const wxRichTextAttr& attr) { - wxTextAttr::operator= (attr); + wxTextAttr::RemoveStyle(*this, attr); - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_characterStyleName = attr.m_characterStyleName; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; - m_bulletFont = attr.m_bulletFont; + return m_textBoxAttr.RemoveStyle(attr.m_textBoxAttr); } -// Assignment from a wxTextAttr object. -void wxTextAttrEx::operator= (const wxTextAttr& attr) +// 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) { - wxTextAttr::operator= (attr); + wxTextAttrCollectCommonAttributes(*this, attr, clashingAttr, absentAttr); + + m_textBoxAttr.CollectCommonAttributes(attr.m_textBoxAttr, clashingAttr.m_textBoxAttr, absentAttr.m_textBoxAttr); } -wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, - const wxTextAttrEx& attrDef, - const wxTextCtrlBase *text) +// Partial equality test +bool wxTextAttrBorder::EqPartial(const wxTextAttrBorder& border) const { - wxTextAttrEx newAttr; + if (border.HasStyle() && !HasStyle() && (border.GetStyle() != GetStyle())) + return false; - // If attr specifies the complete font, just use that font, overriding all - // default font attributes. - if ((attr.GetFlags() & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT) - newAttr.SetFont(attr.GetFont()); - else + 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 wxTextAttrBorder::Apply(const wxTextAttrBorder& border, const wxTextAttrBorder* compareWith) +{ + if (border.HasStyle()) + { + if (!(compareWith && (border.GetStyle() == compareWith->GetStyle()))) + SetStyle(border.GetStyle()); + } + if (border.HasColour()) { - // First find the basic, default font - long flags = 0; + if (!(compareWith && (border.GetColourLong() == compareWith->GetColourLong()))) + SetColour(border.GetColourLong()); + } + if (border.HasWidth()) + { + if (!(compareWith && (border.GetWidth() == compareWith->GetWidth()))) + SetWidth(border.GetWidth()); + } - wxFont font; - if (attrDef.HasFont()) - { - flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT); - font = attrDef.GetFont(); - } - else - { - if (text) - font = text->GetFont(); + return true; +} - // We leave flags at 0 because no font attributes have been specified yet - } - if (!font.Ok()) - font = *wxNORMAL_FONT; +// Remove specified attributes from this object +bool wxTextAttrBorder::RemoveStyle(const wxTextAttrBorder& 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(); - // Otherwise, if there are font attributes in attr, apply them - if (attr.GetFlags() & wxTEXT_ATTR_FONT) + 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 wxTextAttrBorder::CollectCommonAttributes(const wxTextAttrBorder& attr, wxTextAttrBorder& clashingAttr, wxTextAttrBorder& absentAttr) +{ + if (attr.HasStyle()) + { + if (!clashingAttr.HasStyle() && !absentAttr.HasStyle()) { - if (attr.HasSize()) - { - flags |= wxTEXT_ATTR_FONT_SIZE; - font.SetPointSize(attr.GetFont().GetPointSize()); - } - if (attr.HasItalic()) - { - flags |= wxTEXT_ATTR_FONT_ITALIC;; - font.SetStyle(attr.GetFont().GetStyle()); - } - if (attr.HasWeight()) - { - flags |= wxTEXT_ATTR_FONT_WEIGHT; - font.SetWeight(attr.GetFont().GetWeight()); - } - if (attr.HasFaceName()) - { - flags |= wxTEXT_ATTR_FONT_FACE; - font.SetFaceName(attr.GetFont().GetFaceName()); - } - if (attr.HasUnderlined()) + if (HasStyle()) { - flags |= wxTEXT_ATTR_FONT_UNDERLINE; - font.SetUnderlined(attr.GetFont().GetUnderlined()); + if (GetStyle() != attr.GetStyle()) + { + clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); + RemoveFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); + } } - newAttr.SetFont(font); - newAttr.SetFlags(newAttr.GetFlags()|flags); + else + SetStyle(attr.GetStyle()); } } + else + absentAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE); - // TODO: should really check we are specifying these in the flags, - // before setting them, as per above; or we will set them willy-nilly. - // However, we should also check whether this is the intention - // as per wxTextAttr::Combine, i.e. always to have valid colours - // in the style. - wxColour colFg = attr.GetTextColour(); - if ( !colFg.Ok() ) - { - colFg = attrDef.GetTextColour(); - - if ( text && !colFg.Ok() ) - colFg = text->GetForegroundColour(); - } - - wxColour colBg = attr.GetBackgroundColour(); - if ( !colBg.Ok() ) + if (attr.HasColour()) { - colBg = attrDef.GetBackgroundColour(); - - if ( text && !colBg.Ok() ) - colBg = text->GetBackgroundColour(); + 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); - newAttr.SetTextColour(colFg); - newAttr.SetBackgroundColour(colBg); - - if (attr.HasAlignment()) - newAttr.SetAlignment(attr.GetAlignment()); - else if (attrDef.HasAlignment()) - newAttr.SetAlignment(attrDef.GetAlignment()); - - if (attr.HasTabs()) - newAttr.SetTabs(attr.GetTabs()); - else if (attrDef.HasTabs()) - newAttr.SetTabs(attrDef.GetTabs()); - - if (attr.HasLeftIndent()) - newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent()); - else if (attrDef.HasLeftIndent()) - newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent()); + m_borderWidth.CollectCommonAttributes(attr.m_borderWidth, clashingAttr.m_borderWidth, absentAttr.m_borderWidth); +} - if (attr.HasRightIndent()) - newAttr.SetRightIndent(attr.GetRightIndent()); - else if (attrDef.HasRightIndent()) - newAttr.SetRightIndent(attrDef.GetRightIndent()); +// Partial equality test +bool wxTextAttrBorders::EqPartial(const wxTextAttrBorders& 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); +} - // NEW ATTRIBUTES +// Apply border to 'this', but not if the same as compareWith +bool wxTextAttrBorders::Apply(const wxTextAttrBorders& borders, const wxTextAttrBorders* compareWith) +{ + m_left.Apply(borders.m_left, compareWith ? (& compareWith->m_left) : (const wxTextAttrBorder*) NULL); + m_right.Apply(borders.m_right, compareWith ? (& compareWith->m_right) : (const wxTextAttrBorder*) NULL); + m_top.Apply(borders.m_top, compareWith ? (& compareWith->m_top) : (const wxTextAttrBorder*) NULL); + m_bottom.Apply(borders.m_bottom, compareWith ? (& compareWith->m_bottom) : (const wxTextAttrBorder*) NULL); + return true; +} - if (attr.HasParagraphSpacingAfter()) - newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter()); +// Remove specified attributes from this object +bool wxTextAttrBorders::RemoveStyle(const wxTextAttrBorders& 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; +} - if (attr.HasParagraphSpacingBefore()) - newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore()); +// 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 wxTextAttrBorders::CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& 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); +} - if (attr.HasLineSpacing()) - newAttr.SetLineSpacing(attr.GetLineSpacing()); +// Set style of all borders +void wxTextAttrBorders::SetStyle(int style) +{ + m_left.SetStyle(style); + m_right.SetStyle(style); + m_top.SetStyle(style); + m_bottom.SetStyle(style); +} - if (attr.HasCharacterStyleName()) - newAttr.SetCharacterStyleName(attr.GetCharacterStyleName()); +// Set colour of all borders +void wxTextAttrBorders::SetColour(unsigned long colour) +{ + m_left.SetColour(colour); + m_right.SetColour(colour); + m_top.SetColour(colour); + m_bottom.SetColour(colour); +} - if (attr.HasParagraphStyleName()) - newAttr.SetParagraphStyleName(attr.GetParagraphStyleName()); +void wxTextAttrBorders::SetColour(const wxColour& colour) +{ + m_left.SetColour(colour); + m_right.SetColour(colour); + m_top.SetColour(colour); + m_bottom.SetColour(colour); +} - if (attr.HasBulletStyle()) - newAttr.SetBulletStyle(attr.GetBulletStyle()); +// Set width of all borders +void wxTextAttrBorders::SetWidth(const wxTextAttrDimension& width) +{ + m_left.SetWidth(width); + m_right.SetWidth(width); + m_top.SetWidth(width); + m_bottom.SetWidth(width); +} - if (attr.HasBulletNumber()) - newAttr.SetBulletNumber(attr.GetBulletNumber()); +// Partial equality test +bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim) const +{ + if (dim.IsPresent() && IsPresent() && !((*this) == dim)) + return false; + else + return true; +} - if (attr.HasBulletSymbol()) +bool wxTextAttrDimension::Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith) +{ + if (dim.IsPresent()) { - newAttr.SetBulletSymbol(attr.GetBulletSymbol()); - newAttr.SetBulletFont(attr.GetBulletFont()); + if (!(compareWith && dim == (*compareWith))) + (*this) = dim; } - return newAttr; + return true; } - -/*! - * wxRichTextFileHandler - * Base class for file handlers - */ - -IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject) - -#if wxUSE_STREAMS -bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename) +// 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) { - wxFFileInputStream stream(filename); - if (stream.Ok()) - return LoadFile(buffer, stream); - - return false; + 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); } -bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) +wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize) { - wxFFileOutputStream stream(filename); - if (stream.Ok()) - return SaveFile(buffer, stream); - - return false; + m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize; } -#endif // wxUSE_STREAMS -/// Can we handle this filename (if using files)? By default, checks the extension. -bool wxRichTextFileHandler::CanHandle(const wxString& filename) const +wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(int ppi, double scale, const wxSize& parentSize) { - wxString path, file, ext; - wxSplitPath(filename, & path, & file, & ext); - - return (ext.Lower() == GetExtension()); + m_ppi = ppi; m_scale = scale; m_parentSize = parentSize; } -/*! - * wxRichTextTextHandler - * Plain text handler - */ - -IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler) +int wxTextAttrDimensionConverter::ConvertTenthsMMToPixels(int units) const +{ + return wxRichTextObject::ConvertTenthsMMToPixels(m_ppi, units, m_scale); +} -#if wxUSE_STREAMS -bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) +int wxTextAttrDimensionConverter::ConvertPixelsToTenthsMM(int pixels) const { - if (!stream.IsOk()) - return false; + return wxRichTextObject::ConvertPixelsToTenthsMM(m_ppi, pixels, m_scale); +} - wxString str; - int lastCh = 0; +int wxTextAttrDimensionConverter::GetPixels(const wxTextAttrDimension& dim, int direction) const +{ + if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + return ConvertTenthsMMToPixels(dim.GetValue()); + else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PIXELS) + return dim.GetValue(); + else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE) + { + wxASSERT(m_parentSize != wxDefaultSize); + if (direction == wxHORIZONTAL) + return (int) (double(m_parentSize.x) * double(dim.GetValue()) / 100.0); + else + return (int) (double(m_parentSize.y) * double(dim.GetValue()) / 100.0); + } + else + { + wxASSERT(false); + return 0; + } +} - while (!stream.Eof()) +int wxTextAttrDimensionConverter::GetTenthsMM(const wxTextAttrDimension& dim) const +{ + if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) + return dim.GetValue(); + else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PIXELS) + return ConvertPixelsToTenthsMM(dim.GetValue()); + else { - int ch = stream.GetC(); + wxASSERT(false); + return 0; + } +} - if (!stream.Eof()) - { - if (ch == 10 && lastCh != 13) - str += wxT('\n'); +// Partial equality test +bool wxTextAttrDimensions::EqPartial(const wxTextAttrDimensions& dims) const +{ + if (!m_left.EqPartial(dims.m_left)) + return false; - if (ch > 0 && ch != 10) - str += wxChar(ch); + if (!m_right.EqPartial(dims.m_right)) + return false; - lastCh = ch; - } - } + if (!m_top.EqPartial(dims.m_top)) + return false; - buffer->Clear(); - buffer->AddParagraphs(str); - buffer->UpdateRanges(); + if (!m_bottom.EqPartial(dims.m_bottom)) + return false; return true; - } -bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) +// Apply border to 'this', but not if the same as compareWith +bool wxTextAttrDimensions::Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith) { - if (!stream.IsOk()) - return false; + 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); - wxString text = buffer->GetText(); - wxCharBuffer buf = text.ToAscii(); - - stream.Write((const char*) buf, text.length()); return true; } -#endif // wxUSE_STREAMS - -/* - * Stores information about an image, in binary in-memory form - */ -wxRichTextImageBlock::wxRichTextImageBlock() +// Remove specified attributes from this object +bool wxTextAttrDimensions::RemoveStyle(const wxTextAttrDimensions& attr) { - Init(); + 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; } -wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject() +// 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 wxTextAttrDimensions::CollectCommonAttributes(const wxTextAttrDimensions& attr, wxTextAttrDimensions& clashingAttr, wxTextAttrDimensions& absentAttr) { - Init(); - Copy(block); + 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); } -wxRichTextImageBlock::~wxRichTextImageBlock() +// 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) { - if (m_data) + 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()) { - delete[] m_data; - m_data = NULL; - } -} + 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()); + } -void wxRichTextImageBlock::Init() -{ - m_data = NULL; - m_dataSize = 0; - m_imageType = -1; -} + 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()); + } -void wxRichTextImageBlock::Clear() -{ - delete[] m_data; - m_data = NULL; - m_dataSize = 0; - m_imageType = -1; -} + 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()); + } -// Load the original image into a memory block. -// If the image is not a JPEG, we must convert it into a JPEG -// to conserve space. -// 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. + if (attr.HasFontFaceName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_FACE)) + { + if (currentStyle.HasFontFaceName()) + { + wxString faceName1(currentStyle.GetFontFaceName()); + wxString faceName2(attr.GetFontFaceName()); -bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG) -{ - m_imageType = imageType; + 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()); + } - wxString filenameToRead(filename); - bool removeFile = false; + 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 (imageType == -1) - return false; // Could not determine image type + 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 ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG) + if (attr.HasBackgroundColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BACKGROUND_COLOUR)) { - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; + 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()); + } - wxASSERT(success); + 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()); + } - wxUnusedVar(success); + 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()); + } - image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG); - filenameToRead = tempFile; - removeFile = true; + 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()); + } - m_imageType = wxBITMAP_TYPE_JPEG; + 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()); } - wxFile file; - if (!file.Open(filenameToRead)) - return false; - m_dataSize = (size_t) file.Length(); - file.Close(); + 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 (m_data) - delete[] m_data; - m_data = ReadBlock(filenameToRead, m_dataSize); + 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 (removeFile) - wxRemoveFile(filenameToRead); + 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()); + } - return (m_data != NULL); -} + 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()); + } -// Make an image block from the wxImage in the given -// format. -bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality) -{ - m_imageType = imageType; - image.SetOption(wxT("quality"), quality); + 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 (imageType == -1) - return false; // Could not determine image type + 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()); + } - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; + 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()); + } + } - wxASSERT(success); - wxUnusedVar(success); + 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 (!image.SaveFile(tempFile, m_imageType)) + if (attr.HasURL() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_URL)) { - if (wxFileExists(tempFile)) - wxRemoveFile(tempFile); - return false; + 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()); + } } - wxFile file; - if (!file.Open(tempFile)) - return false; + 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. - m_dataSize = (size_t) file.Length(); - file.Close(); + // 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. - if (m_data) - delete[] m_data; - m_data = ReadBlock(tempFile, m_dataSize); + int currentRelevantTextEffects = currentStyle.GetTextEffects() & attr.GetTextEffectFlags(); + int newRelevantTextEffects = attr.GetTextEffects() & attr.GetTextEffectFlags(); - wxRemoveFile(tempFile); + if (currentRelevantTextEffects != newRelevantTextEffects) + { + // Find the text effects that were different, using XOR + int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects; - return (m_data != NULL); -} + // 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()); -// Write to a file -bool wxRichTextImageBlock::Write(const wxString& filename) -{ - return WriteBlock(filename, m_data, m_dataSize); -} + if (currentStyle.GetTextEffectFlags() == 0) + currentStyle.RemoveFlag(wxTEXT_ATTR_EFFECTS); + } -void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block) -{ - m_imageType = block.m_imageType; - if (m_data) + if (attr.HasOutlineLevel() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_OUTLINE_LEVEL)) { - delete[] m_data; - m_data = NULL; + 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()); } - m_dataSize = block.m_dataSize; - if (m_dataSize == 0) - return; - - m_data = new unsigned char[m_dataSize]; - unsigned int i; - for (i = 0; i < m_dataSize; i++) - m_data[i] = block.m_data[i]; } -//// Operators -void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block) -{ - Copy(block); -} +WX_DEFINE_OBJARRAY(wxRichTextVariantArray); -// Load a wxImage from the block -bool wxRichTextImageBlock::Load(wxImage& image) +IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject) + +bool wxRichTextProperties::operator==(const wxRichTextProperties& props) const { - if (!m_data) + if (m_properties.GetCount() != props.GetCount()) return false; - // Read in the image. -#if wxUSE_STREAMS - wxMemoryInputStream mstream(m_data, m_dataSize); - bool success = image.LoadFile(mstream, GetImageType()); -#else - wxString tempFile; - bool success = wxGetTempFileName(_("image"), tempFile) ; - wxASSERT(success); - - if (!WriteBlock(tempFile, m_data, m_dataSize)) + size_t i; + for (i = 0; i < m_properties.GetCount(); i++) { - return false; + const wxVariant& var1 = m_properties[i]; + int idx = props.Find(var1.GetName()); + if (idx == -1) + return false; + const wxVariant& var2 = props.m_properties[idx]; + if (!(var1 == var2)) + return false; } - success = image.LoadFile(tempFile, GetImageType()); - wxRemoveFile(tempFile); -#endif - return success; + return true; } -// Write data in hex to a stream -bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) +wxArrayString wxRichTextProperties::GetPropertyNames() const { - wxString hex; - int i; - for (i = 0; i < (int) m_dataSize; i++) + wxArrayString arr; + size_t i; + for (i = 0; i < m_properties.GetCount(); i++) { - hex = wxDecToHex(m_data[i]); - wxCharBuffer buf = hex.ToAscii(); - - stream.Write((const char*) buf, hex.length()); + arr.Add(m_properties[i].GetName()); } - - return true; + return arr; } -// Read data in hex from a stream -bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType) +int wxRichTextProperties::Find(const wxString& name) const { - int dataSize = length/2; - - if (m_data) - delete[] m_data; - - wxString str(wxT(" ")); - m_data = new unsigned char[dataSize]; - int i; - for (i = 0; i < dataSize; i ++) + size_t i; + for (i = 0; i < m_properties.GetCount(); i++) { - str[0] = stream.GetC(); - str[1] = stream.GetC(); - - m_data[i] = (unsigned char)wxHexToDec(str); + if (m_properties[i].GetName() == name) + return (int) i; } - - m_dataSize = dataSize; - m_imageType = imageType; - - return true; + return -1; } -// Allocate and read from stream as a block of memory -unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size) +wxVariant* wxRichTextProperties::FindOrCreateProperty(const wxString& name) { - unsigned char* block = new unsigned char[size]; - if (!block) + int idx = Find(name); + if (idx == wxNOT_FOUND) + SetProperty(name, wxString()); + idx = Find(name); + if (idx != wxNOT_FOUND) + { + return & (*this)[idx]; + } + else return NULL; - - stream.Read(block, size); - - return block; } -unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size) +const wxVariant& wxRichTextProperties::GetProperty(const wxString& name) const { - wxFileInputStream stream(filename); - if (!stream.Ok()) - return NULL; - - return ReadBlock(stream, size); + static const wxVariant nullVariant; + int idx = Find(name); + if (idx != -1) + return m_properties[idx]; + else + return nullVariant; } -// Write memory block to stream -bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size) +wxString wxRichTextProperties::GetPropertyString(const wxString& name) const { - stream.Write((void*) block, size); - return stream.IsOk(); - + return GetProperty(name).GetString(); } -// Write memory block to file -bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size) +long wxRichTextProperties::GetPropertyLong(const wxString& name) const { - wxFileOutputStream outStream(filename); - if (!outStream.Ok()) - return false; - - return WriteBlock(outStream, block, size); + return GetProperty(name).GetLong(); } -#if wxUSE_DATAOBJ - -/*! - * The data object for a wxRichTextBuffer - */ - -const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape"); - -wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer) +bool wxRichTextProperties::GetPropertyBool(const wxString& name) const { - m_richTextBuffer = richTextBuffer; - - // this string should uniquely identify our format, but is otherwise - // arbitrary - m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId()); - - SetFormat(m_formatRichTextBuffer); + return GetProperty(name).GetBool(); } -wxRichTextBufferDataObject::~wxRichTextBufferDataObject() +double wxRichTextProperties::GetPropertyDouble(const wxString& name) const { - delete m_richTextBuffer; + return GetProperty(name).GetDouble(); } -// after a call to this function, the richTextBuffer is owned by the caller and it -// is responsible for deleting it! -wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer() +void wxRichTextProperties::SetProperty(const wxVariant& variant) { - wxRichTextBuffer* richTextBuffer = m_richTextBuffer; - m_richTextBuffer = NULL; + wxASSERT(!variant.GetName().IsEmpty()); - return richTextBuffer; -} + int idx = Find(variant.GetName()); -wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const -{ - return m_formatRichTextBuffer; + if (idx == -1) + m_properties.Add(variant); + else + m_properties[idx] = variant; } -size_t wxRichTextBufferDataObject::GetDataSize() const +void wxRichTextProperties::SetProperty(const wxString& name, const wxVariant& variant) { - if (!m_richTextBuffer) - return 0; - - wxString bufXML; - - { - wxStringOutputStream stream(& bufXML); - if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) - { - wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); - return 0; - } - } + int idx = Find(name); + wxVariant var(variant); + var.SetName(name); -#if wxUSE_UNICODE - wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); - return strlen(buffer) + 1; -#else - return bufXML.Length()+1; -#endif + if (idx == -1) + m_properties.Add(var); + else + m_properties[idx] = var; } -bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const +void wxRichTextProperties::SetProperty(const wxString& name, const wxString& value) { - if (!pBuf || !m_richTextBuffer) - return false; - - wxString bufXML; - - { - wxStringOutputStream stream(& bufXML); - if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML)) - { - wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler.")); - return 0; - } - } - -#if wxUSE_UNICODE - wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8); - size_t len = strlen(buffer); - memcpy((char*) pBuf, (const char*) buffer, len); - ((char*) pBuf)[len] = 0; -#else - size_t len = bufXML.Length(); - memcpy((char*) pBuf, (const char*) bufXML.c_str(), len); - ((char*) pBuf)[len] = 0; -#endif - - return true; + SetProperty(name, wxVariant(value, name)); } -bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) +void wxRichTextProperties::SetProperty(const wxString& name, long value) { - delete m_richTextBuffer; - m_richTextBuffer = NULL; - - wxString bufXML((const char*) buf, wxConvUTF8); - - m_richTextBuffer = new wxRichTextBuffer; - - wxStringInputStream stream(bufXML); - if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML)) - { - wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler.")); - - delete m_richTextBuffer; - m_richTextBuffer = NULL; + SetProperty(name, wxVariant(value, name)); +} - return false; - } - return true; +void wxRichTextProperties::SetProperty(const wxString& name, double value) +{ + SetProperty(name, wxVariant(value, name)); } -#endif - // wxUSE_DATAOBJ +void wxRichTextProperties::SetProperty(const wxString& name, bool value) +{ + SetProperty(name, wxVariant(value, name)); +} #endif // wxUSE_RICHTEXT -