dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
{
- if (cmd.action != LFUN_INSET_APPLY)
- return UNDISPATCHED;
-
- InsetCommandParams p;
- InsetCommandMailer::string2params(cmd.argument, p);
- if (p.getCmdName().empty())
- return UNDISPATCHED;
-
- setParams(p);
- if (view())
- view()->updateInset(this, true);
-
- return DISPATCHED;
+ dispatch_result result = UNDISPATCHED;
+
+ switch (cmd.action) {
+ case LFUN_INSET_MODIFY: {
+ InsetCommandParams p;
+ InsetCommandMailer::string2params(cmd.argument, p);
+ if (p.getCmdName().empty())
+ break;
+
+ setParams(p);
+ cmd.view()->updateInset(this);
+ result = DISPATCHED;
+ }
+ break;
+
+ case LFUN_INSET_DIALOG_UPDATE: {
+ InsetCommandMailer mailer(cmd.argument, *this);
+ mailer.updateDialog(cmd.view());
+ }
+ break;
+
+ case LFUN_MOUSE_RELEASE:
+ edit(cmd.view(), cmd.x, cmd.y, cmd.button());
+ break;
+
+ default:
+ break;
+ }
+
+ return result;
}
+
InsetCommandMailer::InsetCommandMailer(string const & name,
InsetCommand & inset)
: name_(name), inset_(inset)
params.setContents(string());
params.setOptions(string());
- string name;
- string body = split(in, name, ' ');
-
- if (body.empty())
- return;
-
- istringstream data(body);
+ istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
- params.read(lex);
+ if (lex.isOK()) {
+ lex.next();
+ string const name = lex.getString();
+ }
+
+ // This is part of the inset proper that is usually swallowed
+ // by Buffer::readInset
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != "LatexCommand")
+ return;
+ }
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}