#include "Buffer.h"
#include "BufferParams.h"
#include "buffer_funcs.h"
-#include "support/debug.h"
#include "DocIterator.h"
#include "Paragraph.h"
#include "ParagraphList.h"
#include "insets/Inset.h"
+#include "support/debug.h"
#include "support/limited_stack.h"
+#include "support/assert.h"
+
#include <algorithm>
#include <ostream>
-using std::advance;
+using namespace std;
+using namespace lyx::support;
-namespace lyx {
+namespace lyx {
/**
These are the elements put on the undo stack. Each object contains complete
there is a lower limit: The StableDocIterator pointing 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
{
/// Which kind of operation are we recording for?
struct Undo::Private
{
- Private(Buffer & buffer): buffer_(buffer) {}
+ Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true) {}
// Returns false if no undo possible.
bool textUndoOrRedo(DocIterator & cur, bool isUndoOperation);
///
Buffer & buffer_;
/// Undo stack.
- limited_stack<UndoElement> undostack;
+ limited_stack<UndoElement> undostack_;
/// Redo stack.
- limited_stack<UndoElement> redostack;
+ limited_stack<UndoElement> redostack_;
/// The flag used by Undo::finishUndo().
- bool undo_finished;
+ bool undo_finished_;
};
-Undo::Undo(Buffer & buffer): d(new Undo::Private(buffer))
-{
-}
+/////////////////////////////////////////////////////////////////////
+//
+// Undo
+//
+/////////////////////////////////////////////////////////////////////
+
+
+Undo::Undo(Buffer & buffer)
+ : d(new Undo::Private(buffer))
+{}
Undo::~Undo()
bool Undo::hasUndoStack() const
{
- return !d->undostack.empty();
+ return !d->undostack_.empty();
}
bool Undo::hasRedoStack() const
{
- return !d->redostack.empty();
+ return !d->redostack_.empty();
}
-
-
-namespace {
-
-std::ostream & operator<<(std::ostream & os, UndoElement const & undo)
+static ostream & operator<<(ostream & os, UndoElement const & undo)
{
return os << " from: " << undo.from << " end: " << undo.end
<< " cell:\n" << undo.cell
}
-bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
+static bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
{
StableDocIterator tmpi2 = i2;
tmpi2.pos() = i1.pos();
return i1 == tmpi2;
}
-} // namespace anon
+/////////////////////////////////////////////////////////////////////
+//
+// Undo::Private
+//
+///////////////////////////////////////////////////////////////////////
void Undo::Private::doRecordUndo(UndoKind kind,
DocIterator const & cell,
bool isUndoOperation)
{
if (first_pit > last_pit)
- std::swap(first_pit, last_pit);
+ swap(first_pit, last_pit);
// create the position information of the Undo entry
UndoElement undo;
undo.array = 0;
undo.end = cell.lastpit() - last_pit;
limited_stack<UndoElement> & stack = isUndoOperation ?
- undostack : redostack;
+ 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.
- if (!undo_finished
+ if (!undo_finished_
&& kind != ATOMIC_UNDO
&& !stack.empty()
&& samePar(stack.top().cell, undo.cell)
// main Text _is_ the whole document.
// record the relevant paragraphs
Text const * text = cell.text();
- BOOST_ASSERT(text);
+ LASSERT(text, /**/);
ParagraphList const & plist = text->paragraphs();
ParagraphList::const_iterator first = plist.begin();
advance(first, first_pit);
// push the undo entry to undo stack
stack.push(undo);
- //lyxerr << "undo record: " << stack.top() << std::endl;
+ //lyxerr << "undo record: " << stack.top() << endl;
// next time we'll try again to combine entries if possible
- undo_finished = false;
+ undo_finished_ = false;
}
void Undo::Private::recordUndo(UndoKind kind, DocIterator & cur,
pit_type first_pit, pit_type last_pit)
{
- BOOST_ASSERT(first_pit <= cur.lastpit());
- BOOST_ASSERT(last_pit <= cur.lastpit());
+ LASSERT(first_pit <= cur.lastpit(), /**/);
+ LASSERT(last_pit <= cur.lastpit(), /**/);
doRecordUndo(kind, cur, first_pit, last_pit, cur,
false, true);
- undo_finished = false;
- redostack.clear();
+ undo_finished_ = false;
+ redostack_.clear();
//lyxerr << "undostack:\n";
//for (size_t i = 0, n = buf.undostack().size(); i != n && i < 6; ++i)
- // lyxerr << " " << i << ": " << buf.undostack()[i] << std::endl;
+ // lyxerr << " " << i << ": " << buf.undostack()[i] << endl;
}
bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
{
- undo_finished = true;
+ undo_finished_ = true;
limited_stack<UndoElement> & stack = isUndoOperation ?
- undostack : redostack;
+ undostack_ : redostack_;
if (stack.empty())
// Nothing to do.
return false;
limited_stack<UndoElement> & otherstack = isUndoOperation ?
- redostack : undostack;
+ redostack_ : undostack_;
// Adjust undo stack and get hold of current undo data.
UndoElement undo = stack.top();
bool labelsUpdateNeeded = false;
DocIterator dit = undo.cell.asDocIterator(&buffer_.inset());
if (undo.isFullBuffer) {
- BOOST_ASSERT(undo.pars);
+ LASSERT(undo.pars, /**/);
// This is a full document
otherstack.top().bparams = buffer_.params();
buffer_.params() = undo.bparams;
- std::swap(buffer_.paragraphs(), *undo.pars);
+ swap(buffer_.paragraphs(), *undo.pars);
delete undo.pars;
undo.pars = 0;
} else if (dit.inMathed()) {
// gained by storing just 'a few' paragraphs (most if not
// all math inset cells have just one paragraph!)
//LYXERR0("undo.array: " << *undo.array);
- BOOST_ASSERT(undo.array);
+ LASSERT(undo.array, /**/);
dit.cell().swap(*undo.array);
delete undo.array;
undo.array = 0;
} else {
// Some finer machinery is needed here.
Text * text = dit.text();
- BOOST_ASSERT(text);
- BOOST_ASSERT(undo.pars);
+ LASSERT(text, /**/);
+ LASSERT(undo.pars, /**/);
ParagraphList & plist = text->paragraphs();
// remove new stuff between first and last
undo.pars = 0;
labelsUpdateNeeded = true;
}
- BOOST_ASSERT(undo.pars == 0);
- BOOST_ASSERT(undo.array == 0);
+ LASSERT(undo.pars == 0, /**/);
+ LASSERT(undo.array == 0, /**/);
cur = undo.cursor.asDocIterator(&buffer_.inset());
if (labelsUpdateNeeded)
updateLabels(buffer_);
- undo_finished = true;
+ undo_finished_ = true;
return true;
}
void Undo::finishUndo()
{
// Make sure the next operation will be stored.
- d->undo_finished = true;
+ d->undo_finished_ = true;
}
{
DocIterator c = cur;
c.pop_back();
- d->doRecordUndo(kind, c, c.pit(), c.pit(), cur, false, true);
+ d->doRecordUndo(kind, c, c.pit(), c.pit(), cur, false, true);
}
projects / features.git / blobdiff