X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=a7a5e794d589a9604496b2de45e1e4e86a0bf872;hb=8555881d19d77b32315661699fab31a82d3833ab;hp=894becff85b1847141886026fe9a9b57ad058ece;hpb=360cdc0b9f5342a9d2b2b890a2791a73ebeb9297;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index 894becff85..a7a5e794d5 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -1,12 +1,8 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. - * - * ====================================================== */ +/** + * \file LyXAction.C + * Copyright 1995-2002 the LyX Team + * Read the file COPYING + */ #include @@ -15,23 +11,22 @@ #endif #include "LyXAction.h" + #include "debug.h" #include "gettext.h" #include "support/lstrings.h" -#if 1 -// only to get access to NEW_INSETS -#include "lyxparagraph.h" -#endif using std::ostream; using std::endl; +using std::pair; +using std::make_pair; -/* +/* NAMING RULES FOR USER-COMMANDS Here's the set of rules to apply when a new command name is introduced: - + 1) Use the object.event order. That is, use `word-forward' - instead of `forward-word'. + instead of `forward-word'. 2) Don't introduce an alias for an already named object. Same for events. 3) Forward movement or focus is called `forward' (not `right'). 4) Backward movement or focus is called `backward' (not `left'). @@ -39,13 +34,23 @@ using std::endl; 6) Downward movement is called `down'. 7) The begin of an object is called `begin' (not `start'). 8) The end of an object is called `end'. - + (May 19 1996, 12:04, RvdK) - */ - -// These are globals. +*/ + 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, string const & helpText, unsigned int attrib) { @@ -58,13 +63,6 @@ void LyXAction::newFunc(kb_action action, string const & name, } -struct lfun_item { - kb_action action; - char const * name; - char const * helpText; - unsigned int attrib; -}; - void LyXAction::init() { // This function was changed to use the array below in initalization @@ -72,11 +70,18 @@ void LyXAction::init() // times. Since the array is not static we get back the memory it // occupies after the init is completed. It compiles several // magnitudes faster. - - static bool init = false; + + static bool init; if (init) return; - lfun_item items[] = { + struct ev_item { + kb_action action; + char const * name; + char const * helpText; + unsigned int attrib; + }; + + ev_item const items[] = { { LFUN_ACUTE, "accent-acute", "", Noop }, { LFUN_BREVE, "accent-breve", "", Noop }, { LFUN_CARON, "accent-caron", "", Noop }, @@ -105,19 +110,21 @@ void LyXAction::init() { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"), Noop }, { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop }, + { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly }, + { LFUN_BOOKMARK_SAVE, "bookmark-save", "", ReadOnly }, { LFUN_BREAKLINE, "break-line", "", Noop }, { LFUN_BREAKPARAGRAPH, "break-paragraph", "", Noop }, { LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout", "", Noop }, { LFUN_BREAKPARAGRAPH_SKIP, "break-paragraph-skip", "", Noop }, - { LFUN_BUILDPROG, "build-program", + { LFUN_BUILDPROG, "build-program", N_("Build program"), ReadOnly }, { LFUN_AUTOSAVE, "buffer-auto-save", N_("Autosave"), Noop }, { LFUN_BEGINNINGBUF, "buffer-begin", N_("Go to beginning of document"), ReadOnly }, { LFUN_BEGINNINGBUFSEL, "buffer-begin-select", N_("Select to beginning of document"), ReadOnly }, - { LFUN_CHILDINSERT, "buffer-child-insert", "", Noop }, + { LFUN_CHILD_INSERT, "buffer-child-insert", "", Noop }, { LFUN_CHILDOPEN, "buffer-child-open", "", ReadOnly }, { LFUN_RUNCHKTEX, "buffer-chktex", N_("Check TeX"), ReadOnly }, { LFUN_CLOSEBUFFER, "buffer-close", N_("Close"), ReadOnly }, @@ -126,33 +133,22 @@ void LyXAction::init() { LFUN_ENDBUFSEL, "buffer-end-select", N_("Select to end of document"), ReadOnly }, { LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly }, -#if 0 - { LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly }, -#endif -#ifndef NEW_INSETS - { LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop }, -#endif { LFUN_IMPORT, "buffer-import", N_("Import document"), NoBuffer }, - { LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"), - ReadOnly }, - { LFUN_PRINTER_PARAMS_GET, "printer-params-get", - N_("Get the printer parameters"), ReadOnly }, { LFUN_MENUNEW, "buffer-new", N_("New document") , NoBuffer }, { LFUN_MENUNEWTMPLT,"buffer-new-template", N_("New document from template"), NoBuffer }, - { LFUN_MENUOPEN, "buffer-open", N_("Open"), NoBuffer }, { LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly }, { LFUN_MENURELOAD, "buffer-reload", N_("Revert to saved"), ReadOnly }, - { LFUN_SWITCHBUFFER, "buffer-switch", + { LFUN_SWITCHBUFFER, "buffer-switch", N_("Switch to an open document"), ReadOnly }, { LFUN_READ_ONLY_TOGGLE, "buffer-toggle-read-only", N_("Toggle read-only"), ReadOnly }, { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly }, { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly }, { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly }, - { LFUN_MENUWRITEAS, "buffer-write-as", N_("Save As"), + { LFUN_WRITEAS, "buffer-write-as", N_("Save As"), ReadOnly }, { LFUN_CANCEL, "cancel", N_("Cancel"), NoBuffer }, { LFUN_INSET_CAPTION, "caption-insert", "", Noop }, @@ -162,10 +158,11 @@ void LyXAction::init() ReadOnly }, { LFUN_CITATION_CREATE, "citation-insert", N_("Insert citation"), Noop }, + { LFUN_CITATION_INSERT, "", "internal only", Noop }, { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer }, { LFUN_PREFIX, "command-prefix", N_("Execute command"), NoBuffer }, - { LFUN_SEQUENCE, "command-sequence", "", Noop }, + { LFUN_SEQUENCE, "command-sequence", "", NoBuffer }, { LFUN_COPY, "copy", N_("Copy"), ReadOnly }, { LFUN_CUT, "cut", N_("Cut"), Noop }, { LFUN_DATE_INSERT, "date-insert", "", Noop }, @@ -177,8 +174,6 @@ void LyXAction::init() N_("Decrement environment depth"), Noop }, { LFUN_DEPTH_PLUS, "depth-increment", N_("Increment environment depth"), Noop }, - { LFUN_DEPTH, "depth-next", - N_("Change environment depth"), Noop }, { LFUN_LDOTS, "dots-insert", N_("Insert ... dots"), Noop }, { LFUN_DOWN, "down", N_("Go down"), ReadOnly }, { LFUN_DOWNSEL, "down-select", @@ -187,24 +182,27 @@ void LyXAction::init() N_("Choose Paragraph Environment"), ReadOnly }, { LFUN_END_OF_SENTENCE, "end-of-sentence-period-insert", N_("Insert end of sentence period"), Noop }, - { LFUN_GOTOERROR, "error-next", N_("Go to next error"), Noop }, + { LFUN_GOTOERROR, "error-next", + N_("Go to next error"), ReadOnly }, { LFUN_REMOVEERRORS, "error-remove-all", N_("Remove all error boxes"), ReadOnly }, { LFUN_INSET_ERT, "ert-insert", N_("Insert a new ERT Inset"), Noop }, { LFUN_INSET_EXTERNAL, "external-insert", N_("Insert a new external inset"), Noop }, - { LFUN_FIGURE, "figure-insert", N_("Insert Figure"), Noop }, { LFUN_INSET_GRAPHICS, "graphics-insert", N_("Insert Graphics"), Noop }, { LFUN_FILE_INSERT, "file-insert", "", Noop }, - { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop }, + { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", _("Insert ASCII files as lines"), Noop }, + { LFUN_FILE_INSERT_ASCII_PARA, "file-insert-ascii-para", _("Insert ASCII file as a paragraph"), Noop }, { LFUN_FILE_NEW, "file-new", "", NoBuffer }, - { LFUN_FILE_OPEN, "file-open", "", NoBuffer }, + { LFUN_FILE_OPEN, "file-open", N_("Open a file"), NoBuffer }, { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"), ReadOnly }, - { LFUN_INSET_FLOAT, "float-insert", "", Noop }, - { LFUN_FLOATSOPERATE, "floats-operate", "", ReadOnly }, + { LFUN_INSET_FLOAT, "float-insert", N_("Insert a Float"), Noop }, + { LFUN_INSET_WIDE_FLOAT, "float-wide-insert", + N_("Insert a wide Float"), Noop }, + { LFUN_INSET_WRAP, "wrap-insert", N_("Insert a Wrap"), Noop }, { LFUN_BOLD, "font-bold", N_("Toggle bold"), Noop }, { LFUN_CODE, "font-code", N_("Toggle code style"), Noop }, { LFUN_DEFAULT, "font-default", N_("Default font style"), @@ -216,38 +214,28 @@ void LyXAction::init() { LFUN_ROMAN, "font-roman", N_("Toggle roman font style"), Noop }, { LFUN_SANS, "font-sans", N_("Toggle sans font style"), Noop }, + { LFUN_FRAK, "font-frak", N_("Toggle fraktur font style"), Noop }, + { LFUN_ITAL, "font-ital", N_("Toggle italic font style"), Noop }, { LFUN_FONT_SIZE, "font-size", N_("Set font size"), Noop }, { LFUN_FONT_STATE, "font-state", N_("Show font state"), ReadOnly }, { LFUN_UNDERLINE, "font-underline", N_("Toggle font underline"), Noop }, -#ifndef NEW_INSETS - { LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"), - Noop }, -#else { LFUN_INSET_FOOTNOTE, "footnote-insert", N_("Insert Footnote"), Noop }, -#endif { LFUN_RIGHTSEL, "forward-select", N_("Select next char"), ReadOnly }, { LFUN_HFILL, "hfill-insert", N_("Insert horizontal fill"), Noop }, - { LFUN_HELP_COPYRIGHT, "help-copyright", - N_("Display copyright information"), NoBuffer }, - { LFUN_HELP_CREDITS, "help-credits", - N_("Show the list of people who helped writing LyX"), - NoBuffer}, - { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), + { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), NoBuffer|Argument}, - { LFUN_HELP_VERSION, "help-version", - N_("Show the actual LyX version"), NoBuffer}, { LFUN_HTMLURL, "html-insert", "", Noop }, { LFUN_HYPHENATION, "hyphenation-point-insert", N_("Insert hyphenation point"), Noop }, - { LFUN_INDEX_CREATE, "index-insert", + { LFUN_LIGATURE_BREAK, "ligature-break-insert", + N_("Insert ligature break"), Noop }, + { LFUN_INDEX_INSERT, "index-insert", N_("Insert index item"), Noop }, - { LFUN_INDEX_INSERT_LAST, "index-insert-last", - N_("Insert last index item"), Noop }, { LFUN_INDEX_PRINT, "index-print", N_("Insert index list"), Noop }, { LFUN_KMAP_OFF, "keymap-off", N_("Turn off keymap"), @@ -260,6 +248,8 @@ void LyXAction::init() ReadOnly }, { LFUN_INSERT_LABEL, "label-insert", N_("Insert Label"), Noop }, + { LFUN_INSET_OPTARG, "optional-insert", N_("Insert Optional Argument"), + Noop }, { LFUN_LANGUAGE, "language", N_("Change language"), Noop }, { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"), ReadOnly }, @@ -268,13 +258,10 @@ void LyXAction::init() { LFUN_LAYOUT_COPY, "layout-copy", N_("Copy paragraph environment type"), Noop }, { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly }, - { LFUN_LAYOUTNO, "layout-number", "", Noop }, // internal only { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly }, { LFUN_LAYOUT_PASTE, "layout-paste", N_("Paste paragraph environment type"), Noop }, { LFUN_LAYOUT_PREAMBLE, "layout-preamble", "", ReadOnly }, - { LFUN_LAYOUT_SAVE_DEFAULT, "layout-save-default", "", - ReadOnly }, { LFUN_LAYOUT_TABULAR, "layout-tabular", N_("Open the tabular layout"), Noop }, { LFUN_HOME, "line-begin", @@ -285,26 +272,12 @@ void LyXAction::init() { LFUN_END, "line-end", N_("Go to end of line"), ReadOnly }, { LFUN_ENDSEL, "line-end-select", N_("Select to end of line"), ReadOnly }, +#if 0 { LFUN_INSET_LIST, "list-insert", "", Noop }, - { LFUN_LOA_INSERT, "loa-insert", - N_("Insert list of algorithms"), Noop }, - { LFUN_LOAVIEW, "loa-view", - N_("View list of algorithms"), ReadOnly }, - { LFUN_LOF_INSERT, "lof-insert", - N_("Insert list of figures"), Noop }, - { LFUN_LOFVIEW, "lof-view", - N_("View list of figures"), ReadOnly }, - { LFUN_LOT_INSERT, "lot-insert", - N_("Insert list of tables"), Noop }, - { LFUN_LOTVIEW, "lot-view", - N_("View list of tables"), ReadOnly }, +#endif { LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer }, { LFUN_INSET_MARGINAL, "marginalnote-insert", - N_("Insert Marginalnote"), Noop }, -#ifndef NEW_INSETS - { LFUN_MARGINMELT, "marginpar-insert", - N_("Insert Margin note"), Noop }, -#endif + N_("Insert margin note"), Noop }, { LFUN_MARK_OFF, "mark-off", "", ReadOnly }, { LFUN_MARK_ON, "mark-on", "", ReadOnly }, { LFUN_SETMARK, "mark-toggle", "", ReadOnly }, @@ -314,28 +287,33 @@ void LyXAction::init() { LFUN_GREEK_TOGGLE, "math-greek-toggle", "", Noop }, { LFUN_INSERT_MATH, "math-insert", N_("Insert math symbol"), Noop }, + { LFUN_SUBSCRIPT, "math-subscript", N_("Add subscript"), Noop }, + { LFUN_SUPERSCRIPT, "math-superscript", N_("Add superscript"), Noop }, { LFUN_MATH_LIMITS, "math-limits", "", Noop }, { LFUN_MATH_MACRO, "math-macro", "", Noop }, - { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop }, + { LFUN_MATH_MUTATE, "math-mutate", "", Noop }, + { LFUN_MATH_SPACE, "math-space", "", Noop }, + { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop }, { LFUN_INSERT_MATRIX, "math-matrix", "", Noop }, { LFUN_MATH_MODE, "math-mode", N_("Math mode"), Noop }, { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop }, { LFUN_MATH_NUMBER, "math-number", "", Noop }, + { LFUN_MATH_EXTERN, "math-extern", "", Noop }, { LFUN_MATH_PANEL, "math-panel", "", Noop }, { LFUN_MATH_SIZE, "math-size", "", Noop }, - { LFUN_MELT, "melt", N_("Melt"), Noop }, { 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_NOTE, "note-insert", "", Noop }, { LFUN_GOTONOTE, "note-next", "", ReadOnly }, - { LFUN_OPENSTUFF, "open-stuff", "", ReadOnly }, + { LFUN_INSET_TOGGLE, "inset-toggle", + N_("toggle inset"), ReadOnly }, { LFUN_DOWN_PARAGRAPH, "paragraph-down", N_("Go one paragraph down"), ReadOnly }, { LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select", N_("Select next paragraph"), ReadOnly }, - { LFUN_GOTO_PARAGRAPH, "paragraph-goto", + { LFUN_GOTO_PARAGRAPH, "paragraph-goto", N_("Go to paragraph"), ReadOnly }, { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop }, { LFUN_UP_PARAGRAPH, "paragraph-up", @@ -355,10 +333,10 @@ void LyXAction::init() { LFUN_RECONFIGURE, "reconfigure", N_("Reconfigure"), NoBuffer }, { LFUN_REDO, "redo", N_("Redo"), Noop }, - { LFUN_REF_BACK, "reference-back", "", ReadOnly }, { LFUN_REF_GOTO, "reference-goto", "", ReadOnly }, { LFUN_REF_INSERT, "reference-insert", N_("Insert cross reference"), ReadOnly }, + { LFUN_REFERENCE_GOTO, "reference-next", "", ReadOnly }, { LFUN_NEXT, "screen-down", "", ReadOnly }, { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly }, { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", @@ -371,7 +349,6 @@ void LyXAction::init() { LFUN_SELFINSERT, "self-insert", "", Noop }, { LFUN_CHARATCURSOR, "server-char-after", "", ReadOnly }, { LFUN_GETFONT, "server-get-font", "", ReadOnly }, - { LFUN_GETLATEX, "server-get-latex", "", ReadOnly }, { LFUN_GETLAYOUT, "server-get-layout", "", ReadOnly }, { LFUN_GETNAME, "server-get-name", "", ReadOnly }, { LFUN_GETTIP, "server-get-tip", "", ReadOnly }, @@ -384,16 +361,13 @@ void LyXAction::init() { LFUN_SHIFT_TAB, "tab-backward", "", Noop }, { LFUN_TAB, "tab-forward", "", Noop }, { LFUN_TABINSERT, "tab-insert", "", Noop }, - { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert", - N_("Open Insert Tabular Dialog"), Noop }, + { LFUN_TABULAR_INSERT, "tabular-insert", N_("Insert Table"), Noop }, { LFUN_TABULAR_FEATURE, "tabular-feature", N_("Tabular Features"), Noop }, - { LFUN_INSET_TABULAR, "tabular-insert", - N_("Insert a new Tabular Inset"), Noop }, - { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop }, - { LFUN_INSET_TEXT, "text-insert", - N_("Insert a new Text Inset"), Noop }, +#if 0 { LFUN_INSET_THEOREM, "theorem-insert", "", Noop }, +#endif + { LFUN_THESAURUS_ENTRY, "thesaurus-entry", N_("Open thesaurus"), ReadOnly }, { LFUN_TOC_INSERT, "toc-insert", N_("Insert table of contents"), Noop }, { LFUN_TOCVIEW, "toc-view", @@ -401,13 +375,11 @@ void LyXAction::init() { LFUN_TOGGLECURSORFOLLOW, "toggle-cursor-follows-scrollbar", N_("Toggle cursor does/doesn't follow the scrollbar"), ReadOnly }, - { LFUN_ADD_TO_TOOLBAR, "toolbar-add-to", "", NoBuffer }, - { LFUN_PUSH_TOOLBAR, "toolbar-push", "", NoBuffer }, { LFUN_UNDO, "undo", N_("Undo"), Noop }, { LFUN_UP, "up", "", ReadOnly }, { LFUN_UPSEL, "up-select", "", ReadOnly }, { LFUN_URL, "url-insert", "", Noop }, - { LFUN_INSERT_URL, "", "", Noop }, + { LFUN_INSERT_URL, "", "internal only", Noop }, { LFUN_VC_CHECKIN, "vc-check-in", "", ReadOnly }, { LFUN_VC_CHECKOUT, "vc-check-out", "", ReadOnly }, { LFUN_VC_HISTORY, "vc-history", "", ReadOnly }, @@ -426,17 +398,28 @@ void LyXAction::init() { LFUN_WORDRIGHT, "word-forward", "", ReadOnly }, { LFUN_WORDRIGHTSEL, "word-forward-select", "", ReadOnly }, { LFUN_LOWCASE_WORD, "word-lowcase", "", Noop }, + { LFUN_WORDSEL, "word-select", "", ReadOnly }, { LFUN_UPCASE_WORD, "word-upcase", "", Noop }, + { LFUN_MESSAGE, "message", + N_("Show message in minibuffer"), NoBuffer }, + { LFUN_TRANSPOSE_CHARS, "chars-transpose", "", Noop }, + { LFUN_FLOAT_LIST, "float-list", "Insert a float list", Noop }, + { LFUN_ESCAPE, "escape", "", Noop }, + { LFUN_HELP_ABOUTLYX, "help-aboutlyx", + N_("Display information about LyX"), NoBuffer }, + { LFUN_HELP_TEXINFO, "help-Texinfo", + N_("Display information about the TeX installation"), NoBuffer }, + { LFUN_FORKS_SHOW, "show-forks", + N_("Show the processes forked by LyX"), NoBuffer }, + { LFUN_FORKS_KILL, "kill-forks", + N_("Kill the forked process with this PID"), NoBuffer }, + { LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", "", NoBuffer }, { LFUN_NOACTION, "", "", Noop } }; - int i = 0; - while (items[i].action != LFUN_NOACTION) { - newFunc(items[i].action, - items[i].name, - _(items[i].helpText), - items[i].attrib); - ++i; + for (int i = 0; items[i].action != LFUN_NOACTION; ++i) { + newFunc(items[i].action, items[i].name, + _(items[i].helpText), items[i].attrib); } init = true; @@ -449,44 +432,36 @@ LyXAction::LyXAction() } -// Search for an existent pseudoaction, return LFUN_UNKNOWN_ACTION -// if it doesn't exist. int LyXAction::searchActionArg(kb_action action, string const & arg) const { - // BUG we really want to use const_iterator (Lgb) - arg_map::iterator pit = lyx_arg_map.find(action); + arg_map::const_iterator pit = lyx_arg_map.find(action); if (pit == lyx_arg_map.end()) { - // the action does not have any pseudoactions lyxerr[Debug::ACTION] << "Action " << action << " does not have any pseudo actions." << endl; return LFUN_UNKNOWN_ACTION; } - // BUG we really want to use const_iterator (Lgb) - arg_item::iterator aci = (*pit).second.find(arg); + arg_item::const_iterator aci = pit->second.find(arg); - if (aci == (*pit).second.end()) { - // the action does not have any pseudoactions with this arg - lyxerr[Debug::ACTION] + if (aci == pit->second.end()) { + lyxerr[Debug::ACTION] << "Action " << action << "does not have any pseudoactions with arg " << arg << endl; return LFUN_UNKNOWN_ACTION; } - // pseudo action exist - lyxerr[Debug::ACTION] << "Pseudoaction exist[" - << action << '|' - << arg << "] = " << (*aci).second << endl; + lyxerr[Debug::ACTION] << "Pseudoaction exists[" + << action << '|' + << arg << "] = " << aci->second << endl; - return (*aci).second; + return aci->second; } -// Returns a pseudo-action given an action and its argument. -int LyXAction::getPseudoAction(kb_action action, string const & arg) const +int LyXAction::getPseudoAction(kb_action action, string const & arg) { int const psdaction = searchActionArg(action, arg); @@ -495,56 +470,52 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const static unsigned int pseudo_counter = LFUN_LASTACTION; // Create new pseudo action. - pseudo_func tmp_p; - tmp_p.action = action; - tmp_p.arg = arg; - lyx_pseudo_map[++pseudo_counter] = tmp_p; + 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; + ami->second[arg] = pseudo_counter; lyxerr[Debug::ACTION] << "Creating new pseudoaction " << pseudo_counter << " for [" << action << '|' << arg << "]\n"; - + return pseudo_counter; } -// Retrieves the real action and its argument. -// perhaps a pair should be returned? -kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const +FuncRequest LyXAction::retrieveActionArg(int pseudo) const { - arg.erase(); // clear it to be sure. + if (!isPseudoAction(pseudo)) + return FuncRequest(static_cast(pseudo)); - // BUG we really want to use const_iterator (Lgb) - pseudo_map::iterator pit = lyx_pseudo_map.find(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.arg << '\n'; - arg = (*pit).second.arg; - return (*pit).second.action; + << pit->second.action << '|' + << pit->second.argument << "]\n"; + return pit->second; } else { - lyxerr << "Lyx Error: Unrecognized pseudo-action\n"; - return LFUN_UNKNOWN_ACTION; + 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) const +int LyXAction::LookupFunc(string const & func) { - if (func.empty()) return LFUN_NOACTION; + string const func2 = trim(func); + if (func2.empty()) return LFUN_NOACTION; // split action and arg string actstr; - string const argstr = split(func, actstr, ' '); + string const argstr = split(func2, actstr, ' '); lyxerr[Debug::ACTION] << "Action: " << actstr << '\n'; lyxerr[Debug::ACTION] << "Arg : " << argstr << '\n'; @@ -552,131 +523,85 @@ int LyXAction::LookupFunc(string const & func) const if (!argstr.empty() && fit != lyx_func_map.end()) { // might be pseudo (or create one) - return getPseudoAction((*fit).second, argstr); + return getPseudoAction(fit->second, argstr); } - return fit != lyx_func_map.end() ? (*fit).second : LFUN_UNKNOWN_ACTION; -} - - -//#ifdef WITH_WARNINGS -//#warning Not working as it should. -//#endif -// I have no clue what is wrong with it... (Lgb) -int LyXAction::getApproxFunc(string const & func) const - // This func should perhaps also be able to return a list of all - // actions that has func as a prefix. That should actually be quite - // easy, just let it return a vector or something. -{ - int action = LookupFunc(func); - if (action == LFUN_UNKNOWN_ACTION) { - // func is not an action, but perhaps it is - // part of one...check if it is prefix if one of the - // actions. - // Checking for prefix is not so simple, but - // using a simple bounding function gives - // a similar result. [ale 19981103] - func_map::const_iterator fit = - lyx_func_map.lower_bound(func); - - if (fit != lyx_func_map.end()) { - action = (*fit).second; - } - } else { // Go get the next function - func_map::const_iterator fit = - lyx_func_map.upper_bound(func); - - if (fit != lyx_func_map.end()) { - action = (*fit).second; - } - } - - return action; + return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION; } -string const LyXAction::getApproxFuncName(string const & func) const +string const LyXAction::getActionName(int action) const { - int const f = getApproxFunc(func); - // This will return empty string if f isn't an action. - return getActionName(f); -} + FuncRequest ev = retrieveActionArg(action); + if (!ev.argument.empty()) + ev.argument.insert(0, " "); + info_map::const_iterator const it = lyx_info_map.find(ev.action); -string const LyXAction::getActionName(int action) const -{ - kb_action ac; - string arg; - if (isPseudoAction(action)) { - ac = retrieveActionArg(action, arg); - arg.insert(0, " "); - } else - ac = static_cast(action); - - info_map::const_iterator iit = lyx_info_map.find(ac); - - if (iit != lyx_info_map.end()) { - string ret((*iit).second.name); - ret += arg; - return ret; - } else - return string(); + if (it != lyx_info_map.end()) + return it->second.name + ev.argument; + return string(); } -// Returns one line help associated with a (pseudo)action, i.e. appends -// the argument of the action if necessary string const LyXAction::helpText(int pseudoaction) const { - string help, arg; - kb_action action; + FuncRequest ev = retrieveActionArg(pseudoaction); - if (isPseudoAction(pseudoaction)) - action = retrieveActionArg(pseudoaction, arg); - else - action = static_cast(pseudoaction); - - info_map::const_iterator ici = lyx_info_map.find(action); + string help; + + info_map::const_iterator ici = lyx_info_map.find(ev.action); if (ici != lyx_info_map.end()) { if (lyxerr.debugging(Debug::ACTION)) { - lyxerr << "Action: " << action << '\n'; + lyxerr << "Action: " << ev.action << '\n'; lyxerr << " name: " - << (*ici).second.name << '\n'; + << ici->second.name << '\n'; lyxerr << " attrib: " - << (*ici).second.attrib << '\n'; + << ici->second.attrib << '\n'; lyxerr << " help: " - << (*ici).second.helpText << '\n'; + << ici->second.helpText << '\n'; } - help = (*ici).second.helpText; + help = ici->second.helpText; // if the is no help text use the name of the func instead. - if (help.empty()) help = (*ici).second.name; + if (help.empty()) help = ici->second.name; } if (help.empty()) { help = _("No description available!"); - } else if (!arg.empty()) { + } else if (!ev.argument.empty()) { help += ' '; - help += arg; + help += ev.argument; } return help; } -bool LyXAction::funcHasFlag(kb_action action, - LyXAction::func_attrib flag) const +bool LyXAction::funcHasFlag(kb_action action, + LyXAction::func_attrib flag) const { info_map::const_iterator ici = lyx_info_map.find(action); if (ici != lyx_info_map.end()) { - return (*ici).second.attrib & flag; + return ici->second.attrib & flag; } else { // it really should exist, but... lyxerr << "LyXAction::funcHasFlag: " "No info about kb_action: " << action << '\n'; return false; } +} + +LyXAction::const_func_iterator LyXAction::func_begin() const +{ + return lyx_func_map.begin(); +} + + +LyXAction::const_func_iterator LyXAction::func_end() const +{ + return lyx_func_map.end(); }