X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=a0f5ec14bf14f4ac434163f7690f6e264bbe17b6;hb=8fd223146b02c83fbe78ff361590c9578a7d0454;hp=c3ae44888db2fbac087a3a5a55084ff20240dd9d;hpb=b76b6575bdcca8fda2380a11d8d7301c63fe6887;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index c3ae44888d..a0f5ec14bf 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -88,11 +88,13 @@ public:
 	explicit CursorData(Buffer * buffer);
 	///
 	explicit CursorData(DocIterator const & dit);
+	/// output
+	friend std::ostream & operator<<(std::ostream & os, CursorData const & cur);
+	friend LyXErr & operator<<(LyXErr & os, CursorData const & cur);
+
 protected:
 	/// the anchor position
 	DocIterator anchor_;
-	///
-	mutable DispatchResult disp_;
 	/// do we have a selection?
 	bool selection_;
 	/// are we on the way to get one?
@@ -214,6 +216,9 @@ public:
 	bool macromode() const { return macromode_; }
 	/// are we entering a macro name?
 	bool & macromode() { return macromode_; }
+
+	/// returns true when all insets in cursor stack are in cache
+	bool inCoordCache() const;
 	/// returns x,y position
 	void getPos(int & x, int & y) const;
 	/// return logical positions between which the cursor is situated
@@ -221,7 +226,7 @@ public:
 	 * If the cursor is at the edge of a row, the position which is "over the 
 	 * edge" will be returned as -1.
 	 */
-	void getSurroundingPos(pos_type & left_pos, pos_type & right_pos);
+	void getSurroundingPos(pos_type & left_pos, pos_type & right_pos) const;
 	/// the row in the paragraph we're in
 	Row const & textRow() const;
 
@@ -264,6 +269,8 @@ public:
 	bool posVisToNewRow(bool movingLeft);
 	/// move to right or left extremity of the current row
 	void posVisToRowExtremity(bool left);
+	/// Should interpretation of the arrow keys be reversed?
+	bool reverseDirectionNeeded() const;
 
 	/// insert an inset
 	void insert(Inset *);
@@ -339,16 +346,12 @@ public:
 	 */
 	void noScreenUpdate() const;
 	/// fix cursor in circumstances that should never happen.
-	/// \retval true if a fix occured.
+	/// \retval true if a fix occurred.
 	bool fixIfBroken();
 	/// Repopulate the slices insets from bottom to top. Useful
 	/// for stable iterators or Undo data.
 	void sanitize();
 
-	/// output
-	friend std::ostream & operator<<(std::ostream & os, Cursor const & cur);
-	friend LyXErr & operator<<(LyXErr & os, Cursor const & cur);
-
 	///
 	bool textUndo();
 	///
@@ -364,21 +367,23 @@ public:
 	void endUndoGroup() const;
 
 	/// The general case: prepare undo for an arbitrary range.
-	void recordUndo(UndoKind kind, pit_type from, pit_type to) const;
+	void recordUndo(pit_type from, pit_type to) const;
 
 	/// Convenience: prepare undo for the range between 'from' and cursor.
-	void recordUndo(UndoKind kind, pit_type from) const;
+	void recordUndo(pit_type from) const;
 
 	/// Convenience: prepare undo for the single paragraph or cell
 	/// containing the cursor
 	void recordUndo(UndoKind kind = ATOMIC_UNDO) const;
 
 	/// Convenience: prepare undo for the inset containing the cursor
-	void recordUndoInset(UndoKind kind = ATOMIC_UNDO,
-			     Inset const * inset = 0) const;
+	void recordUndoInset(Inset const * inset = 0) const;
 
 	/// Convenience: prepare undo for the whole buffer
-	void recordUndoFullDocument() const;
+	void recordUndoFullBuffer() const;
+
+	/// Convenience: prepare undo for buffer parameters
+	void recordUndoBufferParams() const;
 
 	/// Convenience: prepare undo for the selected paragraphs or cells
 	void recordUndoSelection() const;
@@ -534,10 +539,11 @@ public:
 
 
 /**
- * Notifies all insets which appear in old, but not in cur. And then
- * notify all insets which appear in cur, but not in old.
- * Make sure that the cursor old is valid, i.e. all inset pointers
- * point to valid insets! Use Cursor::fixIfBroken if necessary.
+ * Notifies all insets which appear in \c old, but not in \c cur. And then
+ * notify all insets which appear in \c cur, but not in \c old.
+ * \returns true if cursor is now invalid, e.g. if some insets in
+ *   higher cursor slices of \c old do not exist anymore. In this case
+ *   it may be necessary to use Use Cursor::fixIfBroken.
  */
 bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur);