* we are so it will return the first paragraph of the buffer or the
* first paragraph of the textinset we're in.
*/
-ParagraphList undoParagraphs(BufferView * bv, int inset_id)
+ParagraphList * undoParagraphs(BufferView * bv, int inset_id)
{
Inset * inset = bv->buffer()->getInsetFromID(inset_id);
if (inset) {
ParagraphList * result = inset->getParagraphs(0);
if (result && !result->empty())
- return *result;
+ return result;
}
- return bv->text->ownerParagraphs();
+ return &bv->text->ownerParagraphs();
}
ParIterator const before = b->getParFromID(undo.number_of_before_par);
ParIterator const behind = b->getParFromID(undo.number_of_behind_par);
- ParIterator const end = b->par_iterator_end();
+ ParIterator const null = b->par_iterator_end();
- // If there's no before take the beginning
- // of the document for redoing.
- if (before == 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;
+
+ 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(undoParagraphs(bv, num).begin(), 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();
}
+ 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";
+
// Set the right(new) inset-owner of the paragraph if there is any.
if (!undo.pars.empty()) {
Inset * in = 0;
- if (before != end)
+ if (before != null)
in = before->inInset();
- else if (undo.number_of_inset_id >= 0)
- in = bv->buffer()->getInsetFromID(undo.number_of_inset_id);
+ 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);
}
- // Replace the paragraphs with the undo informations.
- vector<Paragraph *> deletelist;
- // Now add old paragraphs to be deleted.
- if (before != behind || (behind == end && before == end)) {
- ParagraphList::iterator deletepar;
- if (before != end) {
- deletepar = *before;
- ++deletepar;
- } else {
- deletepar = undoParagraphs(bv, undo.number_of_inset_id).begin();
- }
- // this surprisingly fills the undo! (Andre')
- size_t par = 0;
- //while (deletepar && deletepar != *behind)
- while (deletepar != *behind) {
- deletelist.push_back(&*deletepar);
- ++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";
+ }
+
+#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
undo.pars[par]->setContentsFromPar(*deletelist.back());
++par;
}
- }
- }
-
- // 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 (!undo.pars.empty()) {
-#warning FIXME
- //undo.pars.back()->next(&**behind);
- //if (behind != end)
- //(&**behind)->previous(undo.pars.back());
- }
-
- // Put the new stuff in the list if there is one.
- Paragraph * undopar = undo.pars.empty() ? 0 : undo.pars.front();
- if (!undo.pars.empty()) {
-#warning FIXME
- //undo.pars.front()->previous(&**before);
- if (before != end) {
-#warning FIXME
- //(&**before)->next(undopar);
- } else {
- int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
- ParIterator op = bv->buffer()->getParFromID(id);
- if (op != end && op->inInset()) {
-#warning FIXME reimplementaion needed here
- //static_cast<InsetText*>(op->inInset())->paragraph(undopar);
- } else {
-#warning FIXME reimplementation needed here
- //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 == end && behind != end) {
- int id = undoParagraphs(bv, undo.number_of_inset_id).front().id();
- ParIterator op = bv->buffer()->getParFromID(id);
- if (op != end && op->inInset()) {
-#warning FIXME reimplementation needed here
- //static_cast<InsetText*>(op->inInset())->paragraph(&**behind);
- } else {
-#warning FIXME reimplementation needed here
- //bv->buffer()->paragraphs.set(&**behind);
- }
- undopar = &**behind;
- }
+ */
}
-
-
- // Set the cursor for redoing.
- // If we have a par before the undopar.
- if (before != end) {
+
+ // Set the cursor for redoing
+ // if we have a par before the first.
+ if (before != null) {
Inset * it = before->inInset();
if (it)
it->getLyXText(bv)->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
-
UpdatableInset * it = 0;
- if (undopar)
- it = static_cast<UpdatableInset*>(undopar->inInset());
+ if (first != plist->begin())
+ it = static_cast<UpdatableInset*>(first->inInset());
LyXText * text = it ? it->getLyXText(bv) : bv->text;
- ParagraphList::iterator endpar = text->ownerParagraphs().end();
-
- // Calculate the endpar for redoing the paragraphs.
- if (behind != end) {
- endpar = *behind;
- ++endpar;
- }
+ text->redoParagraphs(text->cursor, plist->end());
- text->redoParagraphs(text->cursor, endpar);
- ParIterator tmppar =
- bv->buffer()->getParFromID(undo.number_of_cursor_par);
+ ParIterator tmppar = bv->buffer()->getParFromID(inset_id);
- if (tmppar != end) {
+ if (tmppar != null) {
LyXText * t;
Inset * it = tmppar->inInset();
if (it) {
bv->text->cursor.pos());
}
- // And here it's safe enough to delete all removed paragraphs.
- vector<Paragraph *>::iterator pit = deletelist.begin();
- for(; pit != deletelist.end(); ++pit) {
-#warning FIXME
- //(*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);
+
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 * const first = &*itfirst;
- Paragraph * const behind = &*itbehind;
- lyx::Assert(first);
-
- int before_number = -1;
- int behind_number = -1;
- int inset_id = -1;
-
-#warning FIXME
- //if (first->previous())
- // before_number = first->previous()->id();
- if (behind)
- behind_number = behind->id();
- if (first->inInset())
- inset_id = first->inInset()->id();
-
Buffer * b = bv->buffer();
- // Undo::EDIT and Undo::FINISH are
+ ParIterator null = b->par_iterator_end();
+ ParIterator prev = null;
+ ParIterator before = null;
+ ParIterator first = null;
+ ParIterator last = null;
+ ParIterator behind = null;
+
+ int const first_id = itfirst->id();
+ int const last_id = itlast->id();
+
+ 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
// always finished. (no overlapping there)
// overlapping only with insert and delete inside one paragraph:
// Nobody wants all removed character
// 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) {
+ 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.
std::vector<Paragraph *> undo_pars;
- Paragraph const * end = 0;
-
- if (behind) {
-#warning FIXME
- //end = behind->previous();
- }else {
- end = first;
-#warning FIXME
- //while (end->next())
- // end = end->next();
- }
-
-#warning FIXME
-// if (first && end && (first != end->next()) &&
-// ((before_number != behind_number) ||
-// ((before_number < 0) && (behind_number < 0))))
-// {
-// undo_pars.push_back(new Paragraph(*first, true));
-// for (Paragraph * tmppar = first; tmppar != end && tmppar->next(); ) {
-// tmppar = tmppar->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]);
-// }
-// undo_pars.back()->next(0);
-// }
+ for (ParagraphList::iterator it = *first; it != *last; ++it)
+ undo_pars.push_back(new Paragraph(*it, true));
+ undo_pars.push_back(new Paragraph(**last, true));
// 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();
- }
+#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();
- //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, undo_pars));
+ before_id, behind_id, cursor_par, cursor_pos, undo_pars));
undo_finished = false;
return true;
if (first->next())
first = first->next();
} else
- first = undoParagraphs(bv, undo->number_of_inset_id).begin();
+ first = undoParagraphs(bv, undo->number_of_inset_id)->begin();
if (first) {
shared_ptr<Undo> u;
ParIterator behind = b->getParFromID(undo->number_of_behind_par);
void setUndo(BufferView * bv, Undo::undo_kind kind,
- ParagraphList::iterator first, ParagraphList::iterator behind)
+ ParagraphList::iterator first)
+{
+ setUndo(bv, kind, first, first);
+}
+
+
+void setUndo(BufferView * bv, Undo::undo_kind kind,
+ 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(),
- boost::next(bv->text->cursor.par()));
+ setUndo(bv, Undo::FINISH, bv->text->cursor.par());
}
projects / lyx.git / blobdiff