X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fundo.h;h=b9c8e3df990afcbfba20d61acbf28aaa5d2897d2;hb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;hp=4f9af2af8ff688278682912c657108569a899fa3;hpb=1d7d3cc4afa2205c801ccc2aa71c7ac59359dc5f;p=lyx.git

diff --git a/src/undo.h b/src/undo.h
index 4f9af2af8f..b9c8e3df99 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -1,104 +1,81 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef UNDO_H
 #define UNDO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <list>
-using std::list;
-
-#include "lyxparagraph.h"
+#include "ParagraphList.h"
 
-
-///
+/**
+ * These are the elements put on the undo stack. Each object
+ * contains complete paragraphs and sufficient information
+ * to restore the state. The work is done in undo_funcs.C
+ */
 class Undo {
 public:
-	/// The undo kinds
+	/**
+	 * The undo kinds are used to combine consecutive undo recordings
+	 * of the same kind.
+	 */
 	enum undo_kind {
-		///
+		/**
+		 * Insert something - these will combine to one big chunk
+		 * when many inserts come after each other.
+		 */
 		INSERT,
-		///
+
+		/**
+		 * Delete something - these will combine to one big chunk
+		 * when many deletes come after each other.
+		 */
 		DELETE,
-		///
-		EDIT,
-		///
-		FINISH
+
+		/// Atomic - each of these will have its own entry in the stack
+		ATOMIC
 	};
 	///
+	Undo(undo_kind kind, int inset_id,
+	     int first, int last,
+	     int cursor, int cursor_pos,
+	     ParagraphList const & par_arg);
+
+	/// Which kind of operation are we recording for?
 	undo_kind kind;
-	///
-	int number_of_before_par;
-	///
-	int number_of_behind_par;
-	///
-	int number_of_cursor_par;
-	///
-	int cursor_pos; // valid if >= 0
-	///
-	LyXParagraph * par;
-	///
-	Undo(undo_kind kind_arg,
-	     int number_before_arg, int number_behind_arg,
-	     int cursor_par_arg, int cursor_pos_arg,
-	     LyXParagraph * par_arg)
-	{
-		kind = kind_arg;
-		number_of_before_par = number_before_arg;
-		number_of_behind_par = number_behind_arg;
-		number_of_cursor_par = cursor_par_arg;
-		cursor_pos = cursor_pos_arg;
-		par = par_arg;
-	}
-	///
-	~Undo() {
-		LyXParagraph * tmppar;
-		while (par) {
-			tmppar = par;
-			par = par->next;
-			delete tmppar;
-		}
-	}
-};
 
+	/**
+	 * ID of hosting inset if the cursor is in one. 
+	 * if -1, then the cursor is not in an inset.
+	 * if >= 0, then the cursor is in inset with given id.
+	 */ 
+	int inset_id;
 
-/// A limited Stack for the undo informations.
-class UndoStack{
-private:
-	///
-	typedef list<Undo*> Stakk;
-	///
-	Stakk stakk;
-	/// the maximum number of undo steps stored.
-	Stakk::size_type limit;
-public:
-	///
-	UndoStack();
-	///
-	Undo * pop();
-	///
-	Undo * top();
-	///
-	bool empty() const { return stakk.empty(); }
-	///
-	~UndoStack();
-	///
-	void clear();
-	///
-	void SetStackLimit(Stakk::size_type l);
-	///
-	void push(Undo * undo_arg);
+	/// Offset to the first paragraph in the main document paragraph list
+	int first_par_offset;
+
+	/// Offset to the last paragraph from the end of the main par. list
+	int last_par_offset;
+
+	/**
+	 * Offset from the start of the main document paragraph list,
+	 * except if inside an inset, in which case it's the offset
+	 * inside the hosting inset.
+	 */
+	int cursor_par_offset;
+
+	/// The position of the cursor in the hosting paragraph
+	int cursor_pos;
+
+	/// The contents of the paragraphs saved
+	ParagraphList pars;
 };
 
+
 #endif