#include "LyX.h"
#include "LyXAction.h"
#include "lyxfind.h"
-#include "LyXFunc.h"
#include "Layout.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
setCursor(backcur.asDocIterator(&buffer_));
buffer_.errors("Class Switch");
- buffer_.updateLabels();
+ buffer_.updateBuffer();
}
/** Return the change status at cursor position, taking in account the
case LFUN_SCREEN_SHOW_CURSOR:
case LFUN_BIBTEX_DATABASE_ADD:
case LFUN_BIBTEX_DATABASE_DEL:
- case LFUN_NOTES_MUTATE:
case LFUN_ALL_INSETS_TOGGLE:
case LFUN_STATISTICS:
case LFUN_BRANCH_ADD_INSERT:
flag.setEnabled(true);
break;
- case LFUN_REGEXP_MODE:
- // FIXME: Test if current WorkArea is the search WorkArea
- flag.setEnabled(buffer().isInternal() && !cur.inRegexped());
- break;
-
case LFUN_LABEL_COPY_AS_REF: {
// if there is an inset at cursor, see whether it
// handles the lfun
}
-bool BufferView::dispatch(FuncRequest const & cmd)
+void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
//lyxerr << [ cmd = " << cmd << "]" << endl;
// Don't dispatch function that does not apply to internal buffers.
if (buffer_.isInternal()
&& lyxaction.funcHasFlag(cmd.action, LyXAction::NoInternal))
- return false;
+ return;
// We'll set this back to false if need be.
bool dispatched = true;
// We are most certainly here because of a change in the document
// It is then better to make sure that all dialogs are in sync with
// current document settings.
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
buffer_.params().clearLayoutModules();
buffer_.params().makeDocumentClass();
updateLayout(oldClass);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
buffer_.params().addLayoutModule(argument);
buffer_.params().makeDocumentClass();
updateLayout(oldClass);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
buffer_.params().setBaseClass(argument);
buffer_.params().makeDocumentClass();
updateLayout(oldDocClass);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
buffer_.params().setBaseClass(bc);
buffer_.params().makeDocumentClass();
updateLayout(oldClass);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
case LFUN_UNDO:
- cur.message(_("Undo"));
+ dr.setMessage(_("Undo"));
cur.clearSelection();
if (!cur.textUndo())
- cur.message(_("No further undo information"));
+ dr.setMessage(_("No further undo information"));
else
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_REDO:
- cur.message(_("Redo"));
+ dr.setMessage(_("Redo"));
cur.clearSelection();
if (!cur.textRedo())
- cur.message(_("No further redo information"));
+ dr.setMessage(_("No further redo information"));
else
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_FONT_STATE:
- cur.message(cur.currentState());
+ dr.setMessage(cur.currentState());
break;
case LFUN_BOOKMARK_SAVE:
// Set the cursor
dit.pos() = pos;
setCursor(dit);
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
} else {
// Switch to other buffer view and resend cmd
- theLyXFunc().dispatch(FuncRequest(
+ lyx::dispatch(FuncRequest(
LFUN_BUFFER_SWITCH, b->absFileName()));
- theLyXFunc().dispatch(cmd);
+ lyx::dispatch(cmd);
}
break;
}
case LFUN_CHANGE_NEXT:
findNextChange(this);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_CHANGE_PREVIOUS:
findPreviousChange(this);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_CHANGES_MERGE:
if (findNextChange(this) || findPreviousChange(this)) {
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
showDialog("changes");
}
break;
// accept everything in a single step to support atomic undo
buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_ALL_CHANGES_REJECT:
// Note: reject does not work recursively; the user may have to repeat the operation
buffer_.text().acceptOrRejectChanges(cur, Text::REJECT);
// FIXME: Move this LFUN to Buffer so that we don't have to do this:
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
case LFUN_WORD_FIND_FORWARD:
if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())
req = d->search_request_cache_;
if (req.argument().empty()) {
- theLyXFunc().dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
break;
}
if (find(this, req))
DocIterator end = cur.selectionEnd();
if (beg.pit() == end.pit()) {
for (pos_type p = beg.pos() ; p < end.pos() ; ++p) {
- if (cur.paragraph().isDeleted(p))
+ if (!cur.inMathed()
+ && cur.paragraph().isDeleted(p))
has_deleted = true;
}
}
case LFUN_MARK_OFF:
cur.clearSelection();
- cur.message(from_utf8(N_("Mark off")));
+ dr.setMessage(from_utf8(N_("Mark off")));
break;
case LFUN_MARK_ON:
cur.clearSelection();
cur.setMark(true);
- cur.message(from_utf8(N_("Mark on")));
+ dr.setMessage(from_utf8(N_("Mark on")));
break;
case LFUN_MARK_TOGGLE:
cur.setSelection(false);
if (cur.mark()) {
cur.setMark(false);
- cur.message(from_utf8(N_("Mark removed")));
+ dr.setMessage(from_utf8(N_("Mark removed")));
} else {
cur.setMark(true);
- cur.message(from_utf8(N_("Mark set")));
+ dr.setMessage(from_utf8(N_("Mark set")));
}
cur.resetAnchor();
break;
// It did not work too; no action needed.
break;
cur.clearSelection();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
bool update = in_texted && cur.bv().checkDepm(cur, old);
cur.finishUndo();
if (update)
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
y = getPos(cur, cur.boundary()).y_;
cur.finishUndo();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
y = getPos(cur, cur.boundary()).y_;
cur.finishUndo();
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
- break;
- }
-
- // This could be rewriten using some command like forall <insetname> <command>
- // once the insets refactoring is done.
- case LFUN_NOTES_MUTATE: {
- if (cmd.argument().empty())
- break;
-
- if (mutateNotes(cur, cmd.getArg(0), cmd.getArg(1))) {
- processUpdateFlags(Update::Force);
- }
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
cur.endUndoGroup();
cur = savecur;
cur.fixIfBroken();
- processUpdateFlags(Update::Force);
+ dr.update(Update::Force);
- if (iterations >= max_iter)
- cur.errorMessage(bformat(_("`inset-forall' interrupted because number of actions is larger than %1$d"), max_iter));
- else
- cur.message(bformat(_("Applied \"%1$s\" to %2$d insets"), from_utf8(commandstr), iterations));
+ if (iterations >= max_iter) {
+ dr.setError(true);
+ dr.setMessage(bformat(_("`inset-forall' interrupted because number of actions is larger than %1$d"), max_iter));
+ } else
+ dr.setMessage(bformat(_("Applied \"%1$s\" to %2$d insets"), from_utf8(commandstr), iterations));
break;
}
it->dispatch(tmpcur, fr);
}
}
- processUpdateFlags(Update::Force | Update::FitCursor);
+ dr.update(Update::Force | Update::FitCursor);
break;
}
cur.recordUndo();
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
inset->dispatch(cur, fr);
- processUpdateFlags(Update::SinglePar | Update::FitCursor);
+ dr.update(Update::SinglePar | Update::FitCursor);
break;
}
}
buffer_.undo().endUndoGroup();
- return dispatched;
+ dr.dispatched(dispatched);
+ return;
}
TocIterator end = toc.end();
for (; toc_it != end; ++toc_it) {
if (label == toc_it->str()) {
- dispatch(toc_it->action());
+ lyx::dispatch(toc_it->action());
return;
}
}
d->cursor_ = cur;
- buffer_.updateLabels();
+ buffer_.updateBuffer();
buffer_.changed(true);
return true;
}