Move #includes out of header files.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index b0374573edc24dd4ccf63f6ab287ca28681f85f9..59108b3936e473df429d875a7262e82da20db457 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -8,14 +8,13 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXTEXT_H
 #define LYXTEXT_H
 
 #include "lyxfont.h"
-#include "lyxcursor.h"
 #include "layout.h"
 #include "LColor.h"
 #include "insets/inset.h"
@@ -27,6 +26,7 @@ class Buffer;
 class BufferParams;
 class BufferView;
 class InsetText;
+class LyXCursor;
 class Paragraph;
 class Row;
 class Spacing;
@@ -41,8 +41,8 @@ class Dimension;
 /**
   This class used to hold the mapping between buffer paragraphs and
        screen rows. Nowadays, the Paragraphs take care of their rows
-  themselves and this contains just most of the code for manipulating 
-  them and interaction with the Cursor. 
+  themselves and this contains just most of the code for manipulating
+  them and interaction with the Cursor.
   */
 
 // The inheritance from TextCursor should go. It's just there to ease
@@ -50,9 +50,8 @@ class Dimension;
 class LyXText : public TextCursor {
 public:
        /// Constructor
-       LyXText(BufferView *);
-       /// sets inset as owner
-       LyXText(BufferView *, InsetText *);
+       LyXText(BufferView *, InsetText *, bool ininset,
+               ParagraphList & paragraphs);
 
        void init(BufferView *);
        ///
@@ -71,12 +70,6 @@ private:
 public:
        /// update all cached row positions
        void updateRowPositions();
-       /// get the y coord. of the top of the screen (relative to doc start)
-       int top_y() const;
-       /// set the y coord. of the top of the screen (relative to doc start)
-       void top_y(int newy);
-       /// set the anchoring row. top_y will be computed relative to this
-       void anchor_row(RowList::iterator rit);
        ///
        InsetText * inset_owner;
        ///
@@ -128,12 +121,17 @@ public:
        void setFont(LyXFont const &, bool toggleall = false);
 
        /// rebreaks all paragaphs between the given pars.
-       void redoParagraphs(ParagraphList::iterator begin,
+       int redoParagraphs(ParagraphList::iterator begin,
                            ParagraphList::iterator end);
        /// rebreaks the given par
        void redoParagraph(ParagraphList::iterator pit);
+
        /// rebreaks the cursor par
        void redoParagraph();
+private:
+       /// rebreaks the given par, return max row width
+       int redoParagraphInternal(ParagraphList::iterator pit);
+public:
 
        ///
        void toggleFree(LyXFont const &, bool toggleall = false);
@@ -187,7 +185,7 @@ public:
          (relative to the whole text). y is set to the real beginning
          of this row
          */
-       RowList::iterator getRowNearY(int & y,
+       RowList::iterator getRowNearY(int y,
                ParagraphList::iterator & pit) const;
 
        /** returns the column near the specified x-coordinate of the row
@@ -196,12 +194,6 @@ public:
        lyx::pos_type getColumnNearX(ParagraphList::iterator pit,
                RowList::iterator rit, int & x, bool & boundary) const;
 
-       /** returns a pointer to a specified row. y is set to the beginning
-        of the row
-        */
-       RowList::iterator
-       getRow(ParagraphList::iterator pit, lyx::pos_type pos, int & y) const;
-
        /// need the selection cursor:
        void setSelection();
        ///
@@ -248,10 +240,10 @@ public:
        void setCurrentFont();
 
        ///
-       bool isBoundary(Buffer const *, Paragraph const & par,
+       bool isBoundary(Buffer const &, Paragraph const & par,
                        lyx::pos_type pos) const;
        ///
-       bool isBoundary(Buffer const *, Paragraph const & par,
+       bool isBoundary(Buffer const &, Paragraph const & par,
                         lyx::pos_type pos,
                         LyXFont const & font) const;
 
@@ -362,7 +354,7 @@ public:
 
        ///
        void computeBidiTables(ParagraphList::iterator pit,
-               Buffer const *, RowList::iterator row) const;
+               Buffer const &, RowList::iterator row) const;
        /// Maps positions in the visual string to positions in logical string.
        lyx::pos_type log2vis(lyx::pos_type pos) const;
        /// Maps positions in the logical string to positions in visual string.
@@ -403,9 +395,7 @@ public:
        int singleWidth(ParagraphList::iterator pit, lyx::pos_type pos) const;
        ///
        int singleWidth(ParagraphList::iterator pit,
-               lyx::pos_type pos, char c) const;
-       /// rebuild row cache
-       void rebuildRows(ParagraphList::iterator pit);
+               lyx::pos_type pos, char c, LyXFont const & Font) const;
 
        /// return the color of the canvas
        LColor::color backgroundColor() const;
@@ -428,17 +418,12 @@ public:
 
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */
-       void prepareToPrint(
-               ParagraphList::iterator pit,
-               RowList::iterator row, double & x,
-                           double & fill_separator,
-                           double & fill_hfill,
-                           double & fill_label_hfill,
-                           bool bidi = true) const;
+       void prepareToPrint(ParagraphList::iterator pit,
+               RowList::iterator row) const;
 
 private:
        ///
-       void setCounter(Buffer const *, ParagraphList::iterator pit);
+       void setCounter(Buffer const &, ParagraphList::iterator pit);
        ///
        void deleteWordForward();
        ///
@@ -451,8 +436,8 @@ private:
         */
 
 
-       /// return the pos value *before* which a row should break.
-       /// for example, the pos at which IsNewLine(pos) == true
+       /// sets row.end to the pos value *after* which a row should break.
+       /// for example, the pos after which isNewLine(pos) == true
        lyx::pos_type rowBreakPoint(ParagraphList::iterator pit,
                Row const & row) const;
 
@@ -480,6 +465,11 @@ private:
        ///
        mutable lyx::pos_type bidi_end;
 
+       ///
+       const bool in_inset_;
+       ///
+       ParagraphList & paragraphs_;
+
        ///
        void charInserted();
 public: