/// the flag used by FinishUndo();
bool undo_finished;
-/// FIXME
+/// whether actions are not added to the undo stacks
bool undo_frozen;
namespace {
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
bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
unFreezeUndo();
}
-
-
+
+
// 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 =
// replace the paragraphs with the undo informations
- Paragraph * tmppar3 = undo.par;
+ Paragraph * undopar = undo.par;
undo.par = 0; /* otherwise the undo destructor would
delete the paragraph */
// 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) {
+ Paragraph * lastundopar = undopar;
+ if (lastundopar) {
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);
+ lastundopar->setInsetOwner(in);
+ while (lastundopar->next()) {
+ lastundopar = lastundopar->next();
+ lastundopar->setInsetOwner(in);
}
}
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;
+ tmppar2 = undopar;
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
}
// put the new stuff in the list if there is one
- if (tmppar3) {
+ if (undopar) {
if (before)
- before->next(tmppar3);
+ before->next(undopar);
else
bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
- tmppar3);
+ undopar);
- tmppar3->previous(before);
+ undopar->previous(before);
} else {
// We enter here on DELETE undo operations where we have to
// substitue the second paragraph with the first if the removed
if (!before && behind) {
bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
behind);
- tmppar3 = behind;
+ undopar = behind;
}
}
- if (tmppar4) {
- tmppar4->next(behind);
+
+ // thread the end of the undo onto the par in front if any
+ if (lastundopar) {
+ lastundopar->next(behind);
if (behind)
- behind->previous(tmppar4);
+ behind->previous(lastundopar);
}
tmppar = bv->buffer()->getParFromID(undo.number_of_cursor_par);
UpdatableInset* it = 0;
- if (tmppar3)
- it = static_cast<UpdatableInset*>(tmppar3->inInset());
+ if (undopar)
+ it = static_cast<UpdatableInset*>(undopar->inInset());
if (it) {
it->getLyXText(bv)->redoParagraphs(bv,
it->getLyXText(bv)->cursor,
// 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());
+ t->selection.cursor = t->cursor;
+ t->updateCounters(bv);
bv->fitCursor();
}
bv->updateInset(it, false);
// 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());
+ t->selection.cursor = t->cursor;
+ t->updateCounters(bv);
}
}
delete (*pit);
}
}
-
+
finishUndo();
bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
return true;
}
-
+
bool createUndo(BufferView * bv, Undo::undo_kind kind,
Paragraph const * first, Paragraph const * behind, shared_ptr<Undo> & u)
{
inset_id = first->inInset()->id();
Buffer * b = bv->buffer();
-
+
// Undo::EDIT and Undo::FINISH are
// always finished. (no overlapping there)
// overlapping only with insert and delete inside one paragraph:
return false;
}
}
-
+
// create a new Undo
Paragraph * undopar;
while (tmppar != end && tmppar->next()) {
tmppar = tmppar->next();
-// FIXME: what does this #if 0 mean ?
-#if 0
tmppar2->next(new Paragraph(*tmppar, true));
-#else
- Paragraph * ptmp = new Paragraph(*tmppar, true);
- tmppar2->next(ptmp);
-#endif
// a memory optimization: Just store the layout
// information when only edit
if (kind == Undo::EDIT) {
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())
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.
finishNoUndo(bv);
return false;
}
-
+
shared_ptr<Undo> undo = b->redostack.top();
b->redostack.pop();
finishUndo();
-
+
if (!undo_frozen) {
Paragraph * first = bv->buffer()->getParFromID(undo->number_of_before_par);
if (first && first->next())
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.
projects / lyx.git / blobdiff