#include <algorithm>
-using lyx::paroffset_type;
+using lyx::par_type;
+
+using std::advance;
+using std::endl;
namespace {
std::ostream & operator<<(std::ostream & os, Undo const & undo)
{
- return os << " from: " << undo.from
- << " end: " << undo.end
+ return os << " from: " << undo.from << " end: " << undo.end
+ << " cell:\n" << undo.cell
<< " cursor:\n" << undo.cursor;
}
void recordUndo(Undo::undo_kind kind,
- LCursor & cur, paroffset_type first_par, paroffset_type last_par,
+ DocIterator & cell,
+ par_type first_par, par_type last_par,
+ DocIterator & cur,
limited_stack<Undo> & stack)
{
- BOOST_ASSERT(first_par <= cur.lastpar());
- BOOST_ASSERT(last_par <= cur.lastpar());
-
if (first_par > last_par)
std::swap(first_par, last_par);
// create the position information of the Undo entry
Undo undo;
undo.kind = kind;
- undo.cursor = StableDocumentIterator(cur);
+ undo.cell = cell;
+ undo.cursor = cur;
+ lyxerr << "recordUndo: cur: " << cur << endl;
+ lyxerr << "recordUndo: pos: " << cur.pos() << endl;
+ //lyxerr << "recordUndo: cell: " << cell << endl;
undo.from = first_par;
- undo.end = cur.lastpar() - last_par;
+ undo.end = cell.lastpar() - last_par;
// Undo::ATOMIC are always recorded (no overlapping there).
// As nobody wants all removed character appear one by one when undoing,
if (!undo_finished
&& kind != Undo::ATOMIC
&& !stack.empty()
- && stack.top().cursor.size() == undo.cursor.size()
+ && stack.top().cell.size() == undo.cell.size()
&& stack.top().kind == undo.kind
&& stack.top().from == undo.from
&& stack.top().end == undo.end)
return;
// fill in the real data to be saved
- if (cur.inMathed()) {
+ if (cell.inMathed()) {
// simply use the whole cell
- undo.array = asString(cur.cell());
+ undo.array = asString(cell.cell());
} else {
// some more effort needed here as 'the whole cell' of the
// main LyXText _is_ the whole document.
// record the relevant paragraphs
- LyXText * text = cur.text();
+ LyXText * text = cell.text();
BOOST_ASSERT(text);
ParagraphList & plist = text->paragraphs();
ParagraphList::iterator first = plist.begin();
undo.pars = ParagraphList(first, last);
}
- // push the undo entry to undo stack
+ // push the undo entry to undo stack
//lyxerr << "undo record: " << stack.top() << std::endl;
stack.push(undo);
undo_finished = false;
}
+void recordUndo(Undo::undo_kind kind,
+ LCursor & cur, par_type first_par, par_type last_par,
+ limited_stack<Undo> & stack)
+{
+ BOOST_ASSERT(first_par <= cur.lastpar());
+ BOOST_ASSERT(last_par <= cur.lastpar());
+
+ recordUndo(kind, cur, first_par, last_par, cur, stack);
+}
+
void performUndoOrRedo(BufferView & bv, Undo const & undo)
{
- LCursor & cur = bv.cursor();
- lyxerr << "undo, performing: " << undo << std::endl;
- cur.setCursor(undo.cursor.asDocumentIterator(&bv.buffer()->inset()), false);
-
- if (cur.inMathed()) {
+ //lyxerr << "undo, performing: " << undo << std::endl;
+ DocIterator dit = undo.cell.asDocIterator(&bv.buffer()->inset());
+ 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!)
- asArray(undo.array, cur.cell());
+ asArray(undo.array, dit.cell());
} else {
// Some finer machinery is needed here.
- LyXText * text = cur.text();
+ LyXText * text = dit.text();
BOOST_ASSERT(text);
ParagraphList & plist = text->paragraphs();
plist.insert(first, undo.pars.begin(), undo.pars.end());
}
+ LCursor & cur = bv.cursor();
+ cur.setCursor(undo.cursor.asDocIterator(&bv.buffer()->inset()));
+ cur.selection() = false;
cur.resetAnchor();
finishUndo();
}
-// returns false if no undo possible
+// Returns false if no undo possible.
bool textUndoOrRedo(BufferView & bv,
limited_stack<Undo> & stack, limited_stack<Undo> & otherstack)
{
if (stack.empty()) {
- // nothing to do
+ // Nothing to do.
finishUndo();
return false;
}
+ //
+ // Adjust undo stack and get hold of current undo data.
+ //
Undo undo = stack.top();
stack.pop();
finishUndo();
- // this implements redo
- otherstack.push(undo);
- DocumentIterator dit =
- undo.cursor.asDocumentIterator(&bv.buffer()->inset());
- if (dit.inMathed()) {
- // not much to be done
- } else {
- otherstack.top().pars.clear();
- LyXText * text = dit.text();
- BOOST_ASSERT(text);
- ParagraphList & plist = text->paragraphs();
- if (undo.from + undo.end <= int(plist.size())) {
- ParagraphList::iterator first = plist.begin();
- advance(first, undo.from);
- ParagraphList::iterator last = plist.begin();
- advance(last, plist.size() - undo.end);
- otherstack.top().pars.insert(otherstack.top().pars.begin(), first, last);
- }
+
+ //
+ // This implements redo.
+ //
+
+ // The cursor will be placed at cur_dit after
+ // the ongoing undo operation.
+ DocIterator cur_dit =
+ undo.cursor.asDocIterator(&bv.buffer()->inset());
+
+ // This is the place the cursor is currently located.
+ LCursor & cur = bv.cursor();
+ DocIterator cell_dit = cur;
+
+ // If both places have the same depth we stay in the same
+ // cell and store paragraphs from this cell. Otherwise we
+ // will drop slices from the more nested iterator and
+ // create an undo item from a single paragraph of the common
+ // ancestor.
+ DocIterator ancestor_dit = cur_dit;
+ while (ancestor_dit.size() > cur.size())
+ ancestor_dit.pop_back();
+
+ if (cur_dit.size() == cell_dit.size()) {
+ recordUndo(Undo::ATOMIC, cell_dit,
+ cell_dit.par(), cur_dit.par(),
+ cur_dit, otherstack);
}
- otherstack.top().cursor = bv.cursor();
- //lyxerr << " undo other: " << otherstack.top() << std::endl;
+ else {
+ recordUndo(Undo::ATOMIC, ancestor_dit,
+ ancestor_dit.par(),
+ ancestor_dit.par(),
+ cur_dit, otherstack);
+ }
+
+ //
+ // This does the actual undo.
+ //
performUndoOrRedo(bv, undo);
return true;
}
void finishUndo()
{
- // makes sure the next operation will be stored
+ // Make sure the next operation will be stored.
undo_finished = true;
}
void recordUndo(Undo::undo_kind kind,
- LCursor & cur, paroffset_type first, paroffset_type last)
+ LCursor & cur, par_type first, par_type last)
{
Buffer * buf = cur.bv().buffer();
recordUndo(kind, cur, first, last, buf->undostack());
buf->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 << "undostack:\n";
+ //for (size_t i = 0, n = buf->undostack().size(); i != n && i < 6; ++i)
+ // lyxerr << " " << i << ": " << buf->undostack()[i] << std::endl;
}
}
+void recordUndoInset(LCursor & cur, Undo::undo_kind kind)
+{
+ LCursor c = cur;
+ c.pop();
+ recordUndo(c, kind);
+}
+
+
void recordUndoSelection(LCursor & cur, Undo::undo_kind kind)
{
recordUndo(kind, cur, cur.selBegin().par(), cur.selEnd().par());
}
-void recordUndo(LCursor & cur, Undo::undo_kind kind, paroffset_type from)
+void recordUndo(LCursor & cur, Undo::undo_kind kind, par_type from)
{
recordUndo(kind, cur, cur.par(), from);
}
void recordUndo(LCursor & cur, Undo::undo_kind kind,
- paroffset_type from, paroffset_type to)
+ par_type from, par_type to)
{
recordUndo(kind, cur, from, to);
}
projects / lyx.git / blobdiff