case LFUN_SAVE_AS_DEFAULT:
case LFUN_BUFFERPARAMS_APPLY:
case LFUN_LYXRC_APPLY:
+ case LFUN_NEXTBUFFER:
+ case LFUN_PREVIOUSBUFFER:
// these are handled in our dispatch()
break;
} //namespace anon
-void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
+void LyXFunc::dispatch(FuncRequest const & cmd)
{
string const argument = cmd.argument;
kb_action const action = cmd.action;
view()->setBuffer(bufferlist.getBuffer(argument));
break;
+ case LFUN_NEXTBUFFER:
+ view()->setBuffer(bufferlist.next(view()->buffer()));
+ break;
+
+ case LFUN_PREVIOUSBUFFER:
+ view()->setBuffer(bufferlist.previous(view()->buffer()));
+ break;
+
case LFUN_FILE_NEW:
NewFile(view(), argument);
break;
break;
}
+ case LFUN_SAVE_AS_DEFAULT: {
+ string const fname =
+ AddName(AddPath(user_lyxdir(), "templates/"),
+ "defaults.lyx");
+ Buffer defaults(fname);
+
+ istringstream ss(argument);
+ LyXLex lex(0,0);
+ lex.setStream(ss);
+ int const unknown_tokens = defaults.readHeader(lex);
+
+ if (unknown_tokens != 0) {
+ lyxerr << "Warning in LFUN_SAVE_AS_DEFAULT!\n"
+ << unknown_tokens << " unknown token"
+ << (unknown_tokens == 1 ? "" : "s")
+ << endl;
+ }
+
+ if (defaults.writeFile(defaults.fileName()))
+ setMessage(_("Document defaults saved in ")
+ + MakeDisplayPath(fname));
+ else
+ setErrorMessage(_("Unable to save document defaults"));
+ break;
+ }
+
case LFUN_BUFFERPARAMS_APPLY: {
biblio::CiteEngine const engine =
owner->buffer()->params().cite_engine;
default: {
update = false;
- DispatchResult res = view()->cursor().dispatch(cmd);
- if (res.dispatched())
- update |= res.update();
+ view()->cursor().dispatch(cmd);
+ if (view()->cursor().result().dispatched())
+ update |= view()->cursor().result().update();
else
update |= view()->dispatch(cmd);
}
if (view()->available()) {
- if (view()->fitCursor() || update)
+ // Redraw screen unless explicitly told otherwise.
+ // This also initializes the position cache for all insets
+ // in (at least partially) visible top-level paragraphs.
+ if (update)
+ view()->update();
+
+ // fitCursor() needs valid inset position. The previous call to
+ // update() makes sure we have such even for freshly created
+ // insets.
+ if (view()->fitCursor())
view()->update();
// if we executed a mutating lfun, mark the buffer as dirty
if (getStatus(cmd).enabled()
if (view()->cursor().inTexted()) {
view()->owner()->updateLayoutChoice();
- sendDispatchMessage(getMessage(), cmd, verbose);
+ sendDispatchMessage(getMessage(), cmd);
}
}
}
-void LyXFunc::sendDispatchMessage(string const & msg,
- FuncRequest const & cmd, bool verbose)
+void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & cmd)
{
owner->updateMenubar();
owner->updateToolbars();
+ const bool verbose = (cmd.origin == FuncRequest::UI
+ || cmd.origin == FuncRequest::COMMANDBUFFER);
+
if (cmd.action == LFUN_SELFINSERT || !verbose) {
lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl;
if (!msg.empty())