mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
8ec4080537
With this patch, the cursor position before undo can be saved when creating an undo group. Any such value will supercede parameters passed to recordUndo. Only the first such cursor set by nested beginUndoGoup takes effect. Fixes bug #9663.
650 lines
16 KiB
C++
650 lines
16 KiB
C++
/**
|
|
* \file Undo.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Asger Alstrup
|
|
* \author Lars Gullik Bjønnes
|
|
* \author John Levon
|
|
* \author André Pönitz
|
|
* \author Jürgen Vigna
|
|
* \author Abdelrazak Younes
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "Undo.h"
|
|
|
|
#include "Buffer.h"
|
|
#include "BufferParams.h"
|
|
#include "buffer_funcs.h"
|
|
#include "Cursor.h"
|
|
#include "Paragraph.h"
|
|
#include "ParagraphList.h"
|
|
#include "Text.h"
|
|
|
|
#include "mathed/MathSupport.h"
|
|
#include "mathed/MathData.h"
|
|
|
|
#include "insets/Inset.h"
|
|
|
|
#include "support/debug.h"
|
|
#include "support/gettext.h"
|
|
#include "support/lassert.h"
|
|
#include "support/lyxtime.h"
|
|
|
|
#include <algorithm>
|
|
#include <deque>
|
|
|
|
using namespace std;
|
|
using namespace lyx::support;
|
|
|
|
|
|
namespace lyx {
|
|
|
|
/**
|
|
These are the elements put on the undo stack. Each object contains
|
|
complete paragraphs from some cell and sufficient information to
|
|
restore the cursor state.
|
|
|
|
The cell is given by a DocIterator pointing to this cell, the
|
|
'interesting' range of paragraphs by counting them from begin and end
|
|
of cell, respectively.
|
|
|
|
The cursor is also given as DocIterator and should point to some place
|
|
in the stored paragraph range. In case of math, we simply store the
|
|
whole cell, as there usually is just a simple paragraph in a cell.
|
|
|
|
The idea is to store the contents of 'interesting' paragraphs in some
|
|
structure ('Undo') _before_ it is changed in some edit operation.
|
|
Obviously, the stored range should be as small as possible. However,
|
|
there is a lower limit: The StableDocIterator stored in the undo class
|
|
must be valid after the changes, too, as it will used as a pointer
|
|
where to insert the stored bits when performining undo.
|
|
*/
|
|
struct UndoElement
|
|
{
|
|
///
|
|
UndoElement(UndoKind kin, CursorData const & cb,
|
|
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())
|
|
{
|
|
}
|
|
///
|
|
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())
|
|
{
|
|
}
|
|
///
|
|
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()
|
|
{
|
|
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
|
|
CursorData cur_after;
|
|
/// the position of the cell described
|
|
StableDocIterator cell;
|
|
/// counted from begin of cell
|
|
pit_type from;
|
|
/// complement to end of this cell
|
|
pit_type end;
|
|
/// the contents of the saved Paragraphs (for texted)
|
|
ParagraphList * pars;
|
|
/// the contents of the saved MathData (for mathed)
|
|
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;
|
|
private:
|
|
/// Protect construction
|
|
UndoElement();
|
|
};
|
|
|
|
|
|
class UndoElementStack
|
|
{
|
|
public:
|
|
/// limit is the maximum size of the stack
|
|
UndoElementStack(size_t limit = 100) { limit_ = limit; }
|
|
/// limit is the maximum size of the stack
|
|
~UndoElementStack() { clear(); }
|
|
|
|
/// Return the top element.
|
|
UndoElement & top() { return c_.front(); }
|
|
|
|
/// Pop and throw away the top element.
|
|
void pop() { c_.pop_front(); }
|
|
|
|
/// Return true if the stack is empty.
|
|
bool empty() const { return c_.empty(); }
|
|
|
|
/// Clear all elements, deleting them.
|
|
void clear() {
|
|
for (size_t i = 0; i != c_.size(); ++i) {
|
|
delete c_[i].array;
|
|
delete c_[i].pars;
|
|
}
|
|
c_.clear();
|
|
}
|
|
|
|
/// Push an item on to the stack, deleting the bottom group on
|
|
/// overflow.
|
|
void push(UndoElement const & v) {
|
|
// Remove some entries if the limit has been reached.
|
|
// However, if the only group on the stack is the one
|
|
// we are currently populating, do nothing.
|
|
if (c_.size() >= limit_
|
|
&& c_.front().group_id != v.group_id) {
|
|
// remove a whole group at once.
|
|
const size_t gid = c_.back().group_id;
|
|
while (!c_.empty() && c_.back().group_id == gid)
|
|
c_.pop_back();
|
|
}
|
|
c_.push_front(v);
|
|
}
|
|
|
|
/// Mark all the elements of the stack as dirty
|
|
void markDirty() {
|
|
for (size_t i = 0; i != c_.size(); ++i)
|
|
c_[i].lyx_clean = false;
|
|
}
|
|
|
|
private:
|
|
/// Internal contents.
|
|
std::deque<UndoElement> c_;
|
|
/// The maximum number elements stored.
|
|
size_t limit_;
|
|
};
|
|
|
|
|
|
struct Undo::Private
|
|
{
|
|
Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true),
|
|
group_id_(0), group_level_(0) {}
|
|
|
|
// Do one undo/redo step
|
|
void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack,
|
|
UndoElementStack & otherStack);
|
|
// Apply one undo/redo group. Returns false if no undo possible.
|
|
bool textUndoOrRedo(CursorData & cur, bool isUndoOperation);
|
|
|
|
///
|
|
void doRecordUndo(UndoKind kind,
|
|
DocIterator const & cell,
|
|
pit_type first_pit,
|
|
pit_type last_pit,
|
|
CursorData const & cur,
|
|
UndoElementStack & stack);
|
|
///
|
|
void recordUndo(UndoKind kind,
|
|
DocIterator const & cell,
|
|
pit_type first_pit,
|
|
pit_type last_pit,
|
|
CursorData const & cur);
|
|
///
|
|
void doRecordUndoBufferParams(CursorData const & cur, UndoElementStack & stack);
|
|
///
|
|
void recordUndoBufferParams(CursorData const & cur);
|
|
|
|
///
|
|
Buffer & buffer_;
|
|
/// Undo stack.
|
|
UndoElementStack undostack_;
|
|
/// 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_;
|
|
};
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Undo
|
|
//
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
Undo::Undo(Buffer & buffer)
|
|
: d(new Undo::Private(buffer))
|
|
{}
|
|
|
|
|
|
Undo::~Undo()
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
|
|
void Undo::clear()
|
|
{
|
|
d->undostack_.clear();
|
|
d->redostack_.clear();
|
|
d->undo_finished_ = true;
|
|
// We used to do that, but I believe it is better to keep
|
|
// groups (only used in Buffer::reload for now (JMarc)
|
|
//d->group_id_ = 0;
|
|
//d->group_level_ = 0;
|
|
}
|
|
|
|
|
|
bool Undo::hasUndoStack() const
|
|
{
|
|
return !d->undostack_.empty();
|
|
}
|
|
|
|
|
|
bool Undo::hasRedoStack() const
|
|
{
|
|
return !d->redostack_.empty();
|
|
}
|
|
|
|
|
|
void Undo::markDirty()
|
|
{
|
|
d->undo_finished_ = true;
|
|
d->undostack_.markDirty();
|
|
d->redostack_.markDirty();
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Undo::Private
|
|
//
|
|
///////////////////////////////////////////////////////////////////////
|
|
|
|
static bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
|
|
{
|
|
StableDocIterator tmpi2 = i2;
|
|
tmpi2.pos() = i1.pos();
|
|
return i1 == tmpi2;
|
|
}
|
|
|
|
|
|
void Undo::Private::doRecordUndo(UndoKind kind,
|
|
DocIterator const & cell,
|
|
pit_type first_pit, pit_type last_pit,
|
|
CursorData const & cur_before,
|
|
UndoElementStack & stack)
|
|
{
|
|
if (!group_level_) {
|
|
LYXERR0("There is no group open (creating one)");
|
|
++group_id_;
|
|
}
|
|
|
|
if (first_pit > last_pit)
|
|
swap(first_pit, last_pit);
|
|
|
|
// Undo::ATOMIC are always recorded (no overlapping there).
|
|
// As nobody wants all removed character appear one by one when undoing,
|
|
// we want combine 'similar' non-ATOMIC undo recordings to one.
|
|
pit_type from = first_pit;
|
|
pit_type end = cell.lastpit() - last_pit;
|
|
if (!undo_finished_
|
|
&& kind != ATOMIC_UNDO
|
|
&& !stack.empty()
|
|
&& !stack.top().bparams
|
|
&& samePar(stack.top().cell, cell)
|
|
&& stack.top().kind == kind
|
|
&& stack.top().from == from
|
|
&& stack.top().end == end
|
|
&& stack.top().cur_after == cur_before
|
|
&& current_time() - stack.top().time <= 2) {
|
|
// reset cur_after; it will be filled correctly by endUndoGroup.
|
|
stack.top().cur_after = CursorData();
|
|
// update the timestamp of the undo element
|
|
stack.top().time = current_time();
|
|
return;
|
|
}
|
|
|
|
LYXERR(Debug::UNDO, "Create undo element of group " << group_id_);
|
|
// 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_);
|
|
|
|
// fill in the real data to be saved
|
|
if (cell.inMathed()) {
|
|
// simply use the whole cell
|
|
MathData & ar = cell.cell();
|
|
undo.array = new MathData(ar.buffer(), ar.begin(), ar.end());
|
|
} else {
|
|
// some more effort needed here as 'the whole cell' of the
|
|
// main Text _is_ the whole document.
|
|
// record the relevant paragraphs
|
|
Text const * text = cell.text();
|
|
LBUFERR(text);
|
|
ParagraphList const & plist = text->paragraphs();
|
|
ParagraphList::const_iterator first = plist.begin();
|
|
advance(first, first_pit);
|
|
ParagraphList::const_iterator last = plist.begin();
|
|
advance(last, last_pit + 1);
|
|
undo.pars = new ParagraphList(first, last);
|
|
}
|
|
|
|
// push the undo entry to undo stack
|
|
stack.push(undo);
|
|
//lyxerr << "undo record: " << stack.top() << endl;
|
|
}
|
|
|
|
|
|
void Undo::Private::recordUndo(UndoKind kind,
|
|
DocIterator const & cell,
|
|
pit_type first_pit, pit_type last_pit,
|
|
CursorData const & cur)
|
|
{
|
|
LASSERT(first_pit <= cell.lastpit(), return);
|
|
LASSERT(last_pit <= cell.lastpit(), return);
|
|
|
|
doRecordUndo(kind, cell, first_pit, last_pit, cur,
|
|
undostack_);
|
|
|
|
// next time we'll try again to combine entries if possible
|
|
undo_finished_ = false;
|
|
|
|
// If we ran recordUndo, it means that we plan to change the buffer
|
|
buffer_.markDirty();
|
|
|
|
redostack_.clear();
|
|
}
|
|
|
|
|
|
void Undo::Private::doRecordUndoBufferParams(CursorData const & cur_before,
|
|
UndoElementStack & stack)
|
|
{
|
|
if (!group_level_) {
|
|
LYXERR0("There is no group open (creating one)");
|
|
++group_id_;
|
|
}
|
|
|
|
LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id_);
|
|
// create the position information of the Undo entry
|
|
UndoElement undo(group_cur_before_.empty() ? cur_before : group_cur_before_,
|
|
buffer_.params(), buffer_.isClean(),
|
|
group_id_);
|
|
|
|
// push the undo entry to undo stack
|
|
stack.push(undo);
|
|
}
|
|
|
|
|
|
void Undo::Private::recordUndoBufferParams(CursorData const & cur)
|
|
{
|
|
doRecordUndoBufferParams(cur, undostack_);
|
|
|
|
// next time we'll try again to combine entries if possible
|
|
undo_finished_ = false;
|
|
|
|
// If we ran recordUndo, it means that we plan to change the buffer
|
|
buffer_.markDirty();
|
|
|
|
redostack_.clear();
|
|
}
|
|
|
|
|
|
void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack)
|
|
{
|
|
// Adjust undo stack and get hold of current undo data.
|
|
UndoElement & undo = stack.top();
|
|
LYXERR(Debug::UNDO, "Undo element of group " << undo.group_id);
|
|
// We'll pop the stack only when we're done with this element. So do NOT
|
|
// try to return early.
|
|
|
|
// We will store in otherstack the part of the document under 'undo'
|
|
DocIterator cell_dit = undo.cell.asDocIterator(&buffer_);
|
|
|
|
if (undo.bparams)
|
|
doRecordUndoBufferParams(undo.cur_after, otherstack);
|
|
else {
|
|
LATTEST(undo.end <= cell_dit.lastpit());
|
|
doRecordUndo(ATOMIC_UNDO, cell_dit,
|
|
undo.from, cell_dit.lastpit() - undo.end, undo.cur_after,
|
|
otherstack);
|
|
}
|
|
otherstack.top().cur_after = undo.cur_before;
|
|
|
|
// This does the actual undo/redo.
|
|
//LYXERR0("undo, performing: " << undo);
|
|
DocIterator dit = undo.cell.asDocIterator(&buffer_);
|
|
if (undo.bparams) {
|
|
// This is a params undo element
|
|
delete otherstack.top().bparams;
|
|
otherstack.top().bparams = new BufferParams(buffer_.params());
|
|
buffer_.params() = *undo.bparams;
|
|
} else if (dit.inMathed()) {
|
|
// We stored the full cell here as there is not much to be
|
|
// gained by storing just 'a few' paragraphs (most if not
|
|
// all math inset cells have just one paragraph!)
|
|
//LYXERR0("undo.array: " << *undo.array);
|
|
LBUFERR(undo.array);
|
|
dit.cell().swap(*undo.array);
|
|
delete undo.array;
|
|
undo.array = 0;
|
|
} else {
|
|
// Some finer machinery is needed here.
|
|
Text * text = dit.text();
|
|
LBUFERR(text);
|
|
LBUFERR(undo.pars);
|
|
ParagraphList & plist = text->paragraphs();
|
|
|
|
// remove new stuff between first and last
|
|
ParagraphList::iterator first = plist.begin();
|
|
advance(first, undo.from);
|
|
ParagraphList::iterator last = plist.begin();
|
|
advance(last, plist.size() - undo.end);
|
|
plist.erase(first, last);
|
|
|
|
// re-insert old stuff instead
|
|
first = plist.begin();
|
|
advance(first, undo.from);
|
|
|
|
// this ugly stuff is needed until we get rid of the
|
|
// inset_owner backpointer
|
|
ParagraphList::iterator pit = undo.pars->begin();
|
|
ParagraphList::iterator const end = undo.pars->end();
|
|
for (; pit != end; ++pit)
|
|
pit->setInsetOwner(dit.realInset());
|
|
plist.insert(first, undo.pars->begin(), undo.pars->end());
|
|
delete undo.pars;
|
|
undo.pars = 0;
|
|
}
|
|
|
|
// We'll clean up in release mode.
|
|
LASSERT(undo.pars == 0, undo.pars = 0);
|
|
LASSERT(undo.array == 0, undo.array = 0);
|
|
|
|
if (!undo.cur_before.empty())
|
|
cur = undo.cur_before;
|
|
if (undo.lyx_clean)
|
|
buffer_.markClean();
|
|
else
|
|
buffer_.markDirty();
|
|
// Now that we're done with undo, we pop it off the stack.
|
|
stack.pop();
|
|
}
|
|
|
|
|
|
bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation)
|
|
{
|
|
undo_finished_ = true;
|
|
|
|
UndoElementStack & stack = isUndoOperation ? undostack_ : redostack_;
|
|
|
|
if (stack.empty())
|
|
// Nothing to do.
|
|
return false;
|
|
|
|
UndoElementStack & otherstack = isUndoOperation ? redostack_ : undostack_;
|
|
|
|
const size_t gid = stack.top().group_id;
|
|
while (!stack.empty() && stack.top().group_id == gid)
|
|
doTextUndoOrRedo(cur, stack, otherstack);
|
|
|
|
// Adapt the new material to current buffer.
|
|
buffer_.setBuffersForInsets(); // FIXME This shouldn't be here.
|
|
return true;
|
|
}
|
|
|
|
|
|
void Undo::finishUndo()
|
|
{
|
|
// Make sure the next operation will be stored.
|
|
d->undo_finished_ = true;
|
|
}
|
|
|
|
|
|
bool Undo::textUndo(CursorData & cur)
|
|
{
|
|
return d->textUndoOrRedo(cur, true);
|
|
}
|
|
|
|
|
|
bool Undo::textRedo(CursorData & cur)
|
|
{
|
|
return d->textUndoOrRedo(cur, false);
|
|
}
|
|
|
|
|
|
void Undo::beginUndoGroup()
|
|
{
|
|
if (d->group_level_ == 0) {
|
|
// create a new group
|
|
++d->group_id_;
|
|
LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_);
|
|
}
|
|
++d->group_level_;
|
|
}
|
|
|
|
|
|
void Undo::beginUndoGroup(CursorData const & cur_before)
|
|
{
|
|
beginUndoGroup();
|
|
if (d->group_cur_before_.empty())
|
|
d->group_cur_before_ = cur_before;
|
|
}
|
|
|
|
|
|
void Undo::endUndoGroup()
|
|
{
|
|
if (d->group_level_ == 0) {
|
|
LYXERR0("There is no undo group to end here");
|
|
return;
|
|
}
|
|
--d->group_level_;
|
|
if (d->group_level_ == 0) {
|
|
// real end of the group
|
|
d->group_cur_before_ = CursorData();
|
|
LYXERR(Debug::UNDO, "-------End of group " << d->group_id_);
|
|
}
|
|
}
|
|
|
|
|
|
void Undo::endUndoGroup(CursorData const & cur_after)
|
|
{
|
|
endUndoGroup();
|
|
if (!d->undostack_.empty() && d->undostack_.top().cur_after.empty())
|
|
d->undostack_.top().cur_after = cur_after;
|
|
}
|
|
|
|
|
|
void Undo::recordUndo(CursorData const & cur, UndoKind kind)
|
|
{
|
|
d->recordUndo(kind, cur, cur.pit(), cur.pit(), cur);
|
|
}
|
|
|
|
|
|
void Undo::recordUndo(CursorData const & cur, pit_type from, pit_type to)
|
|
{
|
|
d->recordUndo(ATOMIC_UNDO, cur, from, to, cur);
|
|
}
|
|
|
|
|
|
void Undo::recordUndoInset(CursorData const & cur, Inset const * inset)
|
|
{
|
|
if (!inset || inset == &cur.inset()) {
|
|
DocIterator c = cur;
|
|
c.pop_back();
|
|
d->recordUndo(ATOMIC_UNDO, c, c.pit(), c.pit(), cur);
|
|
} else if (inset == cur.nextInset())
|
|
recordUndo(cur);
|
|
else
|
|
LYXERR0("Inset not found, no undo stack added.");
|
|
}
|
|
|
|
|
|
void Undo::recordUndoBufferParams(CursorData const & cur)
|
|
{
|
|
d->recordUndoBufferParams(cur);
|
|
}
|
|
|
|
|
|
void Undo::recordUndoFullBuffer(CursorData const & cur)
|
|
{
|
|
// This one may happen outside of the main undo group, so we
|
|
// put it in its own subgroup to avoid complaints.
|
|
beginUndoGroup();
|
|
d->recordUndo(ATOMIC_UNDO, doc_iterator_begin(&d->buffer_),
|
|
0, d->buffer_.paragraphs().size() - 1, cur);
|
|
d->recordUndoBufferParams(cur);
|
|
endUndoGroup();
|
|
}
|
|
|
|
/// UndoGroupHelper class stuff
|
|
|
|
void UndoGroupHelper::resetBuffer(Buffer * buf)
|
|
{
|
|
if (buf == buffer_)
|
|
return;
|
|
if (buffer_)
|
|
buffer_->undo().endUndoGroup();
|
|
buffer_ = buf;
|
|
if (buffer_)
|
|
buffer_->undo().beginUndoGroup();
|
|
}
|
|
|
|
|
|
} // namespace lyx
|