#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "undo_funcs.h"
#include "lyxtext.h"
+#include "funcrequest.h"
#include "BufferView.h"
#include "buffer.h"
-#include "insets/inset.h"
+#include "insets/updatableinset.h"
+#include "insets/insettext.h"
#include "debug.h"
#include "support/LAssert.h"
-
#include "iterators.h"
-#include <vector>
-
-using std::vector;
-using boost::shared_ptr;
-
-/// the flag used by FinishUndo();
+/// The flag used by FinishUndo().
bool undo_finished;
-/// FIXME
+/// Whether actions are not added to the undo stacks.
bool undo_frozen;
namespace {
-/// utility to return the cursor
-LyXCursor const & undoCursor(BufferView * bv)
-{
- if (bv->theLockingInset())
- return bv->theLockingInset()->cursor(bv);
- return bv->text->cursor;
-}
-
-/**
- * returns a pointer to the very first Paragraph depending of where we are
- * so it will return the first paragraph of the buffer or the first paragraph
- * of the textinset we're in.
- */
-Paragraph * firstUndoParagraph(BufferView * bv, int inset_id)
-{
- Inset * inset = bv->buffer()->getInsetFromID(inset_id);
- if (inset) {
- Paragraph * result = inset->getFirstParagraph(0);
- if (result)
- return result;
- }
- return bv->text->ownerParagraph();
-}
-
/**
* Finish the undo operation in the case there was no entry
freezeUndo();
bv->unlockInset(bv->theLockingInset());
finishUndo();
- bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+ bv->text->postPaint(0);
unFreezeUndo();
}
-// returns false if no undo possible
+// Returns false if no undo possible.
bool textHandleUndo(BufferView * bv, Undo & undo)
{
- Buffer * b = bv->buffer();
-
- Paragraph * before =
- b->getParFromID(undo.number_of_before_par);
- Paragraph * behind =
- b->getParFromID(undo.number_of_behind_par);
- Paragraph * tmppar;
- Paragraph * tmppar2;
-
- // if there's no before take the beginning
- // of the document for redoing
- if (!before) {
- LyXText * t = bv->text;
- int num = undo.number_of_inset_id;
- if (undo.number_of_inset_id >= 0) {
- Inset * in = bv->buffer()->getInsetFromID(num);
- if (in) {
- t = in->getLyXText(bv);
- } else {
- num = -1;
- }
- }
- t->setCursorIntern(bv, firstUndoParagraph(bv, num), 0);
- }
+ Buffer * buf = bv->buffer();
- // replace the paragraphs with the undo informations
-
- Paragraph * tmppar3 = undo.par;
- undo.par = 0; /* otherwise the undo destructor would
- delete the paragraph */
-
- // get last undo par and set the right(new) inset-owner of the
- // paragraph if there is any. This is not needed if we don't have
- // a paragraph before because then in is automatically done in the
- // function which assigns the first paragraph to an InsetText. (Jug)
- Paragraph * tmppar4 = tmppar3;
- if (tmppar4) {
- Inset * in = 0;
- if (before)
- in = before->inInset();
- else if (undo.number_of_inset_id >= 0)
- in = bv->buffer()->getInsetFromID(undo.number_of_inset_id);
- tmppar4->setInsetOwner(in);
- while (tmppar4->next()) {
- tmppar4 = tmppar4->next();
- tmppar4->setInsetOwner(in);
+ ParagraphList * plist = &buf->paragraphs;
+/*
+ ParIterator null = buf->par_iterator_end();
+
+ for (ParIterator it = buf->par_iterator_begin(); it != null; ++it)
+ if (it.plist().id() == undo.plist_id) {
+ plist = &it.plist();
+ break;
}
+*/
+
+ // Set the right(new) inset-owner of the paragraph if there is any.
+ UpdatableInset * inset =
+ static_cast<UpdatableInset *>(buf->getInsetFromID(undo.inset_id));
+
+ ParagraphList::iterator pit = undo.pars.begin();
+ ParagraphList::iterator end = undo.pars.end();
+ for ( ; pit != end; ++pit)
+ pit->setInsetOwner(inset);
+
+ //lyxerr << "\nhandle: inset_id: " << undo.inset_id << "\n";
+ //lyxerr << "handle: inset: " << inset << "\n";
+ //lyxerr << "handle: plist_id: " << undo.plist_id << "\n";
+ lyxerr << "handle: undo.pars.size(): " << undo.pars.size() << "\n";
+ lyxerr << "handle: first_offset: " << undo.first_par_offset << "\n";
+ lyxerr << "handle: last_offset: " << undo.last_par_offset << "\n";
+
+ // remove stuff between first and behind
+ {
+ ParagraphList::iterator first = plist->begin();
+ advance(first, undo.first_par_offset);
+ ParagraphList::iterator last = plist->begin();
+ advance(last, plist->size() - undo.last_par_offset);
+ lyxerr << "handle: first_id: " << first->id() << "\n";
+ lyxerr << "handle: last_id: " << last->id() << "\n";
+ lyxerr << "handle: remove: " << distance(first, last) + 1 << " pars\n";
+ plist->erase(first, ++last);
+ lyxerr << "handle: after remove\n";
}
- vector<Paragraph *> deletelist;
-
- Paragraph * deletepar;
-
- // now add old paragraphs to be deleted
- if (before != behind || (!behind && !before)) {
- if (before)
- deletepar = before->next();
- else
- deletepar = firstUndoParagraph(bv, undo.number_of_inset_id);
- tmppar2 = tmppar3;
- while (deletepar && deletepar != behind) {
- deletelist.push_back(deletepar);
- tmppar = deletepar;
- deletepar = deletepar->next();
-
- // a memory optimization for edit:
- // Only layout information
- // is stored in the undo. So restore
- // the text informations.
- if (undo.kind == Undo::EDIT) {
- tmppar2->setContentsFromPar(tmppar);
- tmppar2 = tmppar2->next();
- }
- }
+ // re-insert old stuff
+ {
+ ParagraphList::iterator first = plist->begin();
+ advance(first, undo.first_par_offset);
+ lyxerr << "handle: plist->size: " << plist->size() << "\n";
+ lyxerr << "handle: offset: " << undo.first_par_offset << "\n";
+ plist->insert(first, undo.pars.begin(), undo.pars.end());
+ lyxerr << "handle: after insert\n";
}
- // put the new stuff in the list if there is one
- if (tmppar3) {
- if (before)
- before->next(tmppar3);
- else
- bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
- tmppar3);
-
- tmppar3->previous(before);
- } else {
- // We enter here on DELETE undo operations where we have to
- // substitue the second paragraph with the first if the removed
- // one is the first!
- if (!before && behind) {
- bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
- behind);
- tmppar3 = behind;
+ /*
+ // A memory optimization for edit:
+ // Only layout information
+ // is stored in the undo. So restore
+ // the text informations.
+ if (undo.kind == Undo::EDIT) {
+ undo.pars[par]->setContentsFromPar(*deletelist.back());
+ ++par;
}
- }
- if (tmppar4) {
- tmppar4->next(behind);
- if (behind)
- behind->previous(tmppar4);
- }
+ */
+ // redo Paragraphs (should be handled outside undo...)
+ {
+ //LyXText * text = inset ? inset->getLyXText(bv) : bv->text;
+ LyXText * text = bv->text;
+ lyxerr << "handle: text: " << text << "\n";
+ if (undo.first_par_offset) {
+ ParagraphList::iterator redo = plist->begin();
+ lyxerr << "handle: 1\n";
+ advance(redo, undo.first_par_offset);
+ lyxerr << "handle: 2\n";
+ text->setCursorIntern(plist->begin(), 0);
+ }
+ lyxerr << "handle: 3\n";
+ text->redoParagraphs(text->cursor, plist->end());
+ lyxerr << "handle: after redo\n";
- // Set the cursor for redoing
- if (before) {
- Inset * it = before->inInset();
- if (it)
- it->getLyXText(bv)->setCursorIntern(bv, before, 0);
- else
- bv->text->setCursorIntern(bv, before, 0);
+ if (inset) {
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, "left");
+ inset->localDispatch(cmd);
+ }
+ }
+
+ if (inset) {
+ lyxerr << "fit cursor...\n";
+ bv->fitCursor();
+ bv->updateInset(inset);
}
- Paragraph * endpar = 0;
- // calculate the endpar for redoing the paragraphs.
- if (behind)
- endpar = behind->next();
-
- tmppar = bv->buffer()->getParFromID(undo.number_of_cursor_par);
- UpdatableInset* it = 0;
- if (tmppar3)
- it = static_cast<UpdatableInset*>(tmppar3->inInset());
- if (it) {
- it->getLyXText(bv)->redoParagraphs(bv,
- it->getLyXText(bv)->cursor,
- endpar);
- if (tmppar) {
- it = static_cast<UpdatableInset*>(tmppar->inInset());
- LyXText * t;
- if (it) {
- it->edit(bv);
- t = it->getLyXText(bv);
- } else {
- t = bv->text;
- }
- t->setCursorIntern(bv, tmppar, undo.cursor_pos);
- // clear any selection and set the selection cursor
- // for an evt. new selection.
- t->clearSelection();
- t->selection.cursor = t->cursor;
- t->updateCounters(bv, t->cursor.row());
- bv->fitCursor();
- }
- bv->updateInset(it, false);
- bv->text->setCursorIntern(bv, bv->text->cursor.par(),
- bv->text->cursor.pos());
- } else {
- bv->text->redoParagraphs(bv, bv->text->cursor, endpar);
- if (tmppar) {
- LyXText * t;
- Inset * it = tmppar->inInset();
- if (it) {
- it->edit(bv);
- t = it->getLyXText(bv);
- } else {
- t = bv->text;
- }
- t->setCursorIntern(bv, tmppar, undo.cursor_pos);
- // clear any selection and set the selection cursor
- // for an evt. new selection.
- t->clearSelection();
- t->selection.cursor = t->cursor;
- t->updateCounters(bv, t->cursor.row());
- }
+ // set cursor
+ {
+ LyXText * text = inset ? inset->getLyXText(bv) : bv->text;
+ ParagraphList::iterator cursor = text->ownerParagraphs().begin();
+ advance(cursor, undo.cursor_par_offset);
+ text->setCursorIntern(cursor, undo.cursor_pos);
+ // Clear any selection and set the selection
+ // cursor for an evt. new selection.
+ text->clearSelection();
+ text->selection.cursor = text->cursor;
+ text->updateCounters();
+ lyxerr << "after setCursor\n";
}
- // And here it's safe enough to delete all removed paragraphs
- vector<Paragraph *>::iterator pit = deletelist.begin();
- if (pit != deletelist.end()) {
- for(;pit != deletelist.end(); ++pit) {
- (*pit)->previous(0);
- (*pit)->next(0);
- delete (*pit);
- }
- }
finishUndo();
- bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+ bv->text->postPaint(0);
+
+ lyxerr << "finished textHandleUndo...\n";
return true;
}
-bool createUndo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind, shared_ptr<Undo> & u)
+void createUndo(BufferView * bv, Undo::undo_kind kind,
+ ParagraphList::iterator first, ParagraphList::iterator last,
+ limited_stack<Undo> & stack)
{
- lyx::Assert(first);
+ Buffer * buf = bv->buffer();
- int before_number = -1;
- int behind_number = -1;
- int inset_id = -1;
+ ParagraphList * plist = 0;
+ ParIterator null = buf->par_iterator_end();
- if (first->previous())
- before_number = first->previous()->id();
- if (behind)
- behind_number = behind->id();
- if (first->inInset())
- inset_id = first->inInset()->id();
+ lyxerr << "\n";
- Buffer * b = bv->buffer();
+ UpdatableInset * inset = first->inInset();
+ LyXText * text = inset ? inset->getLyXText(bv) : bv->text;
+ int const inset_id = inset ? inset->id() : -1;
- // Undo::EDIT and Undo::FINISH are
+#if 0
+ // this is what we'd like to have in the end for small grained undo
+ for (ParIterator it = buf->par_iterator_begin(); it != null; ++it) {
+ if (it->id() == first->id()) {
+ plist = &it.plist();
+ break;
+ }
+ }
+
+#else
+
+ // and that's the big stick we wield now
+ lyxerr << "create: first_id orig: " << first->id() << "\n";
+ lyxerr << "create: last_id orig: " << last->id() << "\n";
+ plist = &buf->paragraphs;
+ // this is what we'd like to have in the end for small grained undo
+ for (ParIterator it = buf->par_iterator_begin(); it != null; ++it) {
+ if (it->id() == first->id())
+ first = it.outerPar();
+ if (it->id() == last->id())
+ last = it.outerPar();
+ }
+
+#endif
+
+ int const first_offset = std::distance(plist->begin(), first);
+ int const last_offset = std::distance(last, plist->end());
+
+ if (last == plist->end()) {
+ lyxerr << "*** createUndo: last == end should not happen\n";
+ }
+
+
+ // Undo::EDIT and Undo::FINISH are
// always finished. (no overlapping there)
// overlapping only with insert and delete inside one paragraph:
// Nobody wants all removed character
// appear one by one when undoing.
// EDIT is special since only layout information, not the
// contents of a paragaph are stored.
- if (!undo_finished && (kind != Undo::EDIT) && (kind != Undo::FINISH)) {
- // check whether storing is needed
- if (!b->undostack.empty() &&
- b->undostack.top()->kind == kind &&
- b->undostack.top()->number_of_before_par == before_number &&
- b->undostack.top()->number_of_behind_par == behind_number) {
- // no undo needed
- return false;
+ if (!undo_finished && kind != Undo::EDIT && kind != Undo::FINISH) {
+ // Check whether storing is needed.
+ if (!buf->undostack.empty() &&
+ buf->undostack.top().kind == kind &&
+ buf->undostack.top().first_par_offset == first_offset &&
+ buf->undostack.top().last_par_offset == last_offset) {
+ // No undo needed.
+ return;
}
}
- // create a new Undo
- Paragraph * undopar;
-
- Paragraph * start = const_cast<Paragraph *>(first);
- Paragraph * end = 0;
-
- if (behind)
- end = const_cast<Paragraph*>(behind->previous());
- else {
- end = start;
- while (end->next())
- end = end->next();
+ // Create a new Undo.
+ int const cursor_offset = std::distance
+ (text->ownerParagraphs().begin(), text->cursor.par());
+
+ //lyxerr << "create: plist_id: " << plist->id() << "\n";
+ //lyxerr << "create: inset_id: " << inset_id << "\n";
+ lyxerr << "create: first_id: " << first->id() << "\n";
+ lyxerr << "create: last_id: " << last->id() << "\n";
+ lyxerr << "create: first_offset: " << first_offset << "\n";
+ lyxerr << "create: last_offset: " << last_offset << "\n";
+ lyxerr << "create: cursor_offset: " << cursor_offset << "\n";
+ lyxerr << "create: cursor_pos: " << text->cursor.pos() << "\n";
+
+ stack.push(Undo(kind, inset_id, 0, //plist->id(),
+ first_offset, last_offset,
+ cursor_offset, text->cursor.pos(),
+ ParagraphList()));
+
+ ParagraphList & undo_pars = stack.top().pars;
+
+ for (ParagraphList::iterator it = first; it != last; ++it) {
+ undo_pars.push_back(*it);
+ undo_pars.back().id(it->id());
}
- if (start && end && (start != end->next()) &&
- ((before_number != behind_number) ||
- ((before_number < 0) && (behind_number < 0))))
- {
- Paragraph * tmppar = start;
- Paragraph * tmppar2 = new Paragraph(*tmppar, true);
+ undo_pars.push_back(*last);
+ undo_pars.back().id(last->id());
- // a memory optimization: Just store the layout information
- // when only edit
- if (kind == Undo::EDIT) {
- tmppar2->clearContents();
- }
+ // A memory optimization: Just store the layout
+ // information when only edit.
+#warning Waste...
+ //if (kind == Undo::EDIT)
+ // for (size_t i = 0, n = undo_pars.size(); i < n; ++i)
+ // undo_pars[i]->clearContents();
- undopar = tmppar2;
+ undo_finished = false;
+}
- while (tmppar != end && tmppar->next()) {
- tmppar = tmppar->next();
- tmppar2->next(new Paragraph(*tmppar, true));
- // a memory optimization: Just store the layout
- // information when only edit
- if (kind == Undo::EDIT) {
- tmppar2->clearContents();
- }
- tmppar2->next()->previous(tmppar2);
- tmppar2 = tmppar2->next();
- }
- tmppar2->next(0);
- } else
- undopar = 0; // nothing to replace (undo of delete maybe)
+// Returns false if no undo possible.
+bool textUndoOrRedo(BufferView * bv,
+ limited_stack<Undo> & stack,
+ limited_stack<Undo> & otherstack)
+{
+ if (stack.empty()) {
+ finishNoUndo(bv);
+ return false;
+ }
- int cursor_par = undoCursor(bv).par()->id();
- int cursor_pos = undoCursor(bv).pos();
+ Undo undo = stack.top();
+ stack.pop();
+ finishUndo();
- u.reset(new Undo(kind, inset_id,
- before_number, behind_number,
- cursor_par, cursor_pos, undopar));
+ if (!undo_frozen) {
+ otherstack.push(undo);
+ otherstack.top().pars.clear();
+ Buffer * buf = bv->buffer();
+ ParagraphList & plist = buf->paragraphs;
+ lyxerr << "\nredo: first: " << undo.first_par_offset << "\n";
+ lyxerr << "redo: last: " << undo.last_par_offset << "\n";
+ lyxerr << "redo: size: " << plist.size() << "\n";
+ if (undo.first_par_offset + undo.last_par_offset <= int(plist.size())) {
+ ParagraphList::iterator first = plist.begin();
+ advance(first, undo.first_par_offset);
+ ParagraphList::iterator last = plist.begin();
+ advance(last, plist.size() - undo.last_par_offset + 1);
+ otherstack.top().pars.insert(otherstack.top().pars.begin(), first, last);
+ }
+ }
- undo_finished = false;
- return true;
+ // Now we can unlock the inset for safety because the inset
+ // pointer could be changed during the undo-function. Anyway
+ // if needed we have to lock the right inset/position if this
+ // is requested.
+ freezeUndo();
+ bv->unlockInset(bv->theLockingInset());
+ bool const ret = textHandleUndo(bv, undo);
+ unFreezeUndo();
+ return ret;
}
} // namespace anon
+
void finishUndo()
{
- // makes sure the next operation will be stored
+ // Makes sure the next operation will be stored.
undo_finished = true;
}
void freezeUndo()
{
- // this is dangerous and for internal use only
+ // This is dangerous and for internal use only.
undo_frozen = true;
}
void unFreezeUndo()
{
- // this is dangerous and for internal use only
+ // This is dangerous and for internal use only.
undo_frozen = false;
}
-// returns false if no undo possible
bool textUndo(BufferView * bv)
{
- Buffer * b = bv->buffer();
-
- if (b->undostack.empty()) {
- finishNoUndo(bv);
- return false;
- }
-
- shared_ptr<Undo> undo = b->undostack.top();
- b->undostack.pop();
- finishUndo();
-
- if (!undo_frozen) {
- Paragraph * first = b->getParFromID(undo->number_of_before_par);
- if (first && first->next())
- first = first->next();
- else if (!first)
- first = firstUndoParagraph(bv, undo->number_of_inset_id);
- if (first) {
- shared_ptr<Undo> u;
- if (createUndo(bv, undo->kind, first,
- b->getParFromID(undo->number_of_behind_par), u))
- b->redostack.push(u);
- }
- }
-
- // now we can unlock the inset for saftey because the inset pointer could
- // be changed during the undo-function. Anyway if needed we have to lock
- // the right inset/position if this is requested.
- freezeUndo();
- bv->unlockInset(bv->theLockingInset());
- bool const ret = textHandleUndo(bv, *undo.get());
- unFreezeUndo();
- return ret;
+ return textUndoOrRedo(bv, bv->buffer()->undostack,
+ bv->buffer()->redostack);
}
-// returns false if no redo possible
bool textRedo(BufferView * bv)
{
- Buffer * b = bv->buffer();
+ return textUndoOrRedo(bv, bv->buffer()->redostack,
+ bv->buffer()->undostack);
+}
- if (b->redostack.empty()) {
- finishNoUndo(bv);
- return false;
- }
- shared_ptr<Undo> undo = b->redostack.top();
- b->redostack.pop();
- finishUndo();
+void setUndo(BufferView * bv, Undo::undo_kind kind)
+{
+ setUndo(bv, kind, bv->text->cursor.par());
+}
- if (!undo_frozen) {
- Paragraph * first = bv->buffer()->getParFromID(undo->number_of_before_par);
- if (first && first->next())
- first = first->next();
- else if (!first)
- first = firstUndoParagraph(bv, undo->number_of_inset_id);
- if (first) {
- shared_ptr<Undo> u;
- if (createUndo(bv, undo->kind, first,
- bv->buffer()->getParFromID(undo->number_of_behind_par), u))
- bv->buffer()->undostack.push(u);
- }
- }
- // now we can unlock the inset for saftey because the inset pointer could
- // be changed during the undo-function. Anyway if needed we have to lock
- // the right inset/position if this is requested.
- freezeUndo();
- bv->unlockInset(bv->theLockingInset());
- bool ret = textHandleUndo(bv, *undo.get());
- unFreezeUndo();
- return ret;
+void setUndo(BufferView * bv, Undo::undo_kind kind,
+ ParagraphList::iterator first)
+{
+ setUndo(bv, kind, first, first);
}
void setUndo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind)
+ ParagraphList::iterator first, ParagraphList::iterator last)
{
if (!undo_frozen) {
- shared_ptr<Undo> u;
- if (createUndo(bv, kind, first, behind, u))
- bv->buffer()->undostack.push(u);
+ createUndo(bv, kind, first, last, bv->buffer()->undostack);
bv->buffer()->redostack.clear();
}
}
-void setRedo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind)
-{
- shared_ptr<Undo> u;
- if (createUndo(bv, kind, first, behind, u))
- bv->buffer()->redostack.push(u);
-}
-
-
void setCursorParUndo(BufferView * bv)
{
- setUndo(bv, Undo::FINISH, bv->text->cursor.par(),
- bv->text->cursor.par()->next());
+ setUndo(bv, Undo::FINISH, bv->text->cursor.par());
}
projects / lyx.git / blobdiff