#include "undo_funcs.h"
#include "lyxtext.h"
+#include "funcrequest.h"
#include "BufferView.h"
#include "buffer.h"
#include "insets/updatableinset.h"
#include "insets/insettext.h"
#include "debug.h"
#include "support/LAssert.h"
-
#include "iterators.h"
#include <vector>
using boost::shared_ptr;
-/// the flag used by FinishUndo();
+/// The flag used by FinishUndo().
bool undo_finished;
-/// whether actions are not added to the undo stacks
+/// Whether actions are not added to the undo stacks.
bool undo_frozen;
namespace {
-/// utility to return the cursor
+/// Utility to return the cursor.
LyXCursor const & undoCursor(BufferView * bv)
{
if (bv->theLockingInset())
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.
+ * 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)
+ParagraphList * undoParagraphs(BufferView * bv, int inset_id)
{
Inset * inset = bv->buffer()->getInsetFromID(inset_id);
if (inset) {
- Paragraph * result = inset->getFirstParagraph(0);
- if (result)
+ ParagraphList * result = inset->getParagraphs(0);
+ if (result && !result->empty())
return result;
}
- return &*bv->text->ownerParagraphs().begin();
+ return &bv->text->ownerParagraphs();
}
}
-// 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;
+ ParIterator const before = b->getParFromID(undo.number_of_before_par);
+ ParIterator const behind = b->getParFromID(undo.number_of_behind_par);
+ ParIterator const null = b->par_iterator_end();
+
+ int const before_id = (before == null) ? -1 : before->id();
+ int const behind_id = (behind == null) ? -1 : behind->id();
+ int const inset_id = undo.number_of_inset_id;
- // if there's no before take the beginning
- // of the document for redoing
- if (!before) {
+ ParagraphList * plist = undoParagraphs(bv, inset_id);
+
+ ParagraphList::iterator first;
+ if (before == null) {
+ // if there's no before take the beginning of parlist.
+ first = plist->begin();
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) {
+ if (inset_id >= 0)
+ if (Inset * in = bv->buffer()->getInsetFromID(inset_id))
t = in->getLyXText(bv);
- } else {
- num = -1;
- }
- }
- t->setCursorIntern(firstUndoParagraph(bv, num), 0);
+ t->setCursorIntern(plist->begin(), 0);
+ } else {
+ first = *before;
+ ++first;
+ }
+ int const first_id = first->id();
+
+ int after_id;
+ ParagraphList::iterator after;
+ if (behind == null) {
+ // if there's no behind take the end of parlist.
+ after = plist->end();
+ after_id = -1;
+ } else {
+ after = *behind;
+ after_id = after->id();
}
- // replace the paragraphs with the undo informations
-
- Paragraph * undopar = undo.par;
- undo.par = 0; /* otherwise the undo destructor would
- delete the paragraph */
+ lyxerr << "\nbefore_id: " << before_id << "\n";
+ lyxerr << "first_id: " << first_id << "\n";
+ lyxerr << "after_id: " << after_id << "\n";
+ lyxerr << "behind_id: " << behind_id << "\n";
+ lyxerr << "inset_id: " << inset_id << "\n";
- // 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 * lastundopar = undopar;
- if (lastundopar) {
+ // Set the right(new) inset-owner of the paragraph if there is any.
+ if (!undo.pars.empty()) {
Inset * in = 0;
- if (before)
+ if (before != null)
in = before->inInset();
- else if (undo.number_of_inset_id >= 0)
- in = bv->buffer()->getInsetFromID(undo.number_of_inset_id);
- lastundopar->setInsetOwner(in);
- while (lastundopar->next()) {
- lastundopar = lastundopar->next();
- lastundopar->setInsetOwner(in);
- }
+ else if (inset_id >= 0)
+ in = bv->buffer()->getInsetFromID(inset_id);
+ for (size_t i = 0, n = undo.pars.size(); i < n; ++i)
+ undo.pars[i]->setInsetOwner(in);
}
- vector<Paragraph *> deletelist;
- Paragraph * deletepar;
+ // quick hack to make the common case work
+ if (undo.pars.size() == 1 && boost::next(first) == after) {
+ // first = *undo.pars[0];
+ lyxerr << "could use special case...\n";
+ }
- // 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 = undopar;
- while (deletepar && deletepar != behind) {
- deletelist.push_back(deletepar);
- tmppar = deletepar;
- deletepar = deletepar->next();
-
- // a memory optimization for edit:
+#if 0
+ // remove stuff between first and after
+ plist->erase(first, after);
+ // re-create first
+ if (before == null) {
+ // if there's no before take the beginning of parlist.
+ first = plist->begin();
+ } else {
+ first = *before;
+ ++first;
+ }
+
+#endif
+
+ // inset saved paragraphs
+ for (size_t i = 0, n = undo.pars.size(); i < n; ++i) {
+ lyxerr << " inserting par " << undo.pars[i]->id() << "\n";
+ lyxerr << " inserting plist: " << plist << "\n";
+ //plist->insert(first, new Paragraph(*undo.pars[i], true));
+ /*
+ // 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();
- }
- }
- }
-
- // The order here is VERY IMPORTANT. We have to set the right
- // next/prev pointer in the paragraphs so that a rebuild of
- // the LyXText works!!!
-
- // thread the end of the undo onto the par in front if any
- if (lastundopar) {
- lastundopar->next(behind);
- if (behind)
- behind->previous(lastundopar);
- }
-
- // put the new stuff in the list if there is one
- if (undopar) {
- undopar->previous(before);
- if (before)
- before->next(undopar);
- else {
- int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
- Paragraph * op = &*bv->buffer()->getParFromID(id);
- if (op && op->inInset()) {
- static_cast<InsetText*>(op->inInset())->paragraph(undopar);
- } else {
- bv->buffer()->paragraphs.set(undopar);
- }
- }
- } 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) {
- int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
- Paragraph * op = &*bv->buffer()->getParFromID(id);
- if (op && op->inInset()) {
- static_cast<InsetText*>(op->inInset())->paragraph(behind);
- } else {
- bv->buffer()->paragraphs.set(behind);
+ undo.pars[par]->setContentsFromPar(*deletelist.back());
+ ++par;
}
-
- undopar = behind;
- }
+ */
}
-
-
+
// Set the cursor for redoing
- if (before) { // if we have a par before the undopar
+ // if we have a par before the first.
+ if (before != null) {
Inset * it = before->inInset();
if (it)
- it->getLyXText(bv)->setCursorIntern(before, 0);
+ it->getLyXText(bv)->setCursorIntern(*before, 0);
else
- bv->text->setCursorIntern(before, 0);
+ bv->text->setCursorIntern(*before, 0);
}
-// we are not ready for this we cannot set the cursor for a paragraph
-// which is not already in a row of LyXText!!!
-#if 0
- else { // otherwise this is the first one and we start here
- Inset * it = undopar->inInset();
- if (it)
- it->getLyXText(bv)->setCursorIntern(bv, undopar, 0);
- else
- bv->text->setCursorIntern(bv, undopar, 0);
- }
-#endif
- Paragraph * endpar = 0;
- // calculate the endpar for redoing the paragraphs.
- if (behind)
- endpar = behind->next();
+ UpdatableInset * it = 0;
+ if (first != plist->begin())
+ it = static_cast<UpdatableInset*>(first->inInset());
- tmppar = &*bv->buffer()->getParFromID(undo.number_of_cursor_par);
- UpdatableInset* it = 0;
- if (undopar)
- it = static_cast<UpdatableInset*>(undopar->inInset());
- if (it) {
- it->getLyXText(bv)->redoParagraphs(
- 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(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->fitCursor();
+ LyXText * text = it ? it->getLyXText(bv) : bv->text;
+
+ text->redoParagraphs(text->cursor, plist->end());
+
+ ParIterator tmppar = bv->buffer()->getParFromID(inset_id);
+
+ if (tmppar != null) {
+ LyXText * t;
+ Inset * it = tmppar->inInset();
+ if (it) {
+ FuncRequest cmd(bv, LFUN_INSET_EDIT, "left");
+ it->localDispatch(cmd);
+ t = it->getLyXText(bv);
+ } else {
+ t = bv->text;
}
+ t->setCursorIntern(*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();
+ }
+
+ if (it) {
+ bv->fitCursor();
bv->updateInset(it);
bv->text->setCursorIntern(bv->text->cursor.par(),
bv->text->cursor.pos());
- } else {
- bv->text->redoParagraphs(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(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();
- }
}
- // 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->postPaint(0);
+
return true;
}
bool createUndo(BufferView * bv, Undo::undo_kind kind,
- ParagraphList::iterator itfirst, ParagraphList::iterator itbehind,
+ ParagraphList::iterator itfirst, ParagraphList::iterator itlast,
shared_ptr<Undo> & u)
{
- Paragraph * first = &*itfirst;
- Paragraph * behind = &*itbehind;
- lyx::Assert(first);
+ Buffer * b = bv->buffer();
- int before_number = -1;
- int behind_number = -1;
- int inset_id = -1;
+ ParIterator null = b->par_iterator_end();
+ ParIterator prev = null;
+ ParIterator before = null;
+ ParIterator first = null;
+ ParIterator last = null;
+ ParIterator behind = null;
- if (first->previous())
- before_number = first->previous()->id();
- if (behind)
- behind_number = behind->id();
- if (first->inInset())
- inset_id = first->inInset()->id();
+ int const first_id = itfirst->id();
+ int const last_id = itlast->id();
- Buffer * b = bv->buffer();
+ for (ParIterator it = b->par_iterator_begin(); it != null; ++it) {
+ if ((*it)->id() == first_id) {
+ first = it;
+ before = prev;
+ }
+ if ((*it)->id() == last_id) {
+ last = it;
+ behind = last;
+ ++behind;
+ }
+ prev = it;
+ }
+
+ if (last == null)
+ last = first;
+
+ int const before_id = (before == null) ? -1 : before->id();
+ int const behind_id = (behind == null) ? -1 : behind->id();
+ int inset_id = (first->inInset()) ? first->inInset()->id() : -1;
+
+ lyxerr << "\nbefore_id: " << before_id << "\n";
+ lyxerr << "first_id: " << first_id << "\n";
+ lyxerr << "last_id: " << last_id << "\n";
+ lyxerr << "behind_id: " << behind_id << "\n";
+ lyxerr << "inset_id: " << inset_id << "\n";
+
+ ParagraphList * plist = 0;
+ if (first != null)
+ plist = &first.plist();
+ else if (behind != null)
+ plist = &behind.plist();
+ else if (!plist) {
+ lyxerr << "plist from buffer (should this happen?)\n";
+ plist = &b->paragraphs;
+ }
- // Undo::EDIT and Undo::FINISH are
+ // 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
// 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
+ // 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
+ b->undostack.top()->number_of_before_par == before_id &&
+ b->undostack.top()->number_of_behind_par == behind_id) {
+ // No undo needed.
return false;
}
}
- // 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();
- }
- 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);
-
- // a memory optimization: Just store the layout information
- // when only edit
- if (kind == Undo::EDIT) {
- tmppar2->clearContents();
- }
-
- undopar = tmppar2;
+ // Create a new Undo.
+ std::vector<Paragraph *> undo_pars;
- 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);
+ for (ParagraphList::iterator it = *first; it != *last; ++it)
+ undo_pars.push_back(new Paragraph(*it, true));
+ undo_pars.push_back(new Paragraph(**last, true));
- tmppar2 = tmppar2->next();
- }
- tmppar2->next(0);
- } else
- undopar = 0; // nothing to replace (undo of delete maybe)
+ // 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();
int cursor_par = undoCursor(bv).par()->id();
- int cursor_pos = undoCursor(bv).pos();
+ int cursor_pos = undoCursor(bv).pos();
u.reset(new Undo(kind, inset_id,
- before_number, behind_number,
- cursor_par, cursor_pos, undopar));
+ before_id, behind_id, cursor_par, cursor_pos, undo_pars));
undo_finished = false;
return true;
}
+
+// Returns false if no undo possible.
+bool textUndoOrRedo(BufferView * bv,
+ limited_stack<boost::shared_ptr<Undo> > & stack,
+ limited_stack<boost::shared_ptr<Undo> > & /*otherstack*/)
+{
+ //Buffer * b = bv->buffer();
+
+ if (stack.empty()) {
+ finishNoUndo(bv);
+ return false;
+ }
+
+ shared_ptr<Undo> undo = stack.top();
+ stack.pop();
+ finishUndo();
+
+ if (!undo_frozen) {
+/*
+ ParIterator p = b->getParFromID(undo->number_of_before_par);
+ bool ok = false;
+ ParagraphList::iterator first;
+ // default constructed?
+ ParIterator const end = b->par_iterator_end();
+ if (p != end) {
+ first = p.par();
+ if (first->next())
+ first = first->next();
+ } else
+ first = undoParagraphs(bv, undo->number_of_inset_id)->begin();
+ if (first) {
+ shared_ptr<Undo> u;
+ ParIterator behind = b->getParFromID(undo->number_of_behind_par);
+ if (createUndo(bv, undo->kind, first, behind.par(), u))
+ otherstack.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;
+}
+
} // 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();
-
- if (b->redostack.empty()) {
- finishNoUndo(bv);
- return false;
- }
-
- shared_ptr<Undo> undo = b->redostack.top();
- b->redostack.pop();
- finishUndo();
+ return textUndoOrRedo(bv, bv->buffer()->redostack,
+ bv->buffer()->undostack);
+}
- 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,
- ParagraphList::iterator first, ParagraphList::iterator behind)
+ ParagraphList::iterator first, ParagraphList::iterator last)
{
+#warning DISABLED
+ //return;
if (!undo_frozen) {
shared_ptr<Undo> u;
- if (createUndo(bv, kind, &*first, &*behind, u))
+ if (createUndo(bv, kind, first, last, u))
bv->buffer()->undostack.push(u);
bv->buffer()->redostack.clear();
}
}
-void setRedo(BufferView * bv, Undo::undo_kind kind,
- ParagraphList::iterator first, ParagraphList::iterator 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