X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=0d49502ef1903ece576a8f1ea496cb439ada44eb;hb=1b56057e1f739551f2c410a4b0b3941246123531;hp=cf2344f2c6d53de788f809131d7441bdac754efa;hpb=98fb638d61d38df1443339de4e8ba58c7c81784a;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index cf2344f2c6..0d49502ef1 100644
--- 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,11 +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);
+	friend LyXErr & operator<<(LyXErr & 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:
 	///
@@ -222,13 +254,16 @@ 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_;
 
+// FIXME: make them private.
+public:
+	/// the current font settings
+	Font current_font;
+	/// the current font
+	Font real_current_font;
+
 private:
 
 	//
@@ -295,7 +330,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?