X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=9039ff8860e9d40c2b52cd7b817de8bec8229f8b;hb=3bb588f4aaa810fa9cf00a93cf1bd6015cc4d8cf;hp=925ca3b3e8c3a1ea3bdb7fb80dcb7dc0a1c71e96;hpb=452fb6035999c88279a72b3e374bd69d39a3d67f;p=lyx.git diff --git a/src/Row.h b/src/Row.h index 925ca3b3e8..9039ff8860 100644 --- a/src/Row.h +++ b/src/Row.h @@ -30,48 +30,98 @@ class DocIterator; class Inset; /** - * An on-screen row of text. A paragraph is broken into a - * RowList for display. Each Row contains position pointers - * into the first and last character positions of that row. + * FIXME: Change Row object to operate only on integers and not doubles. + * + * This use of double is only useful to distribute the extra + * horizontal space between separators in justified text. If we do + * integer arithmetic, then it is possible to have two groups of + * separators, with size s or s+1. Then strings can be drawn without + * cutting at separators in justfied text, as it is done in + * non-justified text. This will improve performance. + */ + + +/** + * An on-screen row of text. A paragraph is broken into a RowList for + * display. Each Row contains a tokenized description of the contents + * of the line. */ class Row { public: + // Possible types of row elements + enum Type { + // a string of character + STRING, + /** + * Something (completion, end-of-par marker) + * that occupies space one screen but does not + * correspond to any paragraph contents + */ + VIRTUAL, + // A stretchable space, basically + SEPARATOR, + // An inset + INSET, + // Some spacing described by its width, not a string + SPACE + }; + /** * One element of a Row. It has a set of attributes that can be used * by other methods that need to parse the Row contents. */ struct Element { - enum Type { - STRING_ELT, - SEPARATOR_ELT, - INSET_ELT, - SPACE_ELT - }; + Element(Type const t, pos_type p, Font const & f, Change const & ch) + : type(t), pos(p), endpos(p + 1), inset(0), + extra(0), font(f), change(ch), final(false) {} - Element(Type const t) : type(t), pos(0), inset(0), - final(false) {} + // Return total width of element, including separator overhead + double full_width() const { return dim.wid + extra; }; + /** Return position in pixels (from the left) of position + * \param i in the row element. + */ + double pos2x(pos_type const i) const; + /** Return character position that is the closest to + * pixel position \param x. The value \param x is + * adjusted to the actual pixel position. + */ + pos_type x2pos(int &x) const; + /** Break the element if possible, so that its width is + * less then \param w. Returns true on success. + */ + bool breakAt(int w); - // - bool isLineSeparator() const { return type == SEPARATOR_ELT; } + // Returns the position on left side of the element. + pos_type left_pos() const; + // Returns the position on right side of the element. + pos_type right_pos() const; // The kind of row element Type type; // position of the element in the paragraph pos_type pos; - // The dimension of the chunk (only width for strings) + // first position after the element in the paragraph + pos_type endpos; + // The dimension of the chunk (does not contains the + // separator correction) Dimension dim; - // Non-zero if element is an inset + // Non-zero only if element is an inset Inset const * inset; + // Only non-null for separator elements + double extra; + // Non-empty if element is a string or separator docstring str; - // is it possible to add contents to this element? - bool final; // Font font; // Change change; + // is it possible to add contents to this element? + bool final; + + friend std::ostream & operator<<(std::ostream & os, Element const & row); }; @@ -97,20 +147,25 @@ public: DocIterator const & end) const; /// - void pos(pos_type p); + void pos(pos_type p) { pos_ = p; } /// pos_type pos() const { return pos_; } /// - void endpos(pos_type p); + void endpos(pos_type p) { end_ = p; } /// pos_type endpos() const { return end_; } + /// + void right_boundary(bool b) { right_boundary_ = b; } + /// + bool right_boundary() const { return right_boundary_; } + /// Dimension const & dimension() const { return dim_; } /// Dimension & dimension() { return dim_; } /// int height() const { return dim_.height(); } - /// + /// The width of the row, including the left margin, but not the right one. int width() const { return dim_.wid; } /// int ascent() const { return dim_.asc; } @@ -118,21 +173,42 @@ public: int descent() const { return dim_.des; } /// - void add(pos_type pos, Inset const * ins, Dimension const & dim); - /// - void add(pos_type pos, docstring const & s, + void add(pos_type pos, Inset const * ins, Dimension const & dim, Font const & f, Change const & ch); /// void add(pos_type pos, char_type const c, Font const & f, Change const & ch); /// + void addVirtual(pos_type pos, docstring const & s, + Font const & f, Change const & ch); + /// void addSeparator(pos_type pos, char_type const c, Font const & f, Change const & ch); /// - void addSpace(pos_type pos, int width); + void addSpace(pos_type pos, int width, Font const & f, Change const & ch); + + /// + typedef std::vector Elements; + /// + typedef Elements::iterator iterator; + /// + typedef Elements::const_iterator const_iterator; + /// + iterator begin() { return elements_.begin(); } + /// + iterator end() { return elements_.end(); } + /// + const_iterator begin() const { return elements_.begin(); } + /// + const_iterator end() const { return elements_.end(); } + /// bool empty() const { return elements_.empty(); } /// + Element & front() { return elements_.front(); } + /// + Element const & front() const { return elements_.front(); } + /// Element & back() { return elements_.back(); } /// Element const & back() const { return elements_.back(); } @@ -141,11 +217,13 @@ public: /// remove all row elements void clear() { elements_.clear(); } /** - * remove all elements after last separator and update endpos - * if necessary. - * \param keep is the minimum amount of text to keep. + * if row width is too large, remove all elements after last + * separator and update endpos if necessary. If all that + * remains is a large word, cut it to \param width. + * \param body_pos minimum amount of text to keep. + * \param width maximum width of the row */ - void separate_back(pos_type keep); + void shortenIfNeeded(pos_type const body_pos, int const width); /** * If last element of the row is a string, compute its width @@ -153,17 +231,22 @@ public: */ void finalizeLast(); - friend std::ostream & operator<<(std::ostream & os, Row const & row); + /** + * Find sequences of right-to-left elements and reverse them. + * This should be called once the row is completely built. + */ + void reverseRTL(bool rtl_par); - /// current debugging only - void dump(char const * = "") const; + friend std::ostream & operator<<(std::ostream & os, Row const & row); /// width of a separator (i.e. space) double separator; /// width of hfills in the label double label_hfill; - /// the x position of the row - double x; + /// the left margin position of the row + int left_margin; + /// the right margin of the row + int right_margin; /// mutable pos_type sel_beg; /// @@ -190,8 +273,6 @@ private: */ bool sameString(Font const & f, Change const & ch) const; - /// - typedef std::vector Elements; /// Elements elements_; @@ -203,6 +284,8 @@ private: pos_type pos_; /// one behind last pos covered by this row pos_type end_; + // Is there is a boundary at the end of the row (display inset...) + bool right_boundary_; /// Row dimension. Dimension dim_; };