X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=c2c7a5d87361b688b7c0c454f395188c036e15a8;hb=5b75a45bc1c590cca5ac2a3e539a741a4aede26a;hp=81b2d9b97e472df9ba9c64c6b3f72127947ef2e6;hpb=326a035a5bd04376bbcf585e60437d299b2b96cf;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index 81b2d9b97e..c2c7a5d873 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -45,10 +45,12 @@ public:
 	/// create the cursor of a BufferView
 	explicit Cursor(BufferView & bv);
 
+	/// returns true if we made a decision
+	bool getStatus(FuncRequest const & cmd, FuncStatus & flag) const;
 	/// dispatch from innermost inset upwards
 	void dispatch(FuncRequest const & cmd);
 	/// get the resut of the last dispatch
-	DispatchResult result() const;
+	DispatchResult const & result() const;
 	/// add a new cursor slice
 	void push(Inset & inset);
 	/// add a new cursor slice, place cursor at front (move backwards)
@@ -63,7 +65,7 @@ public:
 	void leaveInset(Inset const & inset);
 	/// sets cursor part
 	void setCursor(DocIterator const & it);
-	/// sets the cursor to the anchor
+	/// sets the cursor to the normalized selection anchor
 	void setCursorToAnchor();
 
 	///
@@ -82,6 +84,10 @@ public:
 	/// do we have a multiline selection?
 	bool selIsMultiLine() const 
 		{ return selection_ && selBegin().pit() != selEnd().pit(); }
+	/// 
+	void setWordSelection(bool set) { word_selection_ = set; }
+	///
+	bool wordSelection() { return word_selection_; }
 	/// did we place the anchor?
 	bool mark() const { return mark_; }
 	/// did we place the anchor?
@@ -195,7 +201,11 @@ public:
 	int textTargetOffset() const;
 
 	/// access to normalized selection anchor
-	CursorSlice anchor() const;
+	CursorSlice normalAnchor() const;
+	// FIXME: this can't be a const & and a const function because
+	// LFUN_TAB_* wants to move the real anchor.
+	/// access to real selection anchor
+	DocIterator & realAnchor();
 	/// sets anchor to cursor position
 	void resetAnchor();
 	/// access to owning BufferView
@@ -204,9 +214,9 @@ public:
 	void info(odocstream & os) const;
 	/// are we in math mode (2), text mode (1) or unsure (0)?
 	int currentMode();
-	/// reset cursor bottom to the beginning of the given inset
+	/// reset cursor bottom to the beginning of the top inset
 	// (sort of 'chroot' environment...)
-	void reset(Inset &);
+	void reset();
 	/// for spellchecking
 	void replaceWord(std::string const & replacestring);
 	/**
@@ -279,18 +289,20 @@ public:
 	void checkBufferStructure();
 
 public:
-	///
-	BufferView * bv_;
 //private:
-	/// the anchor position
-	DocIterator anchor_;
 	
 	///
-	DispatchResult disp_;
+	DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
 	///
-	DocIterator const & beforeDispatchCursor() { return beforeDispatchCursor_; }
-	
+	void saveBeforeDispatchPosXY();
+
 private:
+	///
+	BufferView * bv_;
+	/// the anchor position
+	DocIterator anchor_;
+	///
+	mutable DispatchResult disp_;
 	/**
 	 * The target x position of the cursor. This is used for when
 	 * we have text like :
@@ -310,6 +322,8 @@ private:
 	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
@@ -317,6 +331,10 @@ private:
 	bool logicalpos_;
 	/// position before dispatch started
 	DocIterator beforeDispatchCursor_;
+	/// cursor screen coordinates before dispatch started
+	int beforeDispatchPosX_;
+	int beforeDispatchPosY_;
+
 
 // FIXME: make them private.
 public:
@@ -375,7 +393,8 @@ public:
 	///
 	void niceInsert(MathAtom const & at);
 	///
-	void niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL);
+	void niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL,
+			bool enter = true);
 
 	/// in pixels from top of screen
 	void setScreenPos(int x, int y);