X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=49617b0621b5e749913b08a6c7f993c2611367e5;hb=5c00d0f48978964a576070d5950556787aa365bb;hp=d5ff9ffd3bd38b92875daa52ca3a2d2a6e8e56db;hpb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index d5ff9ffd3b..49617b0621 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -17,12 +17,18 @@ #include "debug.h" #include "funcrequest.h" + #include "support/lstrings.h" -using namespace lyx::support; +#include + +using lyx::support::split; +using lyx::support::trim; -using std::ostream; using std::endl; +using std::string; +using std::ostream; + /* NAMING RULES FOR USER-COMMANDS @@ -43,16 +49,6 @@ using std::endl; 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) @@ -118,6 +114,8 @@ void LyXAction::init() { 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 }, @@ -190,6 +188,8 @@ void LyXAction::init() { 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 }, @@ -226,11 +226,14 @@ void LyXAction::init() { 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 }, @@ -300,7 +303,6 @@ void LyXAction::init() { 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 }, @@ -311,7 +313,7 @@ void LyXAction::init() { 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 }, @@ -323,6 +325,17 @@ void LyXAction::init() { 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", Noop }, + { 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_NOACTION, "", Noop } }; @@ -340,115 +353,28 @@ LyXAction::LyXAction() } -int LyXAction::searchActionArg(kb_action action, string const & arg) const -{ - arg_map::const_iterator pit = lyx_arg_map.find(action); - - if (pit == lyx_arg_map.end()) { - lyxerr[Debug::ACTION] << "Action " << action - << " does not have any pseudo actions." - << endl; - return LFUN_UNKNOWN_ACTION; - } - - arg_item::const_iterator aci = pit->second.find(arg); - - if (aci == pit->second.end()) { - lyxerr[Debug::ACTION] - << "Action " << action - << "does not have any pseudoactions with arg " - << arg << endl; - return LFUN_UNKNOWN_ACTION; - } - - lyxerr[Debug::ACTION] << "Pseudoaction exists[" - << action << '|' - << arg << "] = " << aci->second << endl; - - return aci->second; -} - - -int LyXAction::getPseudoAction(kb_action action, string const & arg) -{ - int const psdaction = searchActionArg(action, arg); - - if (isPseudoAction(psdaction)) return psdaction; - - static unsigned int pseudo_counter = LFUN_LASTACTION; - - // Create new pseudo action. - lyx_pseudo_map[++pseudo_counter] = FuncRequest(0, action, arg); - - // First ensure that the action is in lyx_arg_map; - lyx_arg_map[action]; - // get the arg_item map - arg_map::iterator ami = lyx_arg_map.find(action); - // put the new pseudo function in it - ami->second[arg] = pseudo_counter; - - lyxerr[Debug::ACTION] << "Creating new pseudoaction " - << pseudo_counter << " for [" << action - << '|' << arg << "]\n"; - - return pseudo_counter; -} - - -FuncRequest LyXAction::retrieveActionArg(int pseudo) const -{ - if (!isPseudoAction(pseudo)) - return FuncRequest(static_cast(pseudo)); - - pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo); - - if (pit != lyx_pseudo_map.end()) { - lyxerr[Debug::ACTION] << "Found the pseudoaction: [" - << pit->second.action << '|' - << pit->second.argument << "]" << endl; - return pit->second; - } else { - lyxerr << "Lyx Error: Unrecognized pseudo-action " - << pseudo << endl; - return FuncRequest(LFUN_UNKNOWN_ACTION); - } -} - - // Returns an action tag from a string. -int 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, ' '); - if (!argstr.empty() && fit != lyx_func_map.end()) { - // might be pseudo (or create one) - return getPseudoAction(fit->second, argstr); - } + func_map::const_iterator fit = lyx_func_map.find(cmd); - return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION; + 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 { - FuncRequest ev = retrieveActionArg(action); - if (!ev.argument.empty()) - ev.argument.insert(string::size_type(0), 1, ' '); - - info_map::const_iterator const it = lyx_info_map.find(ev.action); - - if (it != lyx_info_map.end()) - return it->second.name + ev.argument; - return string(); + info_map::const_iterator const it = lyx_info_map.find(action); + return it != lyx_info_map.end() ? it->second.name : string(); } @@ -457,14 +383,12 @@ bool LyXAction::funcHasFlag(kb_action action, { 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; }