Dekels tabular/textinset patches

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 1afc30597cf4b93a6d44d8735042bc105cd0ea29..7a7d551ced8406050502274368fe9575197b7fe1 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -58,7 +58,7 @@ public:
        ///
        mutable int number_of_rows;
        ///
-       mutable long height;
+       mutable int height;
        ///
        mutable unsigned int width;
        /// the current font settings
@@ -66,14 +66,17 @@ public:
        /// the current font
        mutable LyXFont real_current_font;
        /// first visible pixel-row is set from LyXScreen!!!
-       unsigned long first;
+       // unsigned is wrong here for text-insets!
+       int first;
        ///
        BufferView * bv_owner;
        ///
        InsetText * inset_owner;
+       ///
+       UpdatableInset * the_locking_inset;
 
        ///
-       LyXFont GetFont(Buffer const *, LyXParagraph * par,
+       LyXFont const GetFont(Buffer const *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
        ///
        void SetCharFont(Buffer const *, LyXParagraph * par,
@@ -158,7 +161,7 @@ public:
        ///
        Row * need_break_row;
        ///
-       mutable long refresh_y;
+       mutable int refresh_y;
        ///
        int refresh_height;
        ///
@@ -179,7 +182,7 @@ public:
          (relative to the whole text). y is set to the real beginning
          of this row
          */ 
-       Row * GetRowNearY(long & y) const;
+       Row * GetRowNearY(int & y) const;
        
        /** returns the column near the specified x-coordinate of the row 
         x is set to the real beginning of this column
@@ -191,7 +194,7 @@ public:
         of the row
         */
        Row * GetRow(LyXParagraph * par,
-                    LyXParagraph::size_type pos, long & y) const;
+                    LyXParagraph::size_type pos, int & y) const;
 
        /** returns the height of a default row, needed  for scrollbar
         */
@@ -232,7 +235,7 @@ public:
        ///
        void ClearSelection() const;
        ///
-       string selectionAsString(Buffer const *) const;
+       string const selectionAsString(Buffer const *) const;
        
        /// just selects the word the cursor is in
        void SelectWord(BufferView *);
@@ -242,7 +245,7 @@ public:
         to the beginning of this word. 
         With SelectSelectedWord can this be highlighted really
         */ 
-       char * SelectNextWord(BufferView *, float & value);
+       string const SelectNextWord(BufferView *, float & value) const;
        ///
        void SelectSelectedWord(BufferView *);
        ///
@@ -271,10 +274,10 @@ public:
                         LyXFont const & font) const;
 
        ///
-       void SetCursorFromCoordinates(BufferView *, int x, long y) const;
+       void SetCursorFromCoordinates(BufferView *, int x, int y) const;
        ///
        void SetCursorFromCoordinates(BufferView *, LyXCursor &,
-                                     int x, long y) const;
+                                     int x, int y) const;
        ///
        void CursorUp(BufferView *) const;
        ///
@@ -284,10 +287,6 @@ public:
        ///
        void CursorRight(BufferView *, bool internal = true) const;
        ///
-       void CursorLeftIntern(BufferView *, bool internal = true) const;
-       ///
-       void CursorRightIntern(BufferView *, bool internal = true) const;
-       ///
        void CursorLeftOneWord(BufferView *) const;
        ///
        void CursorRightOneWord(BufferView *) const;
@@ -334,7 +333,7 @@ public:
          solution but faster.
         */
        void GetVisibleRow(BufferView *, int y_offset, int x_offset,
-                          Row * row_ptr, long y, bool cleared=false);
+                          Row * row_ptr, int y, bool cleared=false);
 
 #ifndef NEW_INSETS
        /* footnotes: */
@@ -394,8 +393,8 @@ public:
                          bool noindent);
        ///
        void SetParagraphExtraOpt(BufferView *, int type,
-                                 char const * width,
-                                 char const * widthp,
+                                 string const & width,
+                                 string const & widthp,
                                  int alignment, bool hfill,
                                  bool start_minipage);
 
@@ -406,22 +405,22 @@ public:
          */
        bool IsStringInText(LyXParagraph * par,
                            LyXParagraph::size_type pos,
-                           char const * str) const;
+                           string const & str) const;
        /** sets the selection over the number of characters of string,
          no check!!
          */
-       void SetSelectionOverString(BufferView *, char const * str);
+       void SetSelectionOverString(BufferView *, string const & str);
 
        /** simple replacing. The font of the first selected character
          is used
          */
-       void ReplaceSelectionWithString(BufferView *, char const * str);
+       void ReplaceSelectionWithString(BufferView *, string const & str);
 
        /** if the string can be found: return true and set the cursor to
          the new position */
-       bool SearchForward(BufferView *, char const * str) const;
+       bool SearchForward(BufferView *, string const & str) const;
        ///
-       bool SearchBackward(BufferView *, char const * str) const;
+       bool SearchBackward(BufferView *, string const & str) const;
 
        /// needed to insert the selection
        void InsertStringA(BufferView *, string const & str);
@@ -444,31 +443,6 @@ public:
        ///
        int NumberOfCell(LyXParagraph * par,
                         LyXParagraph::size_type pos) const;
-       /* table stuff -- begin*/
-
-       /** all table features of the text-class are put together in
-         this function. Possible values of feature are defined in table.h
-         */
-       void TableFeatures(BufferView *, int feature, string const & val) const;
-        ///
-       void TableFeatures(BufferView *, int feature) const;
-
-       /** pos points at the beginning of the next cell (if there is one)
-        */
-       int WidthOfCell(BufferView *, LyXParagraph * par,
-                       LyXParagraph::size_type & pos) const;
-       ///
-       void CheckParagraphInTable(BufferView *, LyXParagraph * par,
-                                  LyXParagraph::size_type pos);
-       ///
-       void InsertCharInTable(BufferView *, char c);
-       ///
-       void BackspaceInTable(BufferView *);
-       ///
-       bool HitInTable(BufferView *, Row * row, int x) const;
-       ///
-       bool MouseHitInTable(BufferView *, int x, long y) const;
-       /* table stuff -- end*/
        ///
        LyXParagraph * GetParFromID(int id);
 
@@ -533,7 +507,7 @@ public:
        }
        ///
        inline
-       int bidi_level(LyXParagraph::size_type pos) const {
+       LyXParagraph::size_type bidi_level(LyXParagraph::size_type pos) const {
                if (bidi_start == -1)
                        return 0;
                else