Getting rid of LTR bias --- part 3/4

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index cf2344f2c6d53de788f809131d7441bdac754efa..a275260bf895953ddc7397e3eaec7eedadc63bfc 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -14,8 +14,9 @@
 
 #include "DispatchResult.h"
 #include "DocIterator.h"
+#include "Font.h"
+#include "Undo.h"
 
-#include <iosfwd>
 #include <vector>
 
 
@@ -25,7 +26,6 @@ class Buffer;
 class BufferView;
 class FuncStatus;
 class FuncRequest;
-class Font;
 class Row;
 
 // these should go
@@ -48,19 +48,22 @@ 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
        void setCursor(DocIterator const & it);
 
+       ///
+       void setCurrentFont();
+
        //
        // selection
        //
@@ -109,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 *);
@@ -179,12 +182,40 @@ public:
         * Not using noUpdate() should never be wrong.
         */
        void noUpdate();
-       /// fix cursor in circumstances that should never happen
-       void fixIfBroken();
+       /// fix cursor in circumstances that should never happen.
+       /// \retval true if a fix occured.
+       bool fixIfBroken();
 
        /// output
        friend std::ostream & operator<<(std::ostream & os, Cursor const & cur);
 
+       ///
+       bool textUndo();
+       ///
+       bool textRedo();
+
+       /// makes sure the next operation will be stored
+       void finishUndo();
+
+       /// The general case: prepare undo for an arbitrary range.
+       void recordUndo(UndoKind kind, pit_type from, pit_type to);
+
+       /// Convenience: prepare undo for the range between 'from' and cursor.
+       void recordUndo(UndoKind kind, pit_type from);
+
+       /// Convenience: prepare undo for the single paragraph or cell
+       /// containing the cursor
+       void recordUndo(UndoKind kind = ATOMIC_UNDO);
+
+       /// Convenience: prepare undo for the inset containing the cursor
+       void recordUndoInset(UndoKind kind = ATOMIC_UNDO);
+
+       /// Convenience: prepare undo for the whole buffer
+       void recordUndoFullDocument();
+
+       /// Convenience: prepare undo for the selected paragraphs
+       void recordUndoSelection();
+
 public:
        ///
        BufferView * bv_;
@@ -229,6 +260,13 @@ private:
        /// position before dispatch started
        DocIterator beforeDispatchCursor_;
 
+// FIXME: make them private.
+public:
+       /// the current font settings
+       Font current_font;
+       /// the current font
+       Font real_current_font;
+
 private:
 
        //