#include "insets/Inset.h"
+#include "support/lassert.h"
#include "support/debug.h"
-#include "support/limited_stack.h"
-
-#include "support/assert.h"
#include <algorithm>
-#include <ostream>
+#include <deque>
using namespace std;
using namespace lyx::support;
struct UndoElement
{
+ ///
+ UndoElement(UndoKind kin, StableDocIterator const & cur,
+ StableDocIterator const & cel,
+ pit_type fro, pit_type en, ParagraphList * pl,
+ MathData * ar, BufferParams const & bp,
+ bool ifb) :
+ kind(kin), cursor(cur), cell(cel), from(fro), end(en),
+ pars(pl), array(ar), bparams(0), isFullBuffer(ifb)
+ {
+ if (isFullBuffer)
+ bparams = new BufferParams(bp);
+ }
+ ///
+ UndoElement(UndoElement const & ue)
+ {
+ kind = ue.kind;
+ cursor = ue.cursor;
+ cell = ue.cell;
+ from = ue.from;
+ end = ue.end;
+ pars = ue.pars;
+ array = ue.array;
+ bparams = ue.isFullBuffer
+ ? new BufferParams(*ue.bparams) : ue.bparams;
+ isFullBuffer = ue.isFullBuffer;
+ }
+ ///
+ ~UndoElement()
+ {
+ if (isFullBuffer)
+ delete bparams;
+ }
/// Which kind of operation are we recording for?
UndoKind kind;
/// the position of the cursor
/// the contents of the saved MathData (for mathed)
MathData * array;
/// Only used in case of full backups
- BufferParams bparams;
+ BufferParams const * bparams;
/// Only used in case of full backups
bool isFullBuffer;
+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 item on overflow.
+ void push(UndoElement const & v) {
+ c_.push_front(v);
+ if (c_.size() > limit_)
+ c_.pop_back();
+ }
+
+private:
+ /// Internal contents.
+ std::deque<UndoElement> c_;
+ /// The maximum number elements stored.
+ size_t limit_;
};
///
Buffer & buffer_;
/// Undo stack.
- limited_stack<UndoElement> undostack_;
+ UndoElementStack undostack_;
/// Redo stack.
- limited_stack<UndoElement> redostack_;
+ UndoElementStack redostack_;
/// The flag used by Undo::finishUndo().
bool undo_finished_;
}
-static ostream & operator<<(ostream & os, UndoElement const & undo)
-{
- return os << " from: " << undo.from << " end: " << undo.end
- << " cell:\n" << undo.cell
- << " cursor:\n" << undo.cursor;
-}
-
-
static bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
{
StableDocIterator tmpi2 = i2;
{
if (first_pit > last_pit)
swap(first_pit, last_pit);
- // create the position information of the Undo entry
- UndoElement undo;
- undo.array = 0;
- undo.pars = 0;
- undo.kind = kind;
- undo.cell = cell;
- undo.cursor = cur;
- undo.bparams = buffer_.params();
- undo.isFullBuffer = isFullBuffer;
- //lyxerr << "recordUndo: cur: " << cur << endl;
- //lyxerr << "recordUndo: pos: " << cur.pos() << endl;
- //lyxerr << "recordUndo: cell: " << cell << endl;
- undo.from = first_pit;
- undo.end = cell.lastpit() - last_pit;
-
- limited_stack<UndoElement> & stack = isUndoOperation ?
- undostack_ : redostack_;
// 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;
+ UndoElementStack & stack = isUndoOperation ? undostack_ : redostack_;
if (!undo_finished_
&& kind != ATOMIC_UNDO
&& !stack.empty()
- && samePar(stack.top().cell, undo.cell)
- && stack.top().kind == undo.kind
- && stack.top().from == undo.from
- && stack.top().end == undo.end)
+ && samePar(stack.top().cell, cell)
+ && stack.top().kind == kind
+ && stack.top().from == from
+ && stack.top().end == end)
return;
+ // create the position information of the Undo entry
+ UndoElement undo(kind, cur, cell, from, end, 0, 0,
+ buffer_.params(), isFullBuffer);
+
// fill in the real data to be saved
if (cell.inMathed()) {
// simply use the whole cell
{
undo_finished_ = true;
- limited_stack<UndoElement> & stack = isUndoOperation ?
- undostack_ : redostack_;
+ UndoElementStack & stack = isUndoOperation ? undostack_ : redostack_;
if (stack.empty())
// Nothing to do.
return false;
- limited_stack<UndoElement> & otherstack = isUndoOperation ?
- redostack_ : undostack_;
+ UndoElementStack & otherstack = isUndoOperation ? redostack_ : undostack_;
// Adjust undo stack and get hold of current undo data.
- UndoElement undo = stack.top();
- stack.pop();
+ UndoElement & undo = stack.top();
+ // 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_.inset());
if (undo.isFullBuffer) {
LASSERT(undo.pars, /**/);
// This is a full document
- otherstack.top().bparams = buffer_.params();
- buffer_.params() = undo.bparams;
+ delete otherstack.top().bparams;
+ otherstack.top().bparams = new BufferParams(buffer_.params());
+ buffer_.params() = *undo.bparams;
swap(buffer_.paragraphs(), *undo.pars);
delete undo.pars;
undo.pars = 0;
LASSERT(undo.array == 0, /**/);
cur = undo.cursor.asDocIterator(&buffer_.inset());
-
+ // Now that we're done with undo, we pop it off the stack.
+ stack.pop();
+
if (labelsUpdateNeeded)
updateLabels(buffer_);
undo_finished_ = true;
projects / lyx.git / blobdiff