#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)
- return 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 * const before = &*b->getParFromID(undo.number_of_before_par);
Paragraph * const behind = &*b->getParFromID(undo.number_of_behind_par);
- // if there's no before take the beginning
- // of the document for redoing
+ // 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;
num = -1;
}
}
- t->setCursorIntern(firstUndoParagraph(bv, num), 0);
+ t->setCursorIntern(undoParagraphs(bv, num).begin(), 0);
}
- // replace the paragraphs with the undo informations
-
- Paragraph * undopar = 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 * 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)
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);
- }
+ for (size_t i = 0, n = undo.pars.size(); i < n; ++i)
+ undo.pars[i]->setInsetOwner(in);
}
+ // Replace the paragraphs with the undo informations.
vector<Paragraph *> deletelist;
- // now add old paragraphs to be deleted
+ // Now add old paragraphs to be deleted.
if (before != behind || (!behind && !before)) {
Paragraph * deletepar;
if (before)
deletepar = before->next();
else
- deletepar = firstUndoParagraph(bv, undo.number_of_inset_id);
- Paragraph * tmppar2 = undopar;
+ deletepar = &undoParagraphs(bv, undo.number_of_inset_id).front();
+ // this surprisingly fills the undo! (Andre')
+ size_t par = 0;
while (deletepar && deletepar != behind) {
deletelist.push_back(deletepar);
- Paragraph * tmppar = deletepar;
deletepar = deletepar->next();
- // a memory optimization for edit:
+ // 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();
+ undo.pars[par]->setContentsFromPar(*deletelist.back());
+ ++par;
}
}
}
// 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);
+ // Thread the end of the undo onto the par in front if any.
+ if (!undo.pars.empty()) {
+ undo.pars.back()->next(behind);
if (behind)
- behind->previous(lastundopar);
+ behind->previous(undo.pars.back());
}
- // put the new stuff in the list if there is one
- if (undopar) {
- undopar->previous(before);
+ // Put the new stuff in the list if there is one.
+ Paragraph * undopar = undo.pars.empty() ? 0 : undo.pars.front();
+ if (!undo.pars.empty()) {
+ undo.pars.front()->previous(before);
if (before)
before->next(undopar);
else {
- int id = firstUndoParagraph(bv, undo.number_of_inset_id)->id();
+ int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
Paragraph * op = &*bv->buffer()->getParFromID(id);
if (op && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(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!
+ // 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();
+ int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
Paragraph * op = &*bv->buffer()->getParFromID(id);
if (op && op->inInset()) {
static_cast<InsetText*>(op->inInset())->paragraph(behind);
} else {
bv->buffer()->paragraphs.set(behind);
}
-
undopar = behind;
}
}
- // Set the cursor for redoing
- if (before) { // if we have a par before the undopar
+ // Set the cursor for redoing.
+ // If we have a par before the undopar.
+ if (before) {
Inset * it = before->inInset();
if (it)
it->getLyXText(bv)->setCursorIntern(before, 0);
else
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
#endif
Paragraph * endpar = 0;
- // calculate the endpar for redoing the paragraphs.
+
+ // Calculate the endpar for redoing the paragraphs.
if (behind)
endpar = behind->next();
t = bv->text;
}
t->setCursorIntern(tmppar, undo.cursor_pos);
- // clear any selection and set the selection cursor
- // for an evt. new selection.
+ // Clear any selection and set the selection
+ // cursor for an evt. new selection.
t->clearSelection();
t->selection.cursor = t->cursor;
t->updateCounters();
t = bv->text;
}
t->setCursorIntern(tmppar, undo.cursor_pos);
- // clear any selection and set the selection cursor
- // for an evt. new selection.
+ // 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
+ // 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);
- }
- }
+ for(; pit != deletelist.end(); ++pit) {
+ (*pit)->previous(0);
+ (*pit)->next(0);
+ delete (*pit);
+ }
+
+ // Otherwise the undo destructor would delete the paragraphs
+ undo.pars.resize(0);
finishUndo();
bv->text->postPaint(0);
ParagraphList::iterator itfirst, ParagraphList::iterator itbehind,
shared_ptr<Undo> & u)
{
- Paragraph * first = &*itfirst;
- Paragraph * behind = &*itbehind;
+ Paragraph * const first = &*itfirst;
+ Paragraph * const behind = &*itbehind;
lyx::Assert(first);
int before_number = -1;
// 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
+ // No undo needed.
return false;
}
}
- // create a new Undo
- Paragraph * undopar = 0; // nothing to replace yet (undo of delete maybe)
+ // Create a new Undo.
+ std::vector<Paragraph *> undo_pars;
- Paragraph * start = first;
- Paragraph * end = &*boost::prior(itbehind);
+ Paragraph const * end = 0;
- if (start && end && (start != end->next()) &&
+ if (behind)
+ end = behind->previous();
+ else {
+ end = first;
+ while (end->next())
+ end = end->next();
+ }
+
+ if (first && end && (first != 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;
-
- while (tmppar != end && tmppar->next()) {
+ undo_pars.push_back(new Paragraph(*first, true));
+ for (Paragraph * tmppar = first; 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();
+ undo_pars.push_back(new Paragraph(*tmppar, true));
+ size_t const n = undo_pars.size();
+ undo_pars[n - 2]->next(undo_pars[n - 1]);
+ undo_pars[n - 1]->previous(undo_pars[n - 2]);
}
- tmppar2->next(0);
+ undo_pars.back()->next(0);
}
+ // A memory optimization: Just store the layout
+ // information when only edit.
+ 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();
+ //lyxerr << "createUndo: inset_id: " << inset_id << " before_number: "
+ // << before_number << " behind_number: " << behind_number << "\n";
u.reset(new Undo(kind, inset_id,
before_number, behind_number,
- cursor_par, cursor_pos, undopar));
+ cursor_par, cursor_pos, undo_pars));
undo_finished = false;
return true;
}
-// returns false if no undo possible
+// Returns false if no undo possible.
bool textUndoOrRedo(BufferView * bv,
limited_stack<boost::shared_ptr<Undo> > & stack,
limited_stack<boost::shared_ptr<Undo> > & otherstack)
if (first && first->next())
first = first->next();
else if (!first)
- first = firstUndoParagraph(bv, undo->number_of_inset_id);
+ first = &*undoParagraphs(bv, undo->number_of_inset_id).begin();
if (first) {
shared_ptr<Undo> u;
if (createUndo(bv, undo->kind, first,
}
}
- // 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.
+ // 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());
} // 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;
}
bool textUndo(BufferView * bv)
{
- return textUndoOrRedo(bv, bv->buffer()->undostack, bv->buffer()->redostack);
+ return textUndoOrRedo(bv, bv->buffer()->undostack,
+ bv->buffer()->redostack);
}
bool textRedo(BufferView * bv)
{
- return textUndoOrRedo(bv, bv->buffer()->redostack, bv->buffer()->undostack);
+ return textUndoOrRedo(bv, bv->buffer()->redostack,
+ bv->buffer()->undostack);
}
projects / lyx.git / blobdiff