X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=a9e0bba8e29a0c4c1ff0019b6fd1996270f85522;hb=e14f8daca43c69d638a37d7883d398bcc68d459c;hp=7a1c6fdf574474119e403ad72071da4c333c42ce;hpb=7f0ac0932b475e95cac9565cefbcede9e170c7c1;p=lyx.git diff --git a/src/Undo.cpp b/src/Undo.cpp index 7a1c6fdf57..a9e0bba8e2 100644 --- a/src/Undo.cpp +++ b/src/Undo.cpp @@ -18,9 +18,12 @@ #include "Undo.h" #include "Buffer.h" +#include "BufferList.h" #include "BufferParams.h" #include "buffer_funcs.h" #include "Cursor.h" +#include "CutAndPaste.h" +#include "ErrorList.h" #include "Paragraph.h" #include "ParagraphList.h" #include "Text.h" @@ -29,6 +32,7 @@ #include "mathed/MathData.h" #include "insets/Inset.h" +#include "insets/InsetText.h" #include "support/debug.h" #include "support/gettext.h" @@ -37,6 +41,7 @@ #include #include +#include using namespace std; using namespace lyx::support; @@ -195,13 +200,13 @@ private: struct Undo::Private { Private(Buffer & buffer) : buffer_(buffer), undo_finished_(true), - group_id(0), group_level(0) {} + group_id_(0), group_level_(0) {} // Do one undo/redo step - void doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, + void doUndoRedoAction(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherStack); // Apply one undo/redo group. Returns false if no undo possible. - bool textUndoOrRedo(CursorData & cur, bool isUndoOperation); + bool undoRedoAction(CursorData & cur, bool isUndoOperation); /// void doRecordUndo(UndoKind kind, @@ -232,9 +237,11 @@ struct Undo::Private bool undo_finished_; /// Current group Id. - size_t group_id; + size_t group_id_; /// Current group nesting nevel. - size_t group_level; + size_t group_level_; + /// the position of cursor before the group was created + CursorData group_cur_before_; }; @@ -263,8 +270,8 @@ void Undo::clear() d->undo_finished_ = true; // We used to do that, but I believe it is better to keep // groups (only used in Buffer::reload for now (JMarc) - //d->group_id = 0; - //d->group_level = 0; + //d->group_id_ = 0; + //d->group_level_ = 0; } @@ -308,9 +315,9 @@ void Undo::Private::doRecordUndo(UndoKind kind, CursorData const & cur_before, UndoElementStack & stack) { - if (!group_level) { + if (!group_level_) { LYXERR0("There is no group open (creating one)"); - ++group_id; + ++group_id_; } if (first_pit > last_pit) @@ -338,10 +345,11 @@ void Undo::Private::doRecordUndo(UndoKind kind, return; } - LYXERR(Debug::UNDO, "Create undo element of group " << group_id); + LYXERR(Debug::UNDO, "Create undo element of group " << group_id_); // create the position information of the Undo entry - UndoElement undo(kind, cur_before, cell, from, end, 0, 0, - buffer_.isClean(), group_id); + UndoElement undo(kind, + group_cur_before_.empty() ? cur_before : group_cur_before_, + cell, from, end, 0, 0, buffer_.isClean(), group_id_); // fill in the real data to be saved if (cell.inMathed()) { @@ -390,17 +398,18 @@ void Undo::Private::recordUndo(UndoKind kind, void Undo::Private::doRecordUndoBufferParams(CursorData const & cur_before, - UndoElementStack & stack) + UndoElementStack & stack) { - if (!group_level) { + if (!group_level_) { LYXERR0("There is no group open (creating one)"); - ++group_id; + ++group_id_; } - LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id); + LYXERR(Debug::UNDO, "Create full buffer undo element of group " << group_id_); // create the position information of the Undo entry - UndoElement undo(cur_before, buffer_.params(), buffer_.isClean(), - group_id); + UndoElement undo(group_cur_before_.empty() ? cur_before : group_cur_before_, + buffer_.params(), buffer_.isClean(), + group_id_); // push the undo entry to undo stack stack.push(undo); @@ -421,7 +430,7 @@ void Undo::Private::recordUndoBufferParams(CursorData const & cur) } -void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack) +void Undo::Private::doUndoRedoAction(CursorData & cur, UndoElementStack & stack, UndoElementStack & otherstack) { // Adjust undo stack and get hold of current undo data. UndoElement & undo = stack.top(); @@ -449,7 +458,13 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, // This is a params undo element delete otherstack.top().bparams; otherstack.top().bparams = new BufferParams(buffer_.params()); + DocumentClassConstPtr olddc = buffer_.params().documentClassPtr(); buffer_.params() = *undo.bparams; + // The error list is not supposed to be helpful here. + ErrorList el; + cap::switchBetweenClasses(olddc, buffer_.params().documentClassPtr(), + static_cast(buffer_.inset()), el); + LATTEST(el.empty()); } else if (dit.inMathed()) { // We stored the full cell here as there is not much to be // gained by storing just 'a few' paragraphs (most if not @@ -457,6 +472,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, //LYXERR0("undo.array: " << *undo.array); LBUFERR(undo.array); dit.cell().swap(*undo.array); + dit.inset().setBuffer(buffer_); delete undo.array; undo.array = 0; } else { @@ -484,6 +500,15 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, for (; pit != end; ++pit) pit->setInsetOwner(dit.realInset()); plist.insert(first, undo.pars->begin(), undo.pars->end()); + + // set the buffers for insets we created + ParagraphList::iterator fpit = plist.begin(); + advance(fpit, undo.from); + ParagraphList::iterator fend = fpit; + advance(fend, undo.pars->size()); + for (; fpit != fend; ++fpit) + fpit->setInsetBuffers(buffer_); + delete undo.pars; undo.pars = 0; } @@ -503,7 +528,7 @@ void Undo::Private::doTextUndoOrRedo(CursorData & cur, UndoElementStack & stack, } -bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation) +bool Undo::Private::undoRedoAction(CursorData & cur, bool isUndoOperation) { undo_finished_ = true; @@ -517,10 +542,7 @@ bool Undo::Private::textUndoOrRedo(CursorData & cur, bool isUndoOperation) const size_t gid = stack.top().group_id; while (!stack.empty() && stack.top().group_id == gid) - doTextUndoOrRedo(cur, stack, otherstack); - - // Adapt the new material to current buffer. - buffer_.setBuffersForInsets(); // FIXME This shouldn't be here. + doUndoRedoAction(cur, stack, otherstack); return true; } @@ -532,48 +554,77 @@ void Undo::finishUndo() } -bool Undo::textUndo(CursorData & cur) +bool Undo::undoAction(CursorData & cur) { - return d->textUndoOrRedo(cur, true); + return d->undoRedoAction(cur, true); } -bool Undo::textRedo(CursorData & cur) +bool Undo::redoAction(CursorData & cur) { - return d->textUndoOrRedo(cur, false); + return d->undoRedoAction(cur, false); } void Undo::beginUndoGroup() { - if (d->group_level == 0) { + if (d->group_level_ == 0) { // create a new group - ++d->group_id; - LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id); + ++d->group_id_; + LYXERR(Debug::UNDO, "+++++++ Creating new group " << d->group_id_ + << " for buffer " << &d->buffer_); } - ++d->group_level; + ++d->group_level_; +} + + +void Undo::beginUndoGroup(CursorData const & cur_before) +{ + beginUndoGroup(); + if (d->group_cur_before_.empty()) + d->group_cur_before_ = cur_before; } void Undo::endUndoGroup() { - if (d->group_level == 0) { + if (d->group_level_ == 0) { LYXERR0("There is no undo group to end here"); return; } - --d->group_level; - if (d->group_level == 0) { + --d->group_level_; + if (d->group_level_ == 0) { // real end of the group - LYXERR(Debug::UNDO, "-------End of group " << d->group_id); + d->group_cur_before_ = CursorData(); + LYXERR(Debug::UNDO, "------- End of group " << d->group_id_ + << " of buffer " << &d->buffer_); } } -void Undo::endUndoGroup(CursorData const & cur) +void Undo::endUndoGroup(CursorData const & cur_after) { endUndoGroup(); if (!d->undostack_.empty() && d->undostack_.top().cur_after.empty()) - d->undostack_.top().cur_after = cur; + d->undostack_.top().cur_after = cur_after; +} + + +void Undo::splitUndoGroup(CursorData const & cur) +{ + size_t const level = d->group_level_; + d->group_level_ = 1; + endUndoGroup(cur); + beginUndoGroup(cur); + d->group_level_ = level; +} + + +bool Undo::activeUndoGroup() const +{ + return d->group_level_ > 0 + && !d->undostack_.empty() + && d->undostack_.top().group_id == d->group_id_; } @@ -621,15 +672,32 @@ void Undo::recordUndoFullBuffer(CursorData const & cur) /// UndoGroupHelper class stuff +class UndoGroupHelper::Impl { + friend class UndoGroupHelper; + set buffers_; +}; + + +UndoGroupHelper::UndoGroupHelper(Buffer * buf) : d(new UndoGroupHelper::Impl) +{ + resetBuffer(buf); +} + + +UndoGroupHelper::~UndoGroupHelper() +{ + for (Buffer * buf : d->buffers_) + if (theBufferList().isLoaded(buf) || theBufferList().isInternal(buf)) + buf->undo().endUndoGroup(); + delete d; +} + void UndoGroupHelper::resetBuffer(Buffer * buf) { - if (buf == buffer_) - return; - if (buffer_) - buffer_->undo().endUndoGroup(); - buffer_ = buf; - if (buffer_) - buffer_->undo().beginUndoGroup(); + if (buf && d->buffers_.count(buf) == 0) { + d->buffers_.insert(buf); + buf->undo().beginUndoGroup(); + } }