#include "BufferView.h"
#include "lyxtext.h"
#include "paragraph.h"
+#include "ParagraphList.h"
#include "mathed/math_support.h"
+#include "insets/inset.h"
#include <algorithm>
-using std::advance;
-
-using lyx::par_type;
+using lyx::pit_type;
+using std::advance;
using std::endl;
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, par_type first_par, par_type last_par,
- limited_stack<Undo> & stack)
+bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
{
- BOOST_ASSERT(first_par <= cur.lastpar());
- BOOST_ASSERT(last_par <= cur.lastpar());
+ StableDocIterator tmpi2 = i2;
+ tmpi2.pos() = i1.pos();
+ return i1 == tmpi2;
+}
- if (first_par > last_par)
- std::swap(first_par, last_par);
+void doRecordUndo(Undo::undo_kind kind,
+ DocIterator const & cell,
+ pit_type first_pit, pit_type last_pit,
+ DocIterator const & cur,
+ BufferParams const & bparams,
+ bool isFullBuffer,
+ limited_stack<Undo> & stack)
+{
+ if (first_pit > last_pit)
+ std::swap(first_pit, last_pit);
// create the position information of the Undo entry
Undo undo;
undo.kind = kind;
- undo.cursor = StableDocIterator(cur);
- undo.from = first_par;
- undo.end = cur.lastpar() - last_par;
+ undo.cell = cell;
+ undo.cursor = cur;
+ undo.bparams = bparams ;
+ 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;
// 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().kind == undo.kind
- && stack.top().from == undo.from
- && stack.top().end == undo.end)
+ && samePar(stack.top().cell, undo.cell)
+ && 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 const * text = cell.text();
BOOST_ASSERT(text);
- ParagraphList & plist = text->paragraphs();
- ParagraphList::iterator first = plist.begin();
- advance(first, first_par);
- ParagraphList::iterator last = plist.begin();
- advance(last, last_par + 1);
+ 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 = ParagraphList(first, last);
}
}
-void performUndoOrRedo(BufferView & bv, Undo const & undo)
+void recordUndo(Undo::undo_kind kind,
+ LCursor & cur, pit_type first_pit, pit_type last_pit,
+ limited_stack<Undo> & stack)
{
- LCursor & cur = bv.cursor();
- lyxerr << "undo, performing: " << undo << std::endl;
- cur.setCursor(undo.cursor.asDocIterator(&bv.buffer()->inset()), false);
+ BOOST_ASSERT(first_pit <= cur.lastpit());
+ BOOST_ASSERT(last_pit <= cur.lastpit());
- if (cur.inMathed()) {
+ doRecordUndo(kind, cur, first_pit, last_pit, cur,
+ cur.bv().buffer()->params(), false, stack);
+}
+
+
+
+// Returns false if no undo possible.
+bool textUndoOrRedo(BufferView & bv,
+ limited_stack<Undo> & stack, limited_stack<Undo> & otherstack)
+{
+ finishUndo();
+
+ if (stack.empty()) {
+ // Nothing to do.
+ return false;
+ }
+
+ // Adjust undo stack and get hold of current undo data.
+ Undo undo = stack.top();
+ stack.pop();
+
+ // We will store in otherstack the part of the document under 'undo'
+ Buffer * buf = bv.buffer();
+ DocIterator cell_dit = undo.cell.asDocIterator(&buf->inset());
+
+ doRecordUndo(Undo::ATOMIC, cell_dit,
+ undo.from, cell_dit.lastpit() - undo.end, bv.cursor(),
+ undo.bparams, undo.isFullBuffer,
+ otherstack);
+
+ // This does the actual undo/redo.
+ //lyxerr << "undo, performing: " << undo << std::endl;
+ DocIterator dit = undo.cell.asDocIterator(&buf->inset());
+ if (undo.isFullBuffer) {
+ // This is a full document
+ otherstack.top().bparams = buf->params();
+ buf->params() = undo.bparams;
+ buf->paragraphs() = undo.pars;
+ } 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!)
- 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();
// 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());
}
+ // Set cursor
+ LCursor & cur = bv.cursor();
+ cur.setCursor(undo.cursor.asDocIterator(&buf->inset()));
+ cur.selection() = false;
cur.resetAnchor();
finishUndo();
-}
-
-
-// returns false if no undo possible
-bool textUndoOrRedo(BufferView & bv,
- limited_stack<Undo> & stack, limited_stack<Undo> & otherstack)
-{
- if (stack.empty()) {
- // nothing to do
- finishUndo();
- return false;
- }
-
- Undo undo = stack.top();
- stack.pop();
- finishUndo();
-
- // this implements redo
- otherstack.push(undo);
- DocIterator dit =
- undo.cursor.asDocIterator(&bv.buffer()->inset());
- if (dit.inMathed()) {
- // Easy way out: store a full cell.
- otherstack.top().array = asString(dit.cell());
- } else {
- // As cells might be too large in texted, store just a part
- // of the paragraph list.
- 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);
- }
- }
- otherstack.top().cursor = bv.cursor();
- //lyxerr << " undo other: " << otherstack.top() << std::endl;
- 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, par_type first, par_type last)
+ LCursor & cur, pit_type first, pit_type last)
{
Buffer * buf = cur.bv().buffer();
recordUndo(kind, cur, first, last, buf->undostack());
void recordUndo(LCursor & cur, Undo::undo_kind kind)
{
- recordUndo(kind, cur, cur.par(), cur.par());
+ recordUndo(kind, cur, cur.pit(), cur.pit());
+}
+
+
+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());
+ recordUndo(kind, cur, cur.selBegin().pit(), cur.selEnd().pit());
}
-void recordUndo(LCursor & cur, Undo::undo_kind kind, par_type from)
+void recordUndo(LCursor & cur, Undo::undo_kind kind, pit_type from)
{
- recordUndo(kind, cur, cur.par(), from);
+ recordUndo(kind, cur, cur.pit(), from);
}
void recordUndo(LCursor & cur, Undo::undo_kind kind,
- par_type from, par_type to)
+ pit_type from, pit_type to)
{
recordUndo(kind, cur, from, to);
}
-void recordUndoFullDocument(LCursor &)
+void recordUndoFullDocument(BufferView * bv)
{
- //recordUndo(Undo::ATOMIC,
- // cur, 0, cur.bv().text()->paragraphs().size() - 1);
+ Buffer * buf = bv->buffer();
+ doRecordUndo(
+ Undo::ATOMIC,
+ doc_iterator_begin(buf->inset()),
+ 0, buf->paragraphs().size() - 1,
+ bv->cursor(),
+ buf->params(),
+ true,
+ buf->undostack()
+ );
+ undo_finished = false;
}
projects / lyx.git / blobdiff