#include "support/lstrings.h"
+#include <boost/assert.hpp>
+
using lyx::support::split;
using lyx::support::trim;
using std::endl;
-
+using std::string;
using std::ostream;
LyXAction lyxaction;
-namespace {
-
-/// return true if the given action is a pseudo-action
-inline bool isPseudoAction(int a)
-{
- return a > int(LFUN_LASTACTION);
-}
-
-}
-
void LyXAction::newFunc(kb_action action, string const & name,
unsigned int attrib)
{ LFUN_ENDBUF, "buffer-end", ReadOnly },
{ LFUN_ENDBUFSEL, "buffer-end-select", ReadOnly },
{ LFUN_EXPORT, "buffer-export", ReadOnly },
+ { LFUN_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly },
+ { LFUN_PRINT, "buffer-print", ReadOnly },
{ LFUN_IMPORT, "buffer-import", NoBuffer },
{ LFUN_MENUNEW, "buffer-new", NoBuffer },
{ LFUN_MENUNEWTMPLT,"buffer-new-template", NoBuffer },
{ LFUN_INSERT_LABEL, "label-insert", Noop },
{ LFUN_INSET_OPTARG, "optional-insert", Noop },
{ LFUN_INSERT_BIBITEM, "bibitem-insert", Noop },
+ { LFUN_INSERT_LINE, "line-insert", Noop },
+ { LFUN_INSERT_PAGEBREAK, "pagebreak-insert", Noop },
{ LFUN_LANGUAGE, "language", Noop },
{ LFUN_LAYOUT, "layout", Noop },
{ LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", ReadOnly },
{ LFUN_MENU_OPEN_BY_NAME, "menu-open", NoBuffer },
{ LFUN_MENU_SEPARATOR, "menu-separator-insert", Noop },
{ LFUN_META_FAKE, "meta-prefix", NoBuffer },
- { LFUN_INSET_MINIPAGE, "minipage-insert", Noop },
{ LFUN_INSERT_BRANCH, "branch-insert", Noop },
+ { LFUN_INSERT_CHARSTYLE, "charstyle-insert", Noop },
{ LFUN_INSERT_NOTE, "note-insert", Noop },
+ { LFUN_INSERT_BOX, "box-insert", Noop },
{ LFUN_GOTONOTE, "note-next", ReadOnly },
- { LFUN_INSET_TOGGLE, "inset-toggle", ReadOnly },
+ { LFUN_INSET_TOGGLE, "", ReadOnly },
+ { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly },
+ { LFUN_ALL_INSETS_TOGGLE, "all-insets-toggle", ReadOnly },
{ LFUN_DOWN_PARAGRAPH, "paragraph-down", ReadOnly },
{ LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select", ReadOnly },
{ LFUN_GOTO_PARAGRAPH, "paragraph-goto", ReadOnly },
{ LFUN_TRANSPOSE_CHARS, "chars-transpose", Noop },
{ LFUN_FLOAT_LIST, "float-list", Noop },
{ LFUN_ESCAPE, "escape", ReadOnly },
- { LFUN_FORKS_KILL, "kill-forks", NoBuffer },
{ LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", NoBuffer },
{ LFUN_TRACK_CHANGES, "track-changes", Noop },
{ LFUN_MERGE_CHANGES, "merge-changes", Noop },
{ LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
{ LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
{ LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset", Noop },
- { LFUN_DIALOG_UPDATE, "dialog-update", Noop },
+ { LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
{ LFUN_DIALOG_HIDE, "dialog-hide", Noop },
{ LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
{ LFUN_INSET_APPLY, "inset-apply", Noop },
{ LFUN_PARAGRAPH_APPLY, "paragraph-params-apply", Noop },
{ LFUN_PARAGRAPH_UPDATE, "", Noop },
{ LFUN_EXTERNAL_EDIT, "external-edit", Noop },
+ { LFUN_GRAPHICS_EDIT, "graphics-edit", Noop },
+ { LFUN_REPEAT, "repeat", NoBuffer },
+ { LFUN_WORD_FIND, "word-find", ReadOnly },
+ { LFUN_WORD_REPLACE, "word-replace", Noop },
+ { LFUN_KEYMAP_TOGGLE, "keymap-toggle", Noop },
+ { LFUN_LANGUAGE_BUFFER, "buffer-language", Noop },
+ { LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop },
+ { LFUN_TEXTCLASS_LOAD, "textclass-load", Noop },
+ { LFUN_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop },
+ { LFUN_BUFFERPARAMS_APPLY, "buffer-params-apply", Noop },
+ { LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer },
+ { LFUN_INSET_REFRESH, "", Noop },
+ { LFUN_NEXTBUFFER, "buffer-next", ReadOnly },
+ { LFUN_PREVIOUSBUFFER, "buffer-previous", ReadOnly },
{ LFUN_NOACTION, "", Noop }
};
// Returns an action tag from a string.
-kb_action LyXAction::LookupFunc(string const & func)
+FuncRequest LyXAction::lookupFunc(string const & func) const
{
string const func2 = trim(func);
- if (func2.empty()) return LFUN_NOACTION;
- // split action and arg
- string actstr;
- string const argstr = split(func2, actstr, ' ');
- lyxerr[Debug::ACTION] << "Action: " << actstr << '\n'
- << "Arg : " << argstr << endl;
+ if (func2.empty()) {
+ return FuncRequest(LFUN_NOACTION);
+ }
- func_map::const_iterator fit = lyx_func_map.find(actstr);
+ string cmd;
+ string const arg = split(func2, cmd, ' ');
- return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION;
+ func_map::const_iterator fit = lyx_func_map.find(cmd);
+
+ return fit != lyx_func_map.end() ? FuncRequest(fit->second, arg) : FuncRequest(LFUN_UNKNOWN_ACTION);
}
-string const LyXAction::getActionName(int action) const
+string const LyXAction::getActionName(kb_action action) const
{
- info_map::const_iterator const it = lyx_info_map.find(kb_action(action));
- if (it != lyx_info_map.end())
- return it->second.name;
- return string();
+ info_map::const_iterator const it = lyx_info_map.find(action);
+ return it != lyx_info_map.end() ? it->second.name : string();
}
{
info_map::const_iterator ici = lyx_info_map.find(action);
- if (ici != lyx_info_map.end()) {
- return ici->second.attrib & flag;
- } else {
- // it really should exist, but...
- lyxerr << "LyXAction::funcHasFlag: "
- "No info about kb_action: " << action << '\n';
- return false;
+ if (ici == lyx_info_map.end()) {
+ lyxerr << "action: " << action << " is not known." << endl;
+ BOOST_ASSERT(false);
}
+
+ return ici->second.attrib & flag;
}