Backport JMarc's fix for bug #6367.

* Undo.cpp:
 - rename cur member of UndoElement to cur_before
 - add new member cur_after, which is set by Undo::endUndoGroup
 - create a new Undo::endUndoGroup variant that takes a Cursor as parameter. We cannot get rid of the old one because it is used for LFUN_COMMAND_SEQUENCE.
* Cursor.cpp:
 - use endUndoGroup(Dociterator const &) for dispatch
 - update Cursor::endUndoGroup to pass cursor.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40876 a592a061-630c-0410-9148-cb99ea01b6c8

src/Cursor.cpp

@@ -334,7 +334,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 	Cursor old = *this;
 	disp_ = DispatchResult();
 
-	buffer()->undo().beginUndoGroup();
+	beginUndoGroup();
 
 	// Is this a function that acts on inset at point?
 	if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint)
@@ -346,7 +346,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 			<< cmd0 << endl << *this);
 		nextInset()->dispatch(*this, tmpcmd);
 		if (disp_.dispatched()) {
-			buffer()->undo().endUndoGroup();
+			endUndoGroup();
 			return;
 		}
 	}
@@ -391,7 +391,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 		// are possible which would change it
 		beforeDispatchCursor_ = safe.beforeDispatchCursor_;
 	}
-	buffer()->undo().endUndoGroup();
+	endUndoGroup();
 
 	// notify insets we just left
 	if (*this != old) {
@@ -2408,7 +2408,7 @@ void Cursor::beginUndoGroup() const
 
 void Cursor::endUndoGroup() const
 {
-	buffer()->undo().endUndoGroup();
+	buffer()->undo().endUndoGroup(*this);
 }
 
 

src/Undo.cpp

@@ -65,12 +65,12 @@ where to insert the stored bits when performining undo.
 struct UndoElement
 {
 	///
-	UndoElement(UndoKind kin, StableDocIterator const & cur, 
+	UndoElement(UndoKind kin, StableDocIterator const & cb, 
 	            StableDocIterator const & cel,
 	            pit_type fro, pit_type en, ParagraphList * pl, 
 	            MathData * ar, BufferParams const & bp, 
 	            bool ifb, bool lc, size_t gid) :
-	        kind(kin), cursor(cur), cell(cel), from(fro), end(en),
+	        kind(kin), cur_before(cb), cell(cel), from(fro), end(en),
 	        pars(pl), array(ar), bparams(0), isFullBuffer(ifb),
 		lyx_clean(lc), group_id(gid)
 	{
@@ -81,7 +81,8 @@ struct UndoElement
 	UndoElement(UndoElement const & ue)
 	{
 		kind = ue.kind;
-		cursor = ue.cursor;
+		cur_before = ue.cur_before;
+		cur_after = ue.cur_after;
 		cell = ue.cell;
 		from = ue.from;
 		end = ue.end;
@@ -101,8 +102,10 @@ struct UndoElement
 	}
 	/// Which kind of operation are we recording for?
 	UndoKind kind;
-	/// the position of the cursor
-	StableDocIterator cursor;
+	/// the position of the cursor before recordUndo
+	StableDocIterator cur_before;
+	/// the position of the cursor at the end of the undo group
+	StableDocIterator cur_after;
 	/// the position of the cell described
 	StableDocIterator cell;
 	/// counted from begin of cell
@@ -195,7 +198,7 @@ struct Undo::Private
 		DocIterator const & cell,
 		pit_type first_pit,
 		pit_type last_pit,
-		DocIterator const & cur,
+		StableDocIterator const & cur,
 		bool isFullBuffer,
 		UndoElementStack & stack);
 	///
@@ -288,7 +291,7 @@ static bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
 void Undo::Private::doRecordUndo(UndoKind kind,
 	DocIterator const & cell,
 	pit_type first_pit, pit_type last_pit,
-	DocIterator const & cur,
+	StableDocIterator const & cur_before,
 	bool isFullBuffer,
 	UndoElementStack & stack)
 {
@@ -311,15 +314,18 @@ void Undo::Private::doRecordUndo(UndoKind kind,
 	    && samePar(stack.top().cell, cell)
 	    && stack.top().kind == kind
 	    && stack.top().from == from
-	    && stack.top().end == end)
+	    && stack.top().end == end) {
+		// reset cur_after; it will be filled correctly by endUndoGroup.
+		stack.top().cur_after = StableDocIterator();
 		return;
+	}
 
 	if (isFullBuffer)
 		LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id);
 	else
 		LYXERR(Debug::UNDO, "Create undo element of group " << group_id);
 	// create the position information of the Undo entry
-	UndoElement undo(kind, cur, cell, from, end, 0, 0, 
+	UndoElement undo(kind, cur_before, cell, from, end, 0, 0, 
 	                 buffer_.params(), isFullBuffer, buffer_.isClean(), group_id);
 
 	// fill in the real data to be saved
@@ -384,8 +390,9 @@ void Undo::Private::doTextUndoOrRedo(DocIterator & cur, UndoElementStack & stack
 	DocIterator cell_dit = undo.cell.asDocIterator(&buffer_);
 
 	doRecordUndo(ATOMIC_UNDO, cell_dit,
-		undo.from, cell_dit.lastpit() - undo.end, cur,
+		undo.from, cell_dit.lastpit() - undo.end, undo.cur_after,
 		undo.isFullBuffer, otherstack);
+	otherstack.top().cur_after = undo.cur_before;
 
 	// This does the actual undo/redo.
 	//LYXERR0("undo, performing: " << undo);
@@ -439,7 +446,8 @@ void Undo::Private::doTextUndoOrRedo(DocIterator & cur, UndoElementStack & stack
 	LASSERT(undo.pars == 0, /**/);
 	LASSERT(undo.array == 0, /**/);
 
-	cur = undo.cursor.asDocIterator(&buffer_);
+	if (undo.cur_before.size())
+		cur = undo.cur_before.asDocIterator(&buffer_);
 	if (undo.lyx_clean)
 		buffer_.markClean();
 	else
@@ -512,6 +520,15 @@ void Undo::endUndoGroup()
 	}
 }
 
+
+void Undo::endUndoGroup(DocIterator const & cur)
+{
+	endUndoGroup();
+	if (!d->undostack_.empty() && !d->undostack_.top().cur_after.size())
+		d->undostack_.top().cur_after = cur;
+}
+
+
 // FIXME: remove these convenience functions and make
 // Private::recordUndo public as sole interface. The code in the
 // convenience functions can move to Cursor.cpp.

src/Undo.h

@@ -84,6 +84,9 @@ public:
 	/// end the current undo group.
 	void endUndoGroup();
 
+	/// end the current undo group and set UndoElement::cur_after if necessary.
+	void endUndoGroup(DocIterator const &);
+
 	/// The general case: record undo information for an arbitrary range.
 	/**
 	 * Record undo information - call with the current cursor and

status.20x

@@ -86,6 +86,8 @@ What's new
 - Don't reset the selected format each time we click into a new paragraph
   in View>Source (bug 7997).
 
+- Stop screen from jumping around so much on undo and redo (bug 6367).
+
 
 * DOCUMENTATION AND LOCALIZATION