X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=5d613f2e0db4f6c84ac4502690c11a11c3b80db8;hb=05e2621a1782504d995f961f77edc604329ab1ee;hp=31072ba065d2dd61c4609ed850a0b5a8a703f10d;hpb=66e1819ad170bd2fa0096872cd8cd20c123eba59;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 31072ba065..5d613f2e0d 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -18,6 +18,7 @@
 #include "Undo.h"
 
 #include "Buffer.h"
+#include "BufferList.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
 #include "Cursor.h"
@@ -40,6 +41,7 @@
 
 #include <algorithm>
 #include <deque>
+#include <set>
 
 using namespace std;
 using namespace lyx::support;
@@ -201,10 +203,10 @@ struct Undo::Private
 				   group_id_(0), group_level_(0) {}
 
 	// Do one undo/redo step
-	void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
+	void doUndoRedoAction(CursorData & cur, UndoElementStack & stack,
 			      UndoElementStack & otherStack);
 	// Apply one undo/redo group. Returns false if no undo possible.
-	bool textUndoOrRedo(CursorData & cur, bool isUndoOperation);
+	bool undoRedoAction(CursorData & cur, bool isUndoOperation);
 
 	///
 	void doRecordUndo(UndoKind kind,
@@ -428,7 +430,7 @@ void Undo::Private::recordUndoBufferParams(CursorData const & cur)
 }
 
 
-void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack)
+void Undo::Private::doUndoRedoAction(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack)
 {
 	// Adjust undo stack and get hold of current undo data.
 	UndoElement & undo = stack.top();
@@ -470,6 +472,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 		//LYXERR0("undo.array: " << *undo.array);
 		LBUFERR(undo.array);
 		dit.cell().swap(*undo.array);
+		dit.inset().setBuffer(buffer_);
 		delete undo.array;
 		undo.array = 0;
 	} else {
@@ -504,7 +507,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 		ParagraphList::iterator fend = fpit;
 		advance(fend, undo.pars->size());
 		for (; fpit != fend; ++fpit)
-			fpit->setBuffer(buffer_);
+			fpit->setInsetBuffers(buffer_);
 
 		delete undo.pars;
 		undo.pars = 0;
@@ -525,7 +528,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 }
 
 
-bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation)
+bool Undo::Private::undoRedoAction(CursorData & cur, bool isUndoOperation)
 {
 	undo_finished_ = true;
 
@@ -539,7 +542,7 @@ bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation)
 
 	const size_t gid = stack.top().group_id;
 	while (!stack.empty() && stack.top().group_id == gid)
-		doTextUndoOrRedo(cur, stack, otherstack);
+		doUndoRedoAction(cur, stack, otherstack);
 	return true;
 }
 
@@ -551,15 +554,15 @@ void Undo::finishUndo()
 }
 
 
-bool Undo::textUndo(CursorData & cur)
+bool Undo::undoAction(CursorData & cur)
 {
-	return d->textUndoOrRedo(cur, true);
+	return d->undoRedoAction(cur, true);
 }
 
 
-bool Undo::textRedo(CursorData & cur)
+bool Undo::redoAction(CursorData & cur)
 {
-	return d->textUndoOrRedo(cur, false);
+	return d->undoRedoAction(cur, false);
 }
 
 
@@ -568,7 +571,8 @@ void Undo::beginUndoGroup()
 	if (d->group_level_ == 0) {
 		// create a new group
 		++d->group_id_;
-		LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_);
+		LYXERR(Debug::UNDO, "+++++++ Creating new group " << d->group_id_
+		       << " for buffer " << &d->buffer_);
 	}
 	++d->group_level_;
 }
@@ -592,7 +596,8 @@ void Undo::endUndoGroup()
 	if (d->group_level_ == 0) {
 		// real end of the group
 		d->group_cur_before_ = CursorData();
-		LYXERR(Debug::UNDO, "-------End of group " << d->group_id_);
+		LYXERR(Debug::UNDO, "------- End of group " << d->group_id_
+		       << " of buffer " << &d->buffer_);
 	}
 }
 
@@ -605,6 +610,14 @@ void Undo::endUndoGroup(CursorData const & cur_after)
 }
 
 
+bool Undo::activeUndoGroup() const
+{
+	return d->group_level_ > 0
+		&& !d->undostack_.empty()
+		&& d->undostack_.top().group_id == d->group_id_;
+}
+
+
 void Undo::recordUndo(CursorData const & cur, UndoKind kind)
 {
 	d->recordUndo(kind, cur, cur.pit(), cur.pit(), cur);
@@ -649,22 +662,32 @@ void Undo::recordUndoFullBuffer(CursorData const & cur)
 
 /// UndoGroupHelper class stuff
 
-/** FIXME: handle restarted groups
- * It may happen that the buffers are visited in order buffer1,
- * buffer2, buffer1. In this case, we want to have only one undo group
- * in buffer1. One solution is to replace buffer_ with a set<Buffer*>,
- * but I am not sure yet how to do it. A use case is
- * InsetLabel::updateReferences.
- */
+class UndoGroupHelper::Impl {
+	friend class UndoGroupHelper;
+	set<Buffer *> buffers_;
+};
+
+
+UndoGroupHelper::UndoGroupHelper(Buffer * buf) : d(new UndoGroupHelper::Impl)
+{
+	resetBuffer(buf);
+}
+
+
+UndoGroupHelper::~UndoGroupHelper()
+{
+	for (Buffer * buf : d->buffers_)
+		if (theBufferList().isLoaded(buf) || theBufferList().isInternal(buf))
+			buf->undo().endUndoGroup();
+	delete d;
+}
+
 void UndoGroupHelper::resetBuffer(Buffer * buf)
 {
-	if (buf == buffer_)
-		return;
-	if (buffer_)
-		buffer_->undo().endUndoGroup();
-	buffer_ = buf;
-	if (buffer_)
-		buffer_->undo().beginUndoGroup();
+	if (buf && d->buffers_.count(buf) == 0) {
+		d->buffers_.insert(buf);
+		buf->undo().beginUndoGroup();
+	}
 }