The insettext patch.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 7e44bfb02ce1c21cc425cecbb0a62628554ba846..1163ff27487401d365d84573d6dfa159a30fa26c 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -21,6 +21,7 @@
 #include "insets/inset.h"
 #include "RowList.h"
 #include "bufferview_funcs.h"
+#include "textcursor.h"
 
 class Buffer;
 class BufferParams;
@@ -38,7 +39,10 @@ class ParagraphList;
 /**
   This class holds the mapping between buffer paragraphs and screen rows.
   */
-class LyXText {
+
+// The inheritance from TextCursor should go. It's just there to ease
+// transition...
+class LyXText : public TextCursor {
 public:
        /// what repainting is needed
        enum refresh_status {
@@ -50,21 +54,6 @@ public:
                REFRESH_AREA = 2
        };
 
-       ///
-       enum word_location {
-               // the word around the cursor, only if the cursor is
-               //not at a boundary
-               WHOLE_WORD_STRICT,
-               // the word around the cursor
-               WHOLE_WORD,
-               /// the word begining from the cursor position
-               PARTIAL_WORD,
-               /// the word around the cursor or before the cursor
-               PREVIOUS_WORD,
-               /// the next word (not yet used)
-               NEXT_WORD
-       };
-
        /// Constructor
        LyXText(BufferView *);
        /// sets inset as owner
@@ -180,7 +169,9 @@ public:
        ///
        void insertInset(Inset * inset);
 
-       /// Completes the insertion with a full rebreak
+       /// Completes the insertion with a rebreak from 'need_break_row' on
+       void partialRebreak();
+       /// a full rebreak of the whole text
        void fullRebreak();
 
        ///
@@ -232,10 +223,20 @@ private:
 
        refresh_status refresh_status_;
 
+public:
        /// only the top-level LyXText has this non-zero
        BufferView * bv_owner;
 
+private:
+       /// returns a pointer to a specified row.
+       RowList::iterator
+       getRow(ParagraphList::iterator pit, lyx::pos_type pos) const;
 public:
+       /// returns a pointer cursor row
+       RowList::iterator getRow(LyXCursor const & cursor) const;
+       /// convenience
+       RowList::iterator cursorRow() const;
+
        /** returns a pointer to the row near the specified y-coordinate
          (relative to the whole text). y is set to the real beginning
          of this row
@@ -258,66 +259,16 @@ public:
                return rowlist_;
        }
 
-       /** The cursor.
-         Later this variable has to be removed. There should be now internal
-         cursor in a text (and thus not in a buffer). By keeping this it is
-         (I think) impossible to have several views with the same buffer, but
-         the cursor placed at different places.
-         [later]
-         Since the LyXText now has been moved from Buffer to BufferView
-         it should not be absolutely needed to move the cursor...
-         */
-       LyXCursor cursor; // actual cursor position
-
-       /** The structure that keeps track of the selections set. */
-       struct Selection {
-               Selection()
-                       : set_(false), mark_(false)
-                       {}
-               bool set() const {
-                       return set_;
-               }
-               void set(bool s) {
-                       set_ = s;
-               }
-               bool mark() const {
-                       return mark_;
-               }
-               void mark(bool m) {
-                       mark_ = m;
-               }
-               LyXCursor cursor; // temporary cursor to hold a cursor position
-                                 // until setSelection is called!
-               LyXCursor start;  // start of a REAL selection
-               LyXCursor end;    // end of a REAL selection
-       private:
-               bool set_; // former selection
-               bool mark_; // former mark_set
-
-       };
-       Selection selection;
-       // this is used to handle XSelection events in the right manner
-       Selection xsel_cache;
-
-       /// needed for the toggling (cursor position on last selection made)
-       LyXCursor last_sel_cursor;
-       /// needed for toggling the selection in screen.C
-       LyXCursor toggle_cursor;
-       /// needed for toggling the selection in screen.C
-       LyXCursor toggle_end_cursor;
 
        /// need the selection cursor:
        void setSelection();
        ///
        void clearSelection();
-       ///
-       string const selectionAsString(Buffer const *, bool label) const;
 
        /// select the word we need depending on word_location
-       void getWord(LyXCursor & from, LyXCursor & to,
-                    word_location const);
+       void getWord(LyXCursor & from, LyXCursor & to, lyx::word_location const);
        /// just selects the word the cursor is in
-       void selectWord(word_location const);
+       void selectWord(lyx::word_location loc);
        /// returns the inset at cursor (if it exists), 0 otherwise
        Inset * getInset() const;
 
@@ -398,7 +349,7 @@ public:
        ///
        void backspace();
        ///
-       bool selectWordWhenUnderCursor(word_location);
+       bool selectWordWhenUnderCursor(lyx::word_location);
        ///
        enum TextCase {
                ///
@@ -418,7 +369,7 @@ public:
        ///
        void copySelection();
        ///
-       void pasteSelection();
+       void pasteSelection(size_t sel_index = 0);
 
        /** the DTP switches for paragraphs. LyX will store the top settings
         always in the first physical paragraph, the bottom settings in the
@@ -471,8 +422,8 @@ public:
        void checkParagraph(ParagraphList::iterator pit, lyx::pos_type pos);
        ///
        int workWidth() const;
-       ///
-       int workWidth(Inset * inset) const;
+       /// returns width of row containing inset
+       int workWidth(Inset const * inset) const;
 
        ///
        void computeBidiTables(Buffer const *, RowList::iterator row) const;
@@ -487,8 +438,6 @@ public:
 private:
        ///
        mutable RowList rowlist_;
-       ///
-       void cursorLeftOneWord(LyXCursor &);
 
        ///
        float getCursorX(RowList::iterator rit, lyx::pos_type pos,
@@ -626,6 +575,13 @@ public:
 
        /// return true if this is owned by an inset.
        bool isInInset() const;
+
+private:
+       /** Cursor related data.
+         Later this variable has to be removed. There should be now internal
+         cursor in a text */
+       ///
+       ///TextCursor cursor_;
 };
 
 /// return the default height of a row in pixels, considering font zoom