X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=006919bfd636232e1dc38cdab8800c61b1cea6db;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=979ffb5c95bb793d0cd797faaa7515691cd62f56;hpb=917785df7132ec51d5df6fe2b7dbb434ecda311e;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index 979ffb5c95..006919bfd6 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -19,8 +19,6 @@
 
 #include "mathed/MathParser_flags.h"
 
-#include <vector>
-
 
 namespace lyx {
 
@@ -34,9 +32,59 @@ class Row;
 class InsetMathUnknown;
 class Encoding;
 
+/**
+ * This class describes the position of a cursor within a document,
+ * but does not contain any detail about the view. It is currently
+ * only used to save cursor position in Undo, but culd be extended to
+ * handle the methods that only need this data.
+ **/
+class CursorData : public DocIterator
+{
+public:
+	///
+	CursorData();
+	///
+	explicit CursorData(Buffer * buffer);
+	///
+	explicit CursorData(DocIterator const & dit);
+protected:
+	/// the anchor position
+	DocIterator anchor_;
+	///
+	mutable DispatchResult disp_;
+	/// do we have a selection?
+	bool selection_;
+	/// are we on the way to get one?
+	bool mark_;
+	/// are we in word-selection mode? This is set when double clicking.
+	bool word_selection_;
+	/// If true, we are behind the previous char, otherwise we are in front
+	// of the next char. This only make a difference when we are in front
+	// of a big inset spanning a whole row and computing coordinates for
+	// displaying the cursor.
+	bool logicalpos_;
+
+// FIXME: make them protected.
+public:
+	/// the current font settings
+	Font current_font;
+	/// the current font
+	Font real_current_font;
+
+protected:
+
+	//
+	// math specific stuff that could be promoted to "global" later
+	//
+	/// do we allow autocorrection
+	bool autocorrect_;
+	/// are we entering a macro name?
+	bool macromode_;
+};
+
 
 /// The cursor class describes the position of a cursor within a document.
-class Cursor : public DocIterator
+class Cursor : public CursorData
 {
 public:
 	/// create the cursor of a BufferView
@@ -60,6 +108,8 @@ public:
 	bool popForward();
 	/// make sure we are outside of given inset
 	void leaveInset(Inset const & inset);
+	/// set the cursor data
+	void setCursorData(CursorData const & data);
 	/// sets cursor part
 	void setCursor(DocIterator const & it);
 	/// sets the cursor to the normalized selection anchor
@@ -101,7 +151,7 @@ public:
 	CursorSlice selEnd() const;
 	/// access start of selection
 	DocIterator selectionBegin() const;
-	/// access start of selection
+	/// access end of selection
 	DocIterator selectionEnd() const;
 	/**
 	 * Update the selection status and save permanent
@@ -250,6 +300,9 @@ public:
 	/// fix cursor in circumstances that should never happen.
 	/// \retval true if a fix occured.
 	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);
@@ -292,6 +345,15 @@ public:
 	///
 	void checkBufferStructure();
 
+	/// hook for text input to maintain the "new born word"
+	void markNewWordPosition();
+
+	/// The position of the new born word
+	/// As the user is entering a word without leaving it
+	/// the result is not empty. When not in text mode
+	/// and after leaving the word the result is empty.
+	DocIterator newWord() const { return new_word_; }
+
 public:
 //private:
 	
@@ -300,11 +362,15 @@ public:
 	///
 	void saveBeforeDispatchPosXY();
 
+private:
+	/// validate the "new born word" position
+	void checkNewWordPosition();
+	/// clear the "new born word" position
+	void clearNewWordPosition();
+
 private:
 	///
 	BufferView * bv_;
-	/// the anchor position
-	DocIterator anchor_;
 	///
 	mutable DispatchResult disp_;
 	/**
@@ -322,42 +388,14 @@ private:
 	int x_target_;
 	/// if a x_target cannot be hit exactly in a text, put the difference here
 	int textTargetOffset_;
-	/// do we have a selection?
-	bool selection_;
-	/// are we on the way to get one?
-	bool mark_;
-	/// are we in word-selection mode? This is set when double clicking.
-	bool word_selection_;
-	/// If true, we are behind the previous char, otherwise we are in front
-	// of the next char. This only make a difference when we are in front
-	// of a big inset spanning a whole row and computing coordinates for
-	// displaying the cursor.
-	bool logicalpos_;
+	/// the start of the new born word
+	DocIterator new_word_;
 	/// position before dispatch started
 	DocIterator beforeDispatchCursor_;
 	/// cursor screen coordinates before dispatch started
 	int beforeDispatchPosX_;
 	int beforeDispatchPosY_;
 
-
-// FIXME: make them private.
-public:
-	/// the current font settings
-	Font current_font;
-	/// the current font
-	Font real_current_font;
-
-private:
-
-	//
-	// math specific stuff that could be promoted to "global" later
-	//
-	/// do we allow autocorrection
-	bool autocorrect_;
-	/// are we entering a macro name?
-	bool macromode_;
-
-
 ///////////////////////////////////////////////////////////////////
 //
 // The part below is the non-integrated rest of the original math