* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index 1ee104cd52b8a6a9fcbcdb9d10c62c4315325b99..7991d0890ad3d226199e47ae02c3afe4caa1170e 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -48,14 +48,14 @@ public:
        DispatchResult result() const;
        /// add a new cursor slice
        void push(Inset & inset);
-       /// add a new cursor slice, place cursor on left end
-       void pushLeft(Inset & inset);
+       /// add a new cursor slice, place cursor at front (move backwards)
+       void pushBackward(Inset & inset);
        /// pop one level off the cursor
        void pop();
-       /// pop one slice off the cursor stack and go left
-       bool popLeft();
-       /// pop one slice off the cursor stack and go right
-       bool popRight();
+       /// pop one slice off the cursor stack and go backwards
+       bool popBackward();
+       /// pop one slice off the cursor stack and go forward
+       bool popForward();
        /// make sure we are outside of given inset
        void leaveInset(Inset const & inset);
        /// sets cursor part
@@ -112,10 +112,10 @@ public:
        //
        // common part
        //
-       /// move one step to the left
-       bool posLeft();
-       /// move one step to the right
-       bool posRight();
+       /// move one step backwards
+       bool posBackward();
+       /// move one step forward
+       bool posForward();
 
        /// insert an inset
        void insert(Inset *);
@@ -188,6 +188,7 @@ public:
 
        /// output
        friend std::ostream & operator<<(std::ostream & os, Cursor const & cur);
+       friend LyXErr & operator<<(LyXErr & os, Cursor const & cur);
 
        ///
        bool textUndo();
@@ -216,6 +217,9 @@ public:
        /// Convenience: prepare undo for the selected paragraphs
        void recordUndoSelection();
 
+       ///
+       void checkBufferStructure();
+
 public:
        ///
        BufferView * bv_;
@@ -253,10 +257,6 @@ private:
        // of a big inset spanning a whole row and computing coordinates for
        // displaying the cursor.
        bool logicalpos_;
-       /// x position before dispatch started
-       int beforeDispX_;
-       /// y position before dispatch started
-       int beforeDispY_;
        /// position before dispatch started
        DocIterator beforeDispatchCursor_;
 
@@ -333,7 +333,7 @@ public:
        // selection in given cell of atom
        void handleNest(MathAtom const & at, int cell = 0);
        ///
-       bool isInside(Inset const *);
+       bool isInside(Inset const *) const;
 
        /// make sure cursor position is valid
        /// FIXME: It does a subset of fixIfBroken. Maybe merge them?