X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flyxfunc.C;h=3c4bd85c6aae1cb1e96b801b8f7c0d8e8494dbc8;hb=d719688df38b73e915ea36c8357a3c57376c4ef7;hp=d168f41aa57126f1c6d5269be75111f2fce214d3;hpb=271f8d7eec31175f53d012147af164cb27b043ce;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index d168f41aa5..3c4bd85c6a 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -10,26 +10,14 @@ #include -#include "Lsstream.h" - -#include -#include - -#include -#include - -#include -#include - #ifdef __GNUG__ #pragma implementation #endif -#include "support/lyxalgo.h" -#include "support/LAssert.h" +#include "lyxfunc.h" #include "version.h" #include "kbmap.h" -#include "lyxfunc.h" +#include "lyxrow.h" #include "bufferlist.h" #include "BufferView.h" #include "ColorHandler.h" @@ -38,6 +26,30 @@ #include "lyx_main.h" #include "lyx_cb.h" #include "LyXAction.h" +#include "debug.h" +#include "lyxrc.h" +#include "lyxtext.h" +#include "gettext.h" +#include "Lsstream.h" +#include "trans_mgr.h" +#include "layout.h" +#include "WorkArea.h" +#include "bufferview_funcs.h" +#include "minibuffer.h" +#include "vspace.h" +#include "LyXView.h" +#include "lyx_gui_misc.h" +#include "FloatList.h" +#include "converter.h" +#include "exporter.h" +#include "importer.h" +#include "FontLoader.h" +#include "TextCache.h" +#include "lyxfind.h" +#include "undo_funcs.h" +#include "ParagraphParameters.h" +#include "figureForm.h" + #include "insets/inseturl.h" #include "insets/insetlatexaccent.h" #include "insets/insettoc.h" @@ -61,41 +73,34 @@ #endif #include "insets/insettabular.h" #include "insets/insetcaption.h" + #include "mathed/formulamacro.h" #include "mathed/math_cursor.h" #include "mathed/math_inset.h" -#include "minibuffer.h" -#include "vspace.h" -#include "LyXView.h" -#include "lyx_gui_misc.h" + +#include "frontends/FileDialog.h" +#include "frontends/Dialogs.h" +#include "frontends/Toolbar.h" +#include "frontends/Menubar.h" +#include "frontends/Alert.h" + +#include "support/lyxalgo.h" +#include "support/LAssert.h" #include "support/filetools.h" #include "support/FileInfo.h" #include "support/syscall.h" #include "support/lstrings.h" #include "support/path.h" #include "support/lyxfunctional.h" -#include "debug.h" -#include "lyxrc.h" -#include "lyxtext.h" -#include "gettext.h" -#include "trans_mgr.h" -#include "layout.h" -#include "WorkArea.h" -#include "bufferview_funcs.h" -#include "frontends/FileDialog.h" -#include "frontends/Dialogs.h" -#include "frontends/Toolbar.h" -#include "frontends/Menubar.h" -#include "FloatList.h" -#include "converter.h" -#include "exporter.h" -#include "importer.h" -#include "FontLoader.h" -#include "TextCache.h" -#include "lyxfind.h" -#include "undo_funcs.h" -#include "ParagraphParameters.h" -#include "figureForm.h" + +#include +#include +#include +#include + +#include +#include + using std::pair; using std::make_pair; @@ -104,7 +109,6 @@ using std::find_if; extern BufferList bufferlist; extern LyXServer * lyxserver; -extern int greek_kb_flag; extern bool selection_possible; extern void MenuSendto(); @@ -116,8 +120,6 @@ extern LyXAction lyxaction; // (alkis) extern tex_accent_struct get_accent(kb_action action); -extern LyXTextClass::size_type current_layout; - extern void ShowLatexLog(); @@ -161,12 +163,13 @@ bool LyXFunc::show_sc = true; LyXFunc::LyXFunc(LyXView * o) - : owner(o) + : owner(o), + keyseq(toplevel_keymap.get(), toplevel_keymap.get()), + cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get()) { meta_fake_bit = 0; lyx_dead_action = LFUN_NOACTION; lyx_calling_dead_action = LFUN_NOACTION; - setupLocalKeymap(); } @@ -205,14 +208,15 @@ void LyXFunc::handleKeyFunc(kb_action action) { char c = keyseq.getiso(); - if (keyseq.length != -1) c = 0; + if (keyseq.length() > 1) { + c = 0; + } owner->getIntl()->getTrans() .deadkey(c, get_accent(action).accent, TEXT(false)); - // Need to reset, in case the minibuffer calls these + // Need to clear, in case the minibuffer calls these // actions - keyseq.reset(); - keyseq.length = 0; + keyseq.clear(); // copied verbatim from do_accent_char owner->view()->update(TEXT(false), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); @@ -241,7 +245,7 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) return; } - // Can we be sure that this will work for all X-Windows + // Can we be sure that this will work for all X Window // implementations? (Lgb) // This code snippet makes lyx ignore some keys. Perhaps // all of them should be explictly mentioned? @@ -282,14 +286,15 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) // Dont remove this unless you know what you are doing. meta_fake_bit = 0; - if (action == 0) action = LFUN_PREFIX; + // can this happen now ? + if (action == LFUN_NOACTION) { + action = LFUN_PREFIX; + } if (lyxerr.debugging(Debug::KEY)) { - string buf; - keyseq.print(buf); lyxerr << "Key [action=" << action << "][" - << buf << "]" + << keyseq.print() << "]" << endl; } @@ -297,13 +302,11 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) // why not return already here if action == -1 and // num_bytes == 0? (Lgb) - if (keyseq.length > 1 || keyseq.length < -1) { - string buf; - keyseq.print(buf); - owner->message(buf); + if (keyseq.length() > 1 && !keyseq.deleted()) { + owner->message(keyseq.print()); } - if (action == -1) { + if (action == LFUN_UNKNOWN_ACTION) { // It is unknown, but what if we remove all // the modifiers? (Lgb) action = keyseq.addkey(keysym, 0); @@ -313,35 +316,18 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) << "Action now set to [" << action << "]" << endl; } - if (action == -1) { + if (action == LFUN_UNKNOWN_ACTION) { owner->message(_("Unknown function.")); return; } } if (action == LFUN_SELFINSERT) { - // This is very X dependant. + // This is very X dependent. unsigned int c = keysym; - switch (c & 0x0000FF00) { - // latin 1 byte 3 = 0 - case 0x00000000: break; - // latin 2 byte 3 = 1 - case 0x00000100: - // latin 3 byte 3 = 2 - case 0x00000200: - // latin 4 byte 3 = 3 - case 0x00000300: - // latin 8 byte 3 = 18 (0x12) - case 0x00001200: - // latin 9 byte 3 = 19 (0x13) - case 0x00001300: - c &= 0x000000FF; - break; - default: - c = 0; - break; - } + c = kb_keymap::getiso(c); + if (c > 0) argument = static_cast(c); lyxerr[Debug::KEY] << "SelfInsert arg[`" @@ -357,17 +343,16 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) } -func_status::value_type LyXFunc::getStatus(int ac) const +FuncStatus LyXFunc::getStatus(int ac) const { return getStatus(ac, string()); } - -func_status::value_type LyXFunc::getStatus(int ac, - string const & not_to_use_arg) const +FuncStatus LyXFunc::getStatus(int ac, + string const & not_to_use_arg) const { kb_action action; - func_status::value_type flag = func_status::OK; + FuncStatus flag; string argument; Buffer * buf = owner->buffer(); @@ -376,12 +361,12 @@ func_status::value_type LyXFunc::getStatus(int ac, else { action = static_cast(ac); if (!not_to_use_arg.empty()) - argument = not_to_use_arg; // exept here + argument = not_to_use_arg; // except here } if (action == LFUN_UNKNOWN_ACTION) { setErrorMessage(N_("Unknown action")); - return func_status::Unknown; + return flag.unknown(true); } // Check whether we need a buffer @@ -395,14 +380,13 @@ func_status::value_type LyXFunc::getStatus(int ac, LyXAction::ReadOnly)) { // no setErrorMessage(N_("Document is read-only")); - flag |= func_status::Disabled; + flag.disabled(true); } } else { // no setErrorMessage(N_("Command not allowed with" "out any document open")); - flag |= func_status::Disabled; - return flag; + return flag.disabled(true); } } @@ -427,6 +411,11 @@ func_status::value_type LyXFunc::getStatus(int ac, case LFUN_SPELLCHECK: disable = lyxrc.isp_command == "none"; break; +#ifndef HAVE_LIBAIKSAURUS + case LFUN_THESAURUS_ENTRY: + disable = true; + break; +#endif case LFUN_RUNCHKTEX: disable = lyxrc.chktex_command == "none"; break; @@ -445,7 +434,8 @@ func_status::value_type LyXFunc::getStatus(int ac, case LFUN_TABULAR_FEATURE: disable = true; if (owner->view()->theLockingInset()) { - func_status::value_type ret = func_status::Disabled; + FuncStatus ret; + ret.disabled(true); if (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) { ret = static_cast (owner->view()->theLockingInset())-> @@ -460,13 +450,11 @@ func_status::value_type LyXFunc::getStatus(int ac, disable = false; } else { static InsetTabular inset(*owner->buffer(), 1, 1); - func_status::value_type ret; + FuncStatus ret; disable = true; ret = inset.getStatus(argument); - if ((ret & func_status::ToggleOn) || - (ret & func_status::ToggleOff)) - flag |= func_status::ToggleOff; + if (ret.onoff(true) || ret.onoff(false)) flag.setOnOff(false); } break; @@ -508,17 +496,14 @@ func_status::value_type LyXFunc::getStatus(int ac, break; } if (argument.empty()) { - flag = func_status::OK; + flag.clear(); break; } if (!contains("tcb", argument[0])) { disable = true; break; } - if (argument[0] == align) - flag |= func_status::ToggleOn; - else - flag |= func_status::ToggleOff; + flag.setOnOff(argument[0] == align); } else disable = true; break; @@ -534,17 +519,14 @@ func_status::value_type LyXFunc::getStatus(int ac, break; } if (argument.empty()) { - flag = func_status::OK; + flag.clear(); break; } if (!contains("lcr", argument[0])) { disable = true; break; } - if (argument[0] == align) - flag |= func_status::ToggleOn; - else - flag |= func_status::ToggleOff; + flag.setOnOff(argument[0] == align); } else disable = true; break; @@ -553,24 +535,17 @@ func_status::value_type LyXFunc::getStatus(int ac, Inset * tli = owner->view()->theLockingInset(); if (tli && (tli->lyxCode() == Inset::MATH_CODE)) { MathInsetTypes type = mathcursor->formula()->getType(); - func_status::value_type box = func_status::ToggleOff; if (argument == "inline") { - if (type == LM_OT_SIMPLE) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_SIMPLE); } else if (argument == "display") { - if (type == LM_OT_EQUATION) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_EQUATION); } else if (argument == "eqnarray") { - if (type == LM_OT_EQNARRAY) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_EQNARRAY); } else if (argument == "align") { - if (type == LM_OT_ALIGN) - box = func_status::ToggleOn; + flag.setOnOff(type == LM_OT_ALIGN); } else { - box = func_status::OK; disable = true; } - flag |= box; } else disable = true; break; @@ -706,39 +681,75 @@ func_status::value_type LyXFunc::getStatus(int ac, } if (disable) - flag |= func_status::Disabled; + flag.disabled(true); - // the font related functions (and a few others) - func_status::value_type box = func_status::ToggleOff; - LyXFont const & font = - TEXT(false)->real_current_font; + // A few general toggles switch (action) { - case LFUN_EMPH: - if (font.emph() == LyXFont::ON) - box = func_status::ToggleOn; - break; - case LFUN_NOUN: - if (font.noun() == LyXFont::ON) - box = func_status::ToggleOn; - break; - case LFUN_BOLD: - if (font.series() == LyXFont::BOLD_SERIES) - box = func_status::ToggleOn; - break; case LFUN_READ_ONLY_TOGGLE: - if (buf->isReadonly()) - box = func_status::ToggleOn; + flag.setOnOff(buf->isReadonly()); break; case LFUN_APPENDIX: - if (TEXT(false)->cursor.par()->params().startOfAppendix()) - box = func_status::ToggleOn; + flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix()); break; default: - box = func_status::OK; break; } - flag |= box; + // the font related toggles + if (!mathcursor) { + LyXFont const & font = TEXT(false)->real_current_font; + switch (action) { + case LFUN_EMPH: + flag.setOnOff(font.emph() == LyXFont::ON); + break; + case LFUN_NOUN: + flag.setOnOff(font.noun() == LyXFont::ON); + break; + case LFUN_BOLD: + flag.setOnOff(font.series() == LyXFont::BOLD_SERIES); + break; + case LFUN_SANS: + flag.setOnOff(font.family() == LyXFont::SANS_FAMILY); + break; + case LFUN_ROMAN: + flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY); + break; + case LFUN_CODE: + flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY); + break; + default: + break; + } + } + else { + MathTextCodes tc = mathcursor->getLastCode(); + switch (action) { + case LFUN_BOLD: + flag.setOnOff(tc == LM_TC_BF); + break; + case LFUN_SANS: + flag.setOnOff(tc == LM_TC_SF); + break; + case LFUN_EMPH: + flag.setOnOff(tc == LM_TC_CAL); + break; + case LFUN_ROMAN: + flag.setOnOff(tc == LM_TC_RM); + break; + case LFUN_CODE: + flag.setOnOff(tc == LM_TC_TT); + break; + case LFUN_NOUN: + flag.setOnOff(tc == LM_TC_BB); + break; + case LFUN_DEFAULT: + flag.setOnOff(tc == LM_TC_VAR); + break; + default: + break; + } + } + return flag; } @@ -746,8 +757,10 @@ func_status::value_type LyXFunc::getStatus(int ac, // temporary dispatch method void LyXFunc::miniDispatch(string const & s) { - if (!s.empty()) { - dispatch(s); + string s2(frontStrip(strip(s))); + + if (!s2.empty()) { + dispatch(s2); } } @@ -759,7 +772,16 @@ string const LyXFunc::dispatch(string const & s) string line = frontStrip(s); string const arg = strip(frontStrip(split(line, cmd, ' '))); - return dispatch(lyxaction.LookupFunc(cmd), arg); + int action = lyxaction.LookupFunc(cmd); + + if (action == LFUN_UNKNOWN_ACTION) { + string const msg = string(_("Unknown function (")) + + cmd + ")"; + owner->message(msg); + return string(); + } else { + return dispatch(action, arg); + } } @@ -789,6 +811,7 @@ string const LyXFunc::dispatch(int ac, argument = do_not_use_this_arg; // except here } + #ifdef NEW_DISPATCHER // We try do call the most specific dispatcher first: // 1. the lockinginset's dispatch @@ -802,8 +825,8 @@ string const LyXFunc::dispatch(int ac, owner->view()->hideCursor(); // We cannot use this function here - if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) { - lyxerr << "LyXFunc::Dispatch: " + if (getStatus(ac, do_not_use_this_arg).disabled()) { + lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: " << lyxaction.getActionName(ac) << " [" << ac << "] is disabled at this location" << endl; @@ -813,57 +836,17 @@ string const LyXFunc::dispatch(int ac, if (owner->view()->available() && owner->view()->theLockingInset()) { UpdatableInset::RESULT result; if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) && - (keyseq.length >= -1))) + (!keyseq.deleted()))) { if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){ argument = keyseq.getiso(); } // Undo/Redo is a bit tricky for insets. if (action == LFUN_UNDO) { -#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED - int slx; - int sly; - UpdatableInset * inset = - owner->view()->theLockingInset()->getLockingInset(); - int inset_id = inset->id(); - inset->getCursorPos(owner->view(), slx, sly); - owner->view()->unlockInset(inset); -#else - owner->view()->unlockInset(owner->view()->theLockingInset()); -#endif owner->view()->menuUndo(); -#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED -#if 0 - if (TEXT()->cursor.par()-> - isInset(TEXT()->cursor.pos())) { - inset = static_cast( - TEXT()->cursor.par()-> - getInset(TEXT()-> - cursor.pos())); - } else { - inset = 0; - } -#else - inset = static_cast(owner->view()->buffer()->getInsetFromID(inset_id)); -#endif - if (inset) - inset->edit(owner->view(),slx,sly,0); -#endif return string(); } else if (action == LFUN_REDO) { - int slx; - int sly; - UpdatableInset * inset = owner->view()-> - theLockingInset(); - inset->getCursorPos(owner->view(), slx, sly); - owner->view()->unlockInset(inset); owner->view()->menuRedo(); - inset = static_cast( - TEXT()->cursor.par()-> - getInset(TEXT()-> - cursor.pos())); - if (inset) - inset->edit(owner->view(),slx,sly,0); return string(); } else if (((result=owner->view()->theLockingInset()-> localDispatch(owner->view(), action, argument)) == @@ -943,7 +926,6 @@ string const LyXFunc::dispatch(int ac, case LFUN_ESCAPE: { if (!owner->view()->available()) break; - // this function should be used always [asierra060396] UpdatableInset * tli = owner->view()->theLockingInset(); @@ -960,6 +942,7 @@ string const LyXFunc::dispatch(int ac, lock, true); } + finishUndo(); } } break; @@ -990,9 +973,7 @@ string const LyXFunc::dispatch(int ac, owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR); } - string buf; - keyseq.print(buf, true); - owner->message(buf); + owner->message(keyseq.print()); } break; @@ -1020,9 +1001,7 @@ string const LyXFunc::dispatch(int ac, case LFUN_META_FAKE: // RVDK_PATCH_5 { meta_fake_bit = Mod1Mask; - string buf; - keyseq.print(buf, true); - setMessage(buf); // RVDK_PATCH_5 + setMessage(keyseq.print()); } break; @@ -1202,6 +1181,10 @@ string const LyXFunc::dispatch(int ac, owner->getDialogs()->showAboutlyx(); break; + case LFUN_HELP_TEXINFO: + owner->getDialogs()->showTexinfo(); + break; + case LFUN_HELP_OPEN: { string const arg = argument; @@ -1291,26 +1274,6 @@ string const LyXFunc::dispatch(int ac, owner->getDialogs()->showLogFile(); break; - case LFUN_LAYOUTNO: - { - lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (arg) " << argument << endl; - int sel = strToInt(argument); - lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (sel) "<< sel << endl; - - // Should this give a setMessage instead? - if (sel == 0) - return string(); // illegal argument - - --sel; // sel 1..., but layout 0... - - // Pretend we got the name instead. - dispatch(int(LFUN_LAYOUT), - textclasslist.NameOfLayout(owner->view() - ->buffer()->params.textclass, - sel)); - return string(); - } - case LFUN_LAYOUT_DOCUMENT: owner->getDialogs()->showDocument(); break; @@ -1342,10 +1305,6 @@ string const LyXFunc::dispatch(int ac, owner->getDialogs()->showPreamble(); break; - case LFUN_LAYOUT_SAVE_DEFAULT: - MenuLayoutSave(owner->view()); - break; - case LFUN_DROP_LAYOUTS_CHOICE: owner->getToolbar()->openLayoutList(); break; @@ -1371,9 +1330,7 @@ string const LyXFunc::dispatch(int ac, case LFUN_NOTIFY: { - string buf; - keyseq.print(buf); - dispatch_buffer = buf; + dispatch_buffer = keyseq.print(); lyxserver->notifyClient(dispatch_buffer); } break; @@ -1478,6 +1435,14 @@ string const LyXFunc::dispatch(int ac, } break; + // passthrough hat and underscore outside mathed: + case LFUN_SUBSCRIPT: + dispatch(LFUN_SELFINSERT, "_"); + break; + case LFUN_SUPERSCRIPT: + dispatch(LFUN_SELFINSERT, "^"); + break; + case LFUN_MATH_PANEL: owner->getDialogs()->showMathPanel(); break; @@ -1631,7 +1596,7 @@ exit_with_message: // for it in minibuffer string comname = lyxaction.getActionName(action); - int pseudoaction = action; + kb_action pseudoaction = action; bool argsadded = false; if (!argument.empty()) { @@ -1654,7 +1619,7 @@ exit_with_message: if (!shortcuts.empty()) { comname += ": " + shortcuts; - } else if (!argsadded) { + } else if (!argsadded && !argument.empty()) { comname += " " + argument; } @@ -1735,7 +1700,7 @@ void LyXFunc::menuNew(bool fromTemplate) // Check if the document already is open if (bufferlist.exists(s)) { - switch (AskConfirmation(_("Document is already open:"), + switch (Alert::askConfirmation(_("Document is already open:"), MakeDisplayPath(s, 50), _("Do you want to close that document now?\n" "('No' will just switch to the open version)"))) @@ -1756,7 +1721,7 @@ void LyXFunc::menuNew(bool fromTemplate) // Check whether the file already exists FileInfo fi(s); if (fi.readable() && - AskQuestion(_("File already exists:"), + Alert::askQuestion(_("File already exists:"), MakeDisplayPath(s, 50), _("Do you want to open the document?"))) { // loads document @@ -1862,7 +1827,7 @@ void LyXFunc::open(string const & fname) // necessary string const fullpath = FileSearch(string(), filename, "lyx"); if (fullpath.empty()) { - WriteAlert(_("Error"), _("Could not find file"), filename); + Alert::alert(_("Error"), _("Could not find file"), filename); return; } @@ -1946,7 +1911,7 @@ void LyXFunc::doImport(string const & argument) // Check if the document already is open if (bufferlist.exists(lyxfile)) { - switch (AskConfirmation(_("Document is already open:"), + switch (Alert::askConfirmation(_("Document is already open:"), MakeDisplayPath(lyxfile, 50), _("Do you want to close that document now?\n" "('No' will just switch to the open version)"))) @@ -1967,7 +1932,7 @@ void LyXFunc::doImport(string const & argument) // Check if a LyX document by the same root exists in filesystem FileInfo const f(lyxfile, true); - if (f.exist() && !AskQuestion(_("A document by the name"), + if (f.exist() && !Alert::askQuestion(_("A document by the name"), MakeDisplayPath(lyxfile), _("already exists. Overwrite?"))) { owner->message(_("Canceled")); @@ -2027,14 +1992,15 @@ void LyXFunc::initMiniBuffer() // When meta-fake key is pressed, show the key sequence so far + "M-". if (wasMetaKey()) { - keyseqStr(); + text = keyseq.print(); text += "M-"; } // Else, when a non-complete key sequence is pressed, // show the available options. - else if (keyseqUncomplete()) - text = keyseqOptions(); + if (keyseq.length() > 0 && !keyseq.deleted()) { + text = keyseq.printOptions(); + } // Else, show the buffer state. else if (owner->view()->available()) {