#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"
#include "mathed/MathData.h"
#include "insets/Inset.h"
+#include "insets/InsetText.h"
#include "support/debug.h"
#include "support/gettext.h"
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,
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_;
};
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;
}
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)
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()) {
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);
if (undo.bparams)
doRecordUndoBufferParams(undo.cur_after, otherstack);
- else
+ else {
+ LATTEST(undo.end <= cell_dit.lastpit());
doRecordUndo(ATOMIC_UNDO, cell_dit,
undo.from, cell_dit.lastpit() - undo.end, undo.cur_after,
otherstack);
+ }
otherstack.top().cur_after = undo.cur_before;
// This does the actual undo/redo.
// 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<InsetText &>(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
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_);
}
- ++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_);
}
}
-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;
}
-// FIXME: remove these convenience functions and make
-// Private::recordUndo public as sole interface. The code in the
-// convenience functions can move to Cursor.cpp.
-
void Undo::recordUndo(CursorData const & cur, UndoKind kind)
{
d->recordUndo(kind, cur, cur.pit(), cur.pit(), cur);
}
-void Undo::recordUndoInset(CursorData const & cur, UndoKind kind,
- Inset const * inset)
+void Undo::recordUndo(CursorData const & cur, pit_type from, pit_type to)
+{
+ d->recordUndo(ATOMIC_UNDO, cur, from, to, cur);
+}
+
+
+void Undo::recordUndoInset(CursorData const & cur, Inset const * inset)
{
if (!inset || inset == &cur.inset()) {
DocIterator c = cur;
c.pop_back();
- d->recordUndo(kind, c, c.pit(), c.pit(), cur);
+ d->recordUndo(ATOMIC_UNDO, c, c.pit(), c.pit(), cur);
} else if (inset == cur.nextInset())
- recordUndo(cur, kind);
+ recordUndo(cur);
else
LYXERR0("Inset not found, no undo stack added.");
}
-void Undo::recordUndo(CursorData const & cur, UndoKind kind, pit_type from)
-{
- d->recordUndo(kind, cur, cur.pit(), from, cur);
-}
-
-
-void Undo::recordUndo(CursorData const & cur, UndoKind kind,
- pit_type from, pit_type to)
-{
- d->recordUndo(kind, cur, from, to, cur);
-}
-
-
void Undo::recordUndoBufferParams(CursorData const & cur)
{
d->recordUndoBufferParams(cur);
endUndoGroup();
}
+/// UndoGroupHelper class stuff
+
+/** FIXME: handle restarted groups
+ * It may happen that the buffers are visited in order buffer1,
+ * buffer2, buffer1. In this case, we want to have only one undo group
+ * in buffer1. One solution is to replace buffer_ with a set<Buffer*>,
+ * but I am not sure yet how to do it. A use case is
+ * InsetLabel::updateReferences.
+ */
+void UndoGroupHelper::resetBuffer(Buffer * buf)
+{
+ if (buf == buffer_)
+ return;
+ if (buffer_)
+ buffer_->undo().endUndoGroup();
+ buffer_ = buf;
+ if (buffer_)
+ buffer_->undo().beginUndoGroup();
+}
+
} // namespace lyx
projects / lyx.git / blobdiff