X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=a1150138efd0c9b9f31571ece115c0ce892a0cba;hb=98c966c64594611e469313314abd1e59524adb4a;hp=a9df467c776a7ef5ceca1b27e6c6d608cc95fe34;hpb=39eec46bd31753afaec103fcc45f9d6ba75bdb3e;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index a9df467c77..a1150138ef 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -1,8 +1,8 @@ /* This file is part of * ====================================================== - * + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -22,12 +22,12 @@ using std::ostream; using std::endl; -/* +/* 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'). @@ -35,13 +35,22 @@ 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. +// These are globals. LyXAction lyxaction; +// Small helper function +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) { @@ -61,7 +70,7 @@ 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; if (init) return; @@ -108,7 +117,7 @@ void LyXAction::init() { 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", @@ -136,7 +145,7 @@ void LyXAction::init() { 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 }, @@ -169,8 +178,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", @@ -179,14 +186,14 @@ 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 Graphics"), Noop }, { LFUN_INSET_GRAPHICS, "graphics-insert", N_("Insert Graphics"), Noop }, { LFUN_FILE_INSERT, "file-insert", "", Noop }, @@ -210,6 +217,8 @@ 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 }, @@ -221,7 +230,7 @@ void LyXAction::init() ReadOnly }, { LFUN_HFILL, "hfill-insert", N_("Insert horizontal fill"), Noop }, - { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), + { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), NoBuffer|Argument}, { LFUN_HTMLURL, "html-insert", "", Noop }, { LFUN_HYPHENATION, "hyphenation-point-insert", @@ -252,7 +261,6 @@ void LyXAction::init() { LFUN_LAYOUT_COPY, "layout-copy", N_("Copy paragraph environment type"), Noop }, { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly }, - { LFUN_LAYOUTNO, "", "internal only", Noop }, { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly }, { LFUN_LAYOUT_PASTE, "layout-paste", N_("Paste paragraph environment type"), Noop }, @@ -282,12 +290,13 @@ void LyXAction::init() { LFUN_GREEK_TOGGLE, "math-greek-toggle", "", Noop }, { LFUN_INSERT_MATH, "math-insert", N_("Insert math symbol"), Noop }, + { LFUN_SUBSCRIPT, "math-subscript", "", Noop }, + { LFUN_SUPERSCRIPT, "math-superscript", "", Noop }, { LFUN_MATH_LIMITS, "math-limits", "", Noop }, { LFUN_MATH_MACRO, "math-macro", "", Noop }, { LFUN_MATH_MUTATE, "math-mutate", "", Noop }, { LFUN_MATH_SPACE, "math-space", "", Noop }, { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop }, - { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop }, { LFUN_INSERT_MATRIX, "math-matrix", "", Noop }, { LFUN_MATH_MODE, "math-mode", N_("Math mode"), Noop }, { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop }, @@ -307,13 +316,13 @@ void LyXAction::init() { LFUN_INSET_MINIPAGE, "minipage-insert", "", Noop }, { LFUN_INSERT_NOTE, "note-insert", "", Noop }, { LFUN_GOTONOTE, "note-next", "", ReadOnly }, - { LFUN_INSET_TOGGLE, "inset-toggle", + { 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", @@ -367,8 +376,6 @@ void LyXAction::init() N_("Tabular Features"), Noop }, { LFUN_INSET_TABULAR, "tabular-insert", N_("Insert a new Tabular Inset"), Noop }, - { LFUN_INSET_TEXT, "text-insert", - N_("Insert a new Text Inset"), Noop }, #if 0 { LFUN_INSET_THEOREM, "theorem-insert", "", Noop }, #endif @@ -421,6 +428,11 @@ void LyXAction::init() 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 } }; @@ -445,7 +457,7 @@ LyXAction::LyXAction() // Search for an existent pseudoaction, return LFUN_UNKNOWN_ACTION // if it doesn't exist. -kb_action LyXAction::searchActionArg(kb_action action, string const & arg) const +int LyXAction::searchActionArg(kb_action action, string const & arg) const { arg_map::const_iterator pit = lyx_arg_map.find(action); @@ -461,7 +473,7 @@ kb_action LyXAction::searchActionArg(kb_action action, string const & arg) const if (aci == pit->second.end()) { // the action does not have any pseudoactions with this arg - lyxerr[Debug::ACTION] + lyxerr[Debug::ACTION] << "Action " << action << "does not have any pseudoactions with arg " << arg << endl; @@ -469,11 +481,11 @@ kb_action LyXAction::searchActionArg(kb_action action, string const & arg) const } // pseudo action exist - lyxerr[Debug::ACTION] << "Pseudoaction exist[" - << action << '|' + lyxerr[Debug::ACTION] << "Pseudoaction exist[" + << action << '|' << arg << "] = " << aci->second << endl; - return kb_action(aci->second); + return aci->second; } @@ -502,7 +514,7 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const lyxerr[Debug::ACTION] << "Creating new pseudoaction " << pseudo_counter << " for [" << action << '|' << arg << "]\n"; - + return pseudo_counter; } @@ -513,12 +525,15 @@ kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const { arg.erase(); // clear it to be sure. + if (!isPseudoAction(pseudo)) + return 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.arg << '\n'; + << pit->second.arg << "]\n"; arg = pit->second.arg; return pit->second.action; } else { @@ -567,21 +582,21 @@ int LyXAction::getApproxFunc(string const & func) const // 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()) { + 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()) { + func_map::const_iterator fit = + lyx_func_map.upper_bound(func); + + if (fit != lyx_func_map.end()) { action = fit->second; } } - + return action; } @@ -598,11 +613,10 @@ string const LyXAction::getActionName(int action) const { kb_action ac; string arg; - if (isPseudoAction(action)) { - ac = retrieveActionArg(action, arg); + + ac = retrieveActionArg(action, arg); + if (!arg.empty()) arg.insert(0, " "); - } else - ac = static_cast(action); info_map::const_iterator iit = lyx_info_map.find(ac); @@ -610,7 +624,7 @@ string const LyXAction::getActionName(int action) const string ret(iit->second.name); ret += arg; return ret; - } else + } else return string(); } @@ -622,10 +636,7 @@ string const LyXAction::helpText(int pseudoaction) const string help, arg; kb_action action; - if (isPseudoAction(pseudoaction)) - action = retrieveActionArg(pseudoaction, arg); - else - action = static_cast(pseudoaction); + action = retrieveActionArg(pseudoaction, arg); info_map::const_iterator ici = lyx_info_map.find(action); if (ici != lyx_info_map.end()) { @@ -654,8 +665,8 @@ string const LyXAction::helpText(int pseudoaction) const } -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); @@ -670,13 +681,13 @@ bool LyXAction::funcHasFlag(kb_action action, } -LyXAction::const_func_iterator LyXAction::func_begin() const +LyXAction::const_func_iterator LyXAction::func_begin() const { return lyx_func_map.begin(); } -LyXAction::const_func_iterator LyXAction::func_end() const +LyXAction::const_func_iterator LyXAction::func_end() const { return lyx_func_map.end(); }