#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "undo_funcs.h"
#include "lyxtext.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"
/// the flag used by FinishUndo();
bool undo_finished;
-/// FIXME
+/// whether actions are not added to the undo stacks
bool undo_frozen;
namespace {
if (result)
return result;
}
- return bv->text->ownerParagraph();
+ return &*bv->text->ownerParagraphs().begin();
}
freezeUndo();
bv->unlockInset(bv->theLockingInset());
finishUndo();
- bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+ bv->text->postPaint(0);
unFreezeUndo();
}
num = -1;
}
}
- t->setCursorIntern(bv, firstUndoParagraph(bv, num), 0);
+ t->setCursorIntern(firstUndoParagraph(bv, num), 0);
}
// 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);
}
}
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;
}
}
+ // 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 (tmppar3) {
+ if (undopar) {
+ undopar->previous(before);
if (before)
- before->next(tmppar3);
- else
- bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
- tmppar3);
-
- tmppar3->previous(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) {
- bv->text->ownerParagraph(firstUndoParagraph(bv, undo.number_of_inset_id)->id(),
- behind);
- tmppar3 = 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);
+ }
+
+ undopar = behind;
}
}
- if (tmppar4) {
- tmppar4->next(behind);
- if (behind)
- behind->previous(tmppar4);
- }
// Set the cursor for redoing
- if (before) {
+ if (before) { // if we have a par before the undopar
Inset * it = before->inInset();
if (it)
- it->getLyXText(bv)->setCursorIntern(bv, before, 0);
+ it->getLyXText(bv)->setCursorIntern(before, 0);
else
- bv->text->setCursorIntern(bv, 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.
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)->redoParagraphs(
it->getLyXText(bv)->cursor,
endpar);
if (tmppar) {
} else {
t = bv->text;
}
- t->setCursorIntern(bv, tmppar, undo.cursor_pos);
+ 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, t->cursor.row());
+ t->updateCounters();
bv->fitCursor();
}
- bv->updateInset(it, false);
- bv->text->setCursorIntern(bv, bv->text->cursor.par(),
+ bv->updateInset(it);
+ bv->text->setCursorIntern(bv->text->cursor.par(),
bv->text->cursor.pos());
} else {
- bv->text->redoParagraphs(bv, bv->text->cursor, endpar);
+ bv->text->redoParagraphs(bv->text->cursor, endpar);
if (tmppar) {
LyXText * t;
Inset * it = tmppar->inInset();
} else {
t = bv->text;
}
- t->setCursorIntern(bv, tmppar, undo.cursor_pos);
+ 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, t->cursor.row());
+ t->updateCounters();
}
}
}
finishUndo();
- bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
+ bv->text->postPaint(0);
return true;
}
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) {
void setCursorParUndo(BufferView * bv)
{
- setUndo(bv, Undo::FINISH, bv->text->cursor.par(),
+ setUndo(bv, Undo::FINISH, &*bv->text->cursor.par(),
bv->text->cursor.par()->next());
}
projects / lyx.git / blobdiff