X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=81b2d9b97e472df9ba9c64c6b3f72127947ef2e6;hb=9577dae301866e69016c26300826114a611ea779;hp=edb2f862ccccdce67427295326ce405639f80d8b;hpb=ebfe9d60d7ecd1e0fcfb4c226732f121cc7baa75;p=lyx.git

diff --git a/src/Cursor.h b/src/Cursor.h
index edb2f862cc..81b2d9b97e 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.
  */
@@ -17,6 +17,8 @@
 #include "Font.h"
 #include "Undo.h"
 
+#include "mathed/MathParser_flags.h"
+
 #include <vector>
 
 
@@ -37,7 +39,8 @@ class Encoding;
 
 // The public inheritance should go in favour of a suitable data member
 // (or maybe private inheritance) at some point of time.
-class Cursor : public DocIterator {
+class Cursor : public DocIterator
+{
 public:
 	/// create the cursor of a BufferView
 	explicit Cursor(BufferView & bv);
@@ -60,6 +63,8 @@ public:
 	void leaveInset(Inset const & inset);
 	/// sets cursor part
 	void setCursor(DocIterator const & it);
+	/// sets the cursor to the anchor
+	void setCursorToAnchor();
 
 	///
 	void setCurrentFont();
@@ -69,8 +74,8 @@ public:
 	//
 	/// selection active?
 	bool selection() const { return selection_; }
-	/// selection active?
-	bool & selection() { return selection_; }
+	/// set selection;
+	void setSelection(bool sel) { selection_ = sel; }
 	/// do we have a multicell selection?
 	bool selIsMultiCell() const 
 		{ return selection_ && selBegin().idx() != selEnd().idx(); }
@@ -80,7 +85,7 @@ public:
 	/// did we place the anchor?
 	bool mark() const { return mark_; }
 	/// did we place the anchor?
-	bool & mark() { return mark_; }
+	void setMark(bool mark) { mark_ = mark; }
 	///
 	void setSelection();
 	/// set selection at given position
@@ -95,12 +100,17 @@ public:
 	DocIterator selectionBegin() const;
 	/// access start of selection
 	DocIterator selectionEnd() const;
-	/// FIXME: document this
+	/**
+	 * Update the selection status and save permanent
+	 * selection if needed.
+	 * @param selecting the new selection status
+	 * @return whether the selection status has changed
+	 */
 	bool selHandle(bool selecting);
 	///
 	docstring selectionAsString(bool label) const;
 	///
-	docstring currentState();
+	docstring currentState() const;
 
 	/// auto-correct mode
 	bool autocorrect() const { return autocorrect_; }
@@ -190,8 +200,6 @@ 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)?
@@ -240,26 +248,32 @@ public:
 	bool textRedo();
 
 	/// makes sure the next operation will be stored
-	void finishUndo();
+	void finishUndo() const;
+
+	/// open a new group of undo operations. Groups can be nested.
+	void beginUndoGroup() const;
+
+	/// end the current undo group
+	void endUndoGroup() const;
 
 	/// The general case: prepare undo for an arbitrary range.
-	void recordUndo(UndoKind kind, pit_type from, pit_type to);
+	void recordUndo(UndoKind kind, pit_type from, pit_type to) const;
 
 	/// Convenience: prepare undo for the range between 'from' and cursor.
-	void recordUndo(UndoKind kind, pit_type from);
+	void recordUndo(UndoKind kind, pit_type from) const;
 
 	/// Convenience: prepare undo for the single paragraph or cell
 	/// containing the cursor
-	void recordUndo(UndoKind kind = ATOMIC_UNDO);
+	void recordUndo(UndoKind kind = ATOMIC_UNDO) const;
 
 	/// Convenience: prepare undo for the inset containing the cursor
-	void recordUndoInset(UndoKind kind = ATOMIC_UNDO);
+	void recordUndoInset(UndoKind kind = ATOMIC_UNDO) const;
 
 	/// Convenience: prepare undo for the whole buffer
-	void recordUndoFullDocument();
+	void recordUndoFullDocument() const;
 
 	/// Convenience: prepare undo for the selected paragraphs or cells
-	void recordUndoSelection();
+	void recordUndoSelection() const;
 
 	///
 	void checkBufferStructure();
@@ -345,6 +359,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
@@ -359,7 +375,7 @@ public:
 	///
 	void niceInsert(MathAtom const & at);
 	///
-	void niceInsert(docstring const & str);
+	void niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL);
 
 	/// in pixels from top of screen
 	void setScreenPos(int x, int y);
@@ -400,7 +416,7 @@ public:
 	/// display an error message
 	void errorMessage(docstring const & msg) const;
 	///
-	docstring getPossibleLabel();
+	docstring getPossibleLabel() const;
 
 	/// the name of the macro we are currently inputting
 	docstring macroName();
@@ -416,11 +432,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