#include "cursor.h"
#include "debug.h"
#include "BufferView.h"
-#include "iterators.h"
#include "lyxtext.h"
#include "paragraph.h"
-using lyx::paroffset_type;
+#include "mathed/math_support.h"
+#include <algorithm>
-/// The flag used by finishUndo().
-bool undo_finished;
+using lyx::pit_type;
-/// Whether actions are not added to the undo stacks.
-bool undo_frozen;
-
-Undo::Undo(undo_kind kind_, int text_, int index_,
- int first_par_, int end_par_, int cursor_par_, int cursor_pos_)
- :
- kind(kind_),
- text(text_),
- index(index_),
- first_par(first_par_),
- end_par(end_par_),
- cursor_par(cursor_par_),
- cursor_pos(cursor_pos_)
-{}
+using std::advance;
+using std::endl;
namespace {
-std::ostream & operator<<(std::ostream & os, Undo const & undo)
-{
- return os << " text: " << undo.text
- << " index: " << undo.index
- << " first: " << undo.first_par
- << " from end: " << undo.end_par
- << " cursor: " << undo.cursor_par
- << "/" << undo.cursor_pos;
-}
-
-
-// translates LyXText pointer into offset count from document begin
-ParIterator text2pit(Buffer & buf, LyXText * text, int & tcount)
-{
- tcount = 0;
- ParIterator pit = buf.par_iterator_begin();
- ParIterator end = buf.par_iterator_end();
-
- for ( ; pit != end; ++pit, ++tcount)
- if (pit.text(buf) == text)
- return pit;
- lyxerr << "undo: should not happen" << std::endl;
- return end;
-}
+/// The flag used by finishUndo().
+bool undo_finished;
-// translates offset from buffer begin to ParIterator
-ParIterator num2pit(Buffer & buf, int num)
+std::ostream & operator<<(std::ostream & os, Undo const & undo)
{
- ParIterator pit = buf.par_iterator_begin();
- ParIterator end = buf.par_iterator_end();
-
- for ( ; num && pit != end; ++pit, --num)
- ;
-
- if (pit != end)
- return pit;
-
- // don't crash early...
- lyxerr << "undo: num2pit: num: " << num << std::endl;
- BOOST_ASSERT(false);
- return buf.par_iterator_begin();
+ 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,
+ pit_type first_pit, pit_type last_pit,
+ DocIterator & cur,
limited_stack<Undo> & stack)
{
- if (first_par > last_par) {
- paroffset_type t = first_par;
- first_par = last_par;
- last_par = t;
- }
-
- Buffer & buf = *cur.bv().buffer();
- int const end_par = cur.lastpar() + 1 - last_par;
+ 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.cell = cell;
+ undo.cursor = cur;
+ 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).
- // overlapping only with insert and delete inside one paragraph:
- // nobody wants all removed character appear one by one when undoing.
- if (!undo_finished && kind != Undo::ATOMIC) {
- // Check whether storing is needed.
- if (!buf.undostack().empty()
- && buf.undostack().top().kind == kind
- && buf.undostack().top().first_par == first_par
- && buf.undostack().top().end_par == end_par) {
- // No additonal undo recording needed -
- // effectively, we combine undo recordings to one.
- return;
- }
+ // 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
+ && kind != Undo::ATOMIC
+ && !stack.empty()
+ && 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 (cell.inMathed()) {
+ // simply use the whole 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 = cell.text();
+ BOOST_ASSERT(text);
+ ParagraphList & plist = text->paragraphs();
+ ParagraphList::iterator first = plist.begin();
+ advance(first, first_pit);
+ ParagraphList::iterator last = plist.begin();
+ advance(last, last_pit + 1);
+ undo.pars = ParagraphList(first, last);
}
- // make and push the Undo entry
- int textnum;
- LyXText * text = cur.text();
- BOOST_ASSERT(text); // not in mathed (yet)
- ParIterator pit = text2pit(buf, text, textnum);
- stack.push(Undo(kind, textnum, pit.index(),
- first_par, end_par, cur.par(), cur.pos()));
+ // push the undo entry to undo stack
//lyxerr << "undo record: " << stack.top() << std::endl;
+ stack.push(undo);
- // record the relevant paragraphs
- ParagraphList & undo_pars = stack.top().pars;
-
- ParagraphList & plist = text->paragraphs();
- ParagraphList::iterator first = plist.begin();
- advance(first, first_par);
- ParagraphList::iterator last = plist.begin();
- advance(last, last_par);
+ // next time we'll try again to combine entries if possible
+ undo_finished = false;
+}
- for (ParagraphList::iterator it = first; it != last; ++it)
- undo_pars.push_back(*it);
- undo_pars.push_back(*last);
+void recordUndo(Undo::undo_kind kind,
+ LCursor & cur, pit_type first_pit, pit_type last_pit,
+ limited_stack<Undo> & stack)
+{
+ BOOST_ASSERT(first_pit <= cur.lastpit());
+ BOOST_ASSERT(last_pit <= cur.lastpit());
- // and make sure that next time, we should be combining if possible
- undo_finished = false;
+ recordUndo(kind, cur, first_pit, last_pit, cur, stack);
}
-// returns false if no undo possible
-bool performUndoOrRedo(BufferView & bv, Undo const & undo)
+void performUndoOrRedo(BufferView & bv, Undo const & undo)
{
- Buffer & buf = *bv.buffer();
- lyxerr << "undo, performing: " << undo << std::endl;
- ParIterator pit = num2pit(buf, undo.text);
- LyXText * text = pit.text(buf);
- ParagraphList & plist = text->paragraphs();
-
- // remove new stuff between first and last
- {
+ //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, dit.cell());
+ } else {
+ // Some finer machinery is needed here.
+ LyXText * text = dit.text();
+ BOOST_ASSERT(text);
+ ParagraphList & plist = text->paragraphs();
+
+ // remove new stuff between first and last
ParagraphList::iterator first = plist.begin();
- advance(first, undo.first_par);
+ advance(first, undo.from);
ParagraphList::iterator last = plist.begin();
- advance(last, plist.size() - undo.end_par);
- plist.erase(first, ++last);
- }
+ advance(last, plist.size() - undo.end);
+ plist.erase(first, last);
- // re-insert old stuff instead
- if (plist.empty()) {
- plist.assign(undo.pars.begin(), undo.pars.end());
- } else {
- ParagraphList::iterator first = plist.begin();
- advance(first, undo.first_par);
+ // re-insert old stuff instead
+ first = plist.begin();
+ advance(first, undo.from);
plist.insert(first, undo.pars.begin(), undo.pars.end());
}
- // set cursor
- lyxerr << "undo, text: " << undo.text
- << " inset: " << pit.inset()
- << " index: " << undo.index
- << " par: " << undo.cursor_par
- << " pos: " << undo.cursor_pos
- << std::endl;
-
- text->updateCounters();
-
- // rebreak the entire lyxtext
- buf.text().fullRebreak();
-
- ParIterator pit2 = num2pit(buf, undo.text);
- advance(pit2, undo.cursor_par);
- bv.setCursor(pit2, undo.cursor_pos);
-
+ LCursor & cur = bv.cursor();
+ cur.setCursor(undo.cursor.asDocIterator(&bv.buffer()->inset()));
+ cur.selection() = false;
+ cur.resetAnchor();
finishUndo();
- return true;
}
-// returns false if no undo possible
+// Returns false if no undo possible.
bool textUndoOrRedo(BufferView & bv,
limited_stack<Undo> & stack, limited_stack<Undo> & otherstack)
{
- Buffer & buf = *bv.buffer();
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();
- if (!undo_frozen) {
- otherstack.push(undo);
- otherstack.top().pars.clear();
- ParIterator pit = num2pit(buf, undo.text);
- ParagraphList & plist = pit.plist();
- if (undo.first_par + undo.end_par <= int(plist.size())) {
- ParagraphList::iterator first = plist.begin();
- advance(first, undo.first_par);
- ParagraphList::iterator last = plist.begin();
- advance(last, plist.size() - undo.end_par + 1);
- otherstack.top().pars.insert(otherstack.top().pars.begin(), first, last);
- }
- otherstack.top().cursor_pos = bv.cursor().pos();
- otherstack.top().cursor_par = bv.cursor().par();
- lyxerr << " undo other: " << otherstack.top() << std::endl;
- }
-
- freezeUndo();
- bool const ret = performUndoOrRedo(bv, undo);
- unFreezeUndo();
- return ret;
-}
-} // namespace anon
+ //
+ // 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.pit(), cur_dit.pit(),
+ cur_dit, otherstack);
+ }
+ else {
+ recordUndo(Undo::ATOMIC, ancestor_dit,
+ ancestor_dit.pit(),
+ ancestor_dit.pit(),
+ cur_dit, otherstack);
+ }
-void freezeUndo()
-{
- // this is dangerous and for internal use only
- undo_frozen = true;
+ //
+ // This does the actual undo.
+ //
+ performUndoOrRedo(bv, undo);
+ return true;
}
-
-void unFreezeUndo()
-{
- // this is dangerous and for internal use only
- undo_frozen = false;
-}
+} // namespace anon
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, pit_type first, pit_type last)
{
- if (undo_frozen)
- return;
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;
}
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().pit(), cur.selEnd().pit());
}
-void recordUndo(LCursor & cur, Undo::undo_kind kind, paroffset_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,
- paroffset_type from, paroffset_type to)
+ pit_type from, pit_type to)
{
recordUndo(kind, cur, from, to);
}