X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=9c98b95881f240a21594b5be70ce639512bc289e;hb=d9e6e32961860821ecc047039ae6c1a9dcc6e35d;hp=14d18422b40f38f2db52b69d5b7cfe15e8706d84;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index 14d18422b4..9c98b95881 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -16,15 +16,19 @@ #include "LyXAction.h" #include "debug.h" -#include "gettext.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::pair; -using std::make_pair; +using std::string; +using std::ostream; + /* NAMING RULES FOR USER-COMMANDS @@ -45,16 +49,6 @@ using std::make_pair; 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) @@ -120,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 }, @@ -132,22 +128,22 @@ void LyXAction::init() { LFUN_WRITEAS, "buffer-write-as", ReadOnly }, { LFUN_CANCEL, "cancel", NoBuffer }, { LFUN_INSET_CAPTION, "caption-insert", Noop }, - { LFUN_LEFT, "char-backward", ReadOnly }, - { LFUN_RIGHT, "char-forward", ReadOnly }, + { LFUN_LEFT, "char-backward", ReadOnly | NoUpdate}, + { LFUN_RIGHT, "char-forward", ReadOnly | NoUpdate}, { LFUN_EXEC_COMMAND, "command-execute", NoBuffer }, { LFUN_PREFIX, "command-prefix", NoBuffer }, { LFUN_SEQUENCE, "command-sequence", NoBuffer }, { LFUN_COPY, "copy", ReadOnly }, { LFUN_CUT, "cut", Noop }, { LFUN_DATE_INSERT, "date-insert", Noop }, - { LFUN_BACKSPACE, "delete-backward", Noop }, + { LFUN_BACKSPACE, "delete-backward", SingleParUpdate }, { LFUN_BACKSPACE_SKIP, "delete-backward-skip", Noop }, - { LFUN_DELETE, "delete-forward", Noop }, + { LFUN_DELETE, "delete-forward", SingleParUpdate }, { LFUN_DELETE_SKIP, "delete-forward-skip", Noop }, { LFUN_DEPTH_MIN, "depth-decrement", Noop }, { LFUN_DEPTH_PLUS, "depth-increment", Noop }, { LFUN_LDOTS, "dots-insert", Noop }, - { LFUN_DOWN, "down", ReadOnly }, + { LFUN_DOWN, "down", ReadOnly | NoUpdate}, { LFUN_DOWNSEL, "down-select", ReadOnly }, { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly }, { LFUN_END_OF_SENTENCE, "end-of-sentence-period-insert", Noop }, @@ -192,14 +188,19 @@ void LyXAction::init() { LFUN_INSERT_LABEL, "label-insert", Noop }, { LFUN_INSET_OPTARG, "optional-insert", Noop }, { LFUN_INSERT_BIBITEM, "bibitem-insert", Noop }, + { LFUN_INSERT_CITATION, "citation-insert", Noop }, + { LFUN_BIBDB_ADD, "bibtex-database-add", Noop }, + { LFUN_BIBDB_DEL, "bibtex-database-del", 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_LAYOUT_TABULAR, "layout-tabular", Noop }, - { LFUN_HOME, "line-begin", ReadOnly }, + { LFUN_HOME, "line-begin", ReadOnly | NoUpdate}, { LFUN_HOMESEL, "line-begin-select", ReadOnly }, { LFUN_DELETE_LINE_FORWARD, "line-delete-forward", Noop }, - { LFUN_END, "line-end", ReadOnly }, + { LFUN_END, "line-end", ReadOnly | NoUpdate}, { LFUN_ENDSEL, "line-end-select", ReadOnly }, #if 0 { LFUN_INSET_LIST, "list-insert", Noop }, @@ -228,16 +229,19 @@ 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_DOWN_PARAGRAPH, "paragraph-down", 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 | NoUpdate}, { LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select", ReadOnly }, { LFUN_GOTO_PARAGRAPH, "paragraph-goto", ReadOnly }, { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", Noop }, - { LFUN_UP_PARAGRAPH, "paragraph-up", ReadOnly }, + { LFUN_UP_PARAGRAPH, "paragraph-up", ReadOnly | NoUpdate}, { LFUN_UP_PARAGRAPHSEL, "paragraph-up-select", ReadOnly }, { LFUN_PASTE, "paste", Noop }, { LFUN_SAVEPREFERENCES, "preferences-save", NoBuffer }, @@ -245,16 +249,16 @@ void LyXAction::init() { LFUN_QUOTE, "quote-insert", Noop }, { LFUN_RECONFIGURE, "reconfigure", NoBuffer }, { LFUN_REDO, "redo", Noop }, - { LFUN_REF_GOTO, "reference-goto", ReadOnly }, + { LFUN_LABEL_GOTO, "label-goto", ReadOnly }, { LFUN_REFERENCE_GOTO, "reference-next", ReadOnly }, - { LFUN_NEXT, "screen-down", ReadOnly }, + { LFUN_NEXT, "screen-down", ReadOnly | NoUpdate}, { LFUN_NEXTSEL, "screen-down-select", ReadOnly }, { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer }, { LFUN_CENTER, "screen-recenter", ReadOnly }, - { LFUN_PRIOR, "screen-up", ReadOnly }, + { LFUN_PRIOR, "screen-up", ReadOnly | NoUpdate}, { LFUN_PRIORSEL, "screen-up-select", ReadOnly }, { LFUN_SCROLL_INSET, "inset-scroll", ReadOnly }, - { LFUN_SELFINSERT, "self-insert", Noop }, + { LFUN_SELFINSERT, "self-insert", SingleParUpdate }, { LFUN_SPACE_INSERT, "space-insert", Noop }, { LFUN_CHARATCURSOR, "server-char-after", ReadOnly }, { LFUN_GETFONT, "server-get-font", ReadOnly }, @@ -278,7 +282,7 @@ void LyXAction::init() { LFUN_TOCVIEW, "toc-view", ReadOnly }, { LFUN_TOGGLECURSORFOLLOW, "toggle-cursor-follows-scrollbar", ReadOnly }, { LFUN_UNDO, "undo", Noop }, - { LFUN_UP, "up", ReadOnly }, + { LFUN_UP, "up", ReadOnly | NoUpdate}, { LFUN_UPSEL, "up-select", ReadOnly }, { LFUN_URL, "url-insert", Noop }, { LFUN_VC_CHECKIN, "vc-check-in", ReadOnly }, @@ -286,14 +290,14 @@ void LyXAction::init() { LFUN_VC_REGISTER, "vc-register", ReadOnly }, { LFUN_VC_REVERT, "vc-revert", ReadOnly }, { LFUN_VC_UNDO, "vc-undo-last", ReadOnly }, - { LFUN_WORDLEFT, "word-backward", ReadOnly }, + { LFUN_WORDLEFT, "word-backward", ReadOnly | NoUpdate}, { LFUN_WORDLEFTSEL, "word-backward-select", ReadOnly }, { LFUN_CAPITALIZE_WORD, "word-capitalize", Noop }, { LFUN_DELETE_WORD_BACKWARD, "word-delete-backward", Noop }, { LFUN_DELETE_WORD_FORWARD, "word-delete-forward", Noop }, { LFUN_WORDFINDBACKWARD, "word-find-backward", ReadOnly }, { LFUN_WORDFINDFORWARD, "word-find-forward", ReadOnly }, - { LFUN_WORDRIGHT, "word-forward", ReadOnly }, + { LFUN_WORDRIGHT, "word-forward", ReadOnly | NoUpdate}, { LFUN_WORDRIGHTSEL, "word-forward-select", ReadOnly }, { LFUN_LOWCASE_WORD, "word-lowcase", Noop }, { LFUN_WORDSEL, "word-select", ReadOnly }, @@ -302,9 +306,9 @@ 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_OUTPUT_CHANGES, "output-changes", Noop }, { LFUN_MERGE_CHANGES, "merge-changes", Noop }, { LFUN_ACCEPT_CHANGE, "accept-change", Noop }, { LFUN_REJECT_CHANGE, "reject-change", Noop }, @@ -313,7 +317,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 }, @@ -321,9 +325,33 @@ void LyXAction::init() { LFUN_INSET_MODIFY, "", Noop }, { LFUN_INSET_DIALOG_UPDATE, "", Noop }, { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly }, + { LFUN_INSET_DIALOG_SHOW, "inset-dialog-show", 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_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_WORDS_COUNT, "words-count", ReadOnly }, + { LFUN_FINISHED_RIGHT, "", ReadOnly }, + { LFUN_FINISHED_LEFT, "", ReadOnly }, + { LFUN_FINISHED_UP, "", ReadOnly }, + { LFUN_FINISHED_DOWN, "", ReadOnly }, + { LFUN_MOUSE_PRESS, "", ReadOnly }, + { LFUN_MOUSE_MOTION, "", ReadOnly }, + { LFUN_MOUSE_RELEASE, "", ReadOnly }, + { LFUN_MOUSE_DOUBLE, "", ReadOnly }, + { LFUN_MOUSE_TRIPLE, "", ReadOnly }, { LFUN_NOACTION, "", Noop } }; @@ -341,115 +369,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(); } @@ -458,14 +399,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; }