X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=f1a859662020c8953889b418e9b832adda2837d1;hb=f3711d8a651445a61e1a759ac7493a9c5c7800e2;hp=9b1b1b681d0d443e5e6100bbce8cee0464747b91;hpb=99e481fe51ed550f2b8845556170c305ba50c3c9;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index 9b1b1b681d..f1a8596620 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -45,6 +45,8 @@ 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
@@ -63,6 +65,8 @@ public:
 	void leaveInset(Inset const & inset);
 	/// sets cursor part
 	void setCursor(DocIterator const & it);
+	/// sets the cursor to the normalized selection anchor
+	void setCursorToAnchor();
 
 	///
 	void setCurrentFont();
@@ -80,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?
@@ -198,15 +206,13 @@ public:
 	void resetAnchor();
 	/// access to owning BufferView
 	BufferView & bv() const;
-	/// access to owning Buffer
-	Buffer & buffer() const;
 	/// get some interesting description of top position
 	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);
 	/**
@@ -286,10 +292,12 @@ public:
 	DocIterator anchor_;
 	
 	///
-	DispatchResult disp_;
+	mutable DispatchResult disp_;
 	///
-	DocIterator const & beforeDispatchCursor() { return beforeDispatchCursor_; }
-	
+	DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
+	///
+	void saveBeforeDispatchPosXY();
+
 private:
 	/**
 	 * The target x position of the cursor. This is used for when
@@ -310,6 +318,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 +327,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:
@@ -359,6 +373,8 @@ public:
 	/// move the cursor up by sending an internal LFUN_DOWN,
 	/// return true if fullscreen update is needed
 	bool down();
+	/// whether the cursor is either at the first or last row
+	bool atFirstOrLastRow(bool up);
 	/// move up/down in a text inset, called for LFUN_UP/DOWN,
 	/// return true if successful, updateNeeded set to true if fullscreen
 	/// update is needed, otherwise it's not touched
@@ -373,7 +389,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);
@@ -430,11 +447,12 @@ public:
 
 
 /**
- * Notifies all insets which appear in old, but not in cur. Make
- * Sure that the cursor old is valid, i.e. all inset pointers
+ * 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.
  */
-bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
+bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur);
 
 
 } // namespace lyx