X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=da4d27ca03d457f5172215b0d589c07689952107;hb=7250aad280ceee21200b07c3e1e7cf52849c8e2d;hp=b388b9cd5947c3f9697c43d244f875de0e67cfc8;hpb=8b107f0490e61b4390e925f08d21661ef50d6f49;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index b388b9cd59..da4d27ca03 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"
@@ -75,43 +76,32 @@ struct UndoElement
 	            StableDocIterator const & cel,
 	            pit_type fro, pit_type en, ParagraphList * pl, MathData * ar,
 	            bool lc, size_t gid) :
-		kind(kin), cur_before(cb), cell(cel), from(fro), end(en),
-		pars(pl), array(ar), bparams(0),
-		lyx_clean(lc), group_id(gid), time(current_time())
-		{
-		}
+		cur_before(cb), cell(cel), from(fro), end(en),
+		pars(pl), array(ar), bparams(nullptr),
+		group_id(gid), time(current_time()), kind(kin), lyx_clean(lc)
+		{}
 	///
 	UndoElement(CursorData const & cb, BufferParams const & bp,
 				bool lc, size_t gid) :
-		kind(ATOMIC_UNDO), cur_before(cb), cell(), from(0), end(0),
-		pars(0), array(0), bparams(new BufferParams(bp)),
-		lyx_clean(lc), group_id(gid), time(current_time())
-	{
-	}
+		cur_before(cb), cell(), from(0), end(0),
+		pars(nullptr), array(nullptr), bparams(new BufferParams(bp)),
+		group_id(gid), time(current_time()), kind(ATOMIC_UNDO), lyx_clean(lc)
+	{}
 	///
-	UndoElement(UndoElement const & ue) : time(current_time())
-	{
-		kind = ue.kind;
-		cur_before = ue.cur_before;
-		cur_after = ue.cur_after;
-		cell = ue.cell;
-		from = ue.from;
-		end = ue.end;
-		pars = ue.pars;
-		array = ue.array;
-		bparams = ue.bparams
-			? new BufferParams(*ue.bparams) : 0;
-		lyx_clean = ue.lyx_clean;
-		group_id = ue.group_id;
-	}
+	UndoElement(UndoElement const & ue) :
+		cur_before(ue.cur_before), cur_after(ue.cur_after),
+		cell(ue.cell), from(ue.from), end(ue.end),
+		pars(ue.pars), array(ue.array),
+		bparams(ue.bparams ? new BufferParams(*ue.bparams) : nullptr),
+		group_id(ue.group_id), time(current_time()), kind(ue.kind),
+		lyx_clean(ue.lyx_clean)
+		{}
 	///
 	~UndoElement()
 	{
 		if (bparams)
 			delete bparams;
 	}
-	/// Which kind of operation are we recording for?
-	UndoKind kind;
 	/// the position of the cursor before recordUndo
 	CursorData cur_before;
 	/// the position of the cursor at the end of the undo group
@@ -128,12 +118,14 @@ struct UndoElement
 	MathData * array;
 	/// Only used in case of params undo
 	BufferParams const * bparams;
-	/// Was the buffer clean at this point?
-	bool lyx_clean;
 	/// the element's group id
 	size_t group_id;
 	/// timestamp
 	time_t time;
+	/// Which kind of operation are we recording for?
+	UndoKind kind;
+	/// Was the buffer clean at this point?
+	bool lyx_clean;
 private:
 	/// Protect construction
 	UndoElement();
@@ -198,14 +190,14 @@ private:
 
 struct Undo::Private
 {
-	Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true),
-				   group_id_(0), group_level_(0) {}
+	Private(Buffer & buffer) : buffer_(buffer),
+		group_id_(0), group_level_(0), undo_finished_(true) {}
 
 	// 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,
@@ -232,15 +224,16 @@ struct Undo::Private
 	/// Redo stack.
 	UndoElementStack redostack_;
 
-	/// The flag used by Undo::finishUndo().
-	bool undo_finished_;
-
 	/// Current group Id.
 	size_t group_id_;
 	/// Current group nesting nevel.
 	size_t group_level_;
 	/// the position of cursor before the group was created
 	CursorData group_cur_before_;
+
+	/// The flag used by Undo::finishUndo().
+	bool undo_finished_;
+
 };
 
 
@@ -348,7 +341,7 @@ void Undo::Private::doRecordUndo(UndoKind kind,
 	// create the position information of the Undo entry
 	UndoElement undo(kind,
 	      group_cur_before_.empty() ? cur_before : group_cur_before_,
-	      cell, from, end, 0, 0, buffer_.isClean(), group_id_);
+	      cell, from, end, nullptr, nullptr, buffer_.isClean(), group_id_);
 
 	// fill in the real data to be saved
 	if (cell.inMathed()) {
@@ -429,7 +422,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();
@@ -471,8 +464,9 @@ 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;
+		undo.array = nullptr;
 	} else {
 		// Some finer machinery is needed here.
 		Text * text = dit.text();
@@ -508,12 +502,12 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
 			fpit->setInsetBuffers(buffer_);
 
 		delete undo.pars;
-		undo.pars = 0;
+		undo.pars = nullptr;
 	}
 
 	// We'll clean up in release mode.
-	LASSERT(undo.pars == 0, undo.pars = 0);
-	LASSERT(undo.array == 0, undo.array = 0);
+	LASSERT(undo.pars == nullptr, undo.pars = nullptr);
+	LASSERT(undo.array == nullptr, undo.array = nullptr);
 
 	if (!undo.cur_before.empty())
 		cur = undo.cur_before;
@@ -526,7 +520,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;
 
@@ -540,7 +534,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;
 }
 
@@ -552,15 +546,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);
 }
 
 
@@ -608,6 +602,24 @@ void Undo::endUndoGroup(CursorData const & cur_after)
 }
 
 
+void Undo::splitUndoGroup(CursorData const & cur)
+{
+	size_t const level = d->group_level_;
+	d->group_level_ = 1;
+	endUndoGroup(cur);
+	beginUndoGroup(cur);
+	d->group_level_ = level;
+}
+
+
+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);
@@ -667,7 +679,8 @@ UndoGroupHelper::UndoGroupHelper(Buffer * buf) : d(new UndoGroupHelper::Impl)
 UndoGroupHelper::~UndoGroupHelper()
 {
 	for (Buffer * buf : d->buffers_)
-		buf->undo().endUndoGroup();
+		if (theBufferList().isLoaded(buf) || theBufferList().isInternal(buf))
+			buf->undo().endUndoGroup();
 	delete d;
 }