X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=8774312f1c59444c13782e051a3068d88e34b925;hb=00d24ec87650e4ac7db77ad54cb4aa2f688100f3;hp=94a1710e48c05fce2334d490a504f6be315f2273;hpb=15a0218c0fbd310587456f1342f051a663a69d64;p=lyx.git diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 94a1710e48..8774312f1c 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -12,27 +12,28 @@ #include "Lsstream.h" -#include -#include +#include +#include + #include #include #include #include -//#include #ifdef __GNUG__ #pragma implementation #endif #include "support/lyxalgo.h" +#include "support/LAssert.h" #include "version.h" #include "kbmap.h" #include "lyxfunc.h" #include "bufferlist.h" +#include "BufferView.h" #include "ColorHandler.h" #include "lyxserver.h" -#include "figure_form.h" #include "intl.h" #include "lyx_main.h" #include "lyx_cb.h" @@ -54,12 +55,15 @@ #include "insets/insetmarginal.h" #include "insets/insetminipage.h" #include "insets/insetfloat.h" +#if 0 #include "insets/insetlist.h" -#include "insets/insettabular.h" #include "insets/insettheorem.h" +#endif +#include "insets/insettabular.h" #include "insets/insetcaption.h" #include "mathed/formulamacro.h" -#include "spellchecker.h" // RVDK_PATCH_5 +#include "mathed/math_cursor.h" +#include "mathed/math_inset.h" #include "minibuffer.h" #include "vspace.h" #include "LyXView.h" @@ -89,6 +93,9 @@ #include "FontLoader.h" #include "TextCache.h" #include "lyxfind.h" +#include "undo_funcs.h" +#include "ParagraphParameters.h" +#include "figureForm.h" using std::pair; using std::make_pair; @@ -181,7 +188,7 @@ inline void LyXFunc::moveCursorUpdate(bool flag, bool selecting) { if (selecting || TEXT(flag)->selection.mark()) { - TEXT(flag)->SetSelection(owner->view()); + TEXT(flag)->setSelection(owner->view()); if (TEXT(flag)->bv_owner) owner->view()->toggleToggle(); } @@ -190,7 +197,6 @@ void LyXFunc::moveCursorUpdate(bool flag, bool selecting) /* ---> Everytime the cursor is moved, show the current font state. */ // should this too me moved out of this func? - //owner->showState(); owner->view()->setState(); } @@ -232,8 +238,6 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) if (keysym == NoSymbol) { lyxerr[Debug::KEY] << "Empty kbd action (probably composing)" << endl; - //return 0; - //return FL_PREEMPT; return; } @@ -243,7 +247,6 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) // all of them should be explictly mentioned? if ((keysym >= XK_Shift_L && keysym <= XK_Hyper_R) || keysym == XK_Mode_switch || keysym == 0x0) { - //return 0; return; } @@ -312,7 +315,6 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) } if (action == -1) { owner->message(_("Unknown function.")); - //return 0; return; } } @@ -348,28 +350,28 @@ void LyXFunc::processKeySym(KeySym keysym, unsigned int state) bool tmp_sc = show_sc; show_sc = false; - Dispatch(action, argument); + dispatch(action, argument); show_sc = tmp_sc; //return 0; } -LyXFunc::func_status LyXFunc::getStatus(int ac) const +func_status::value_type LyXFunc::getStatus(int ac) const { return getStatus(ac, string()); } -LyXFunc::func_status LyXFunc::getStatus(int ac, - string const & not_to_use_arg) const +func_status::value_type LyXFunc::getStatus(int ac, + string const & not_to_use_arg) const { - kb_action action; - func_status flag = LyXFunc::OK; - string argument; - Buffer * buf = owner->buffer(); + kb_action action; + func_status::value_type flag = func_status::OK; + string argument; + Buffer * buf = owner->buffer(); - if (lyxaction.isPseudoAction(ac)) + if (lyxaction.isPseudoAction(ac)) action = lyxaction.retrieveActionArg(ac, argument); else { action = static_cast(ac); @@ -379,7 +381,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac, if (action == LFUN_UNKNOWN_ACTION) { setErrorMessage(N_("Unknown action")); - return LyXFunc::Unknown; + return func_status::Unknown; } // Check whether we need a buffer @@ -393,13 +395,13 @@ LyXFunc::func_status LyXFunc::getStatus(int ac, LyXAction::ReadOnly)) { // no setErrorMessage(N_("Document is read-only")); - flag |= LyXFunc::Disabled; + flag |= func_status::Disabled; } } else { // no setErrorMessage(N_("Command not allowed with" "out any document open")); - flag |= LyXFunc::Disabled; + flag |= func_status::Disabled; return flag; } } @@ -432,48 +434,39 @@ LyXFunc::func_status LyXFunc::getStatus(int ac, disable = !Exporter::IsExportable(buf, "program"); break; - case LFUN_INSERTFOOTNOTE: - // Disable insertion of floats in a tabular. - disable = false; - if (owner->view()->theLockingInset()) { - disable = (owner->view()->theLockingInset()->LyxCode() == Inset::TABULAR_CODE) || - owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE); - } - break; - case LFUN_LAYOUT_TABULAR: disable = true; if (owner->view()->theLockingInset()) { - disable = (owner->view()->theLockingInset()->LyxCode() != Inset::TABULAR_CODE) && - !owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE); + disable = (owner->view()->theLockingInset()->lyxCode() != Inset::TABULAR_CODE) && + !owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE); } break; case LFUN_TABULAR_FEATURE: disable = true; if (owner->view()->theLockingInset()) { - func_status ret = LyXFunc::Disabled; - if (owner->view()->theLockingInset()->LyxCode() == Inset::TABULAR_CODE) { + func_status::value_type ret = func_status::Disabled; + if (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) { ret = static_cast (owner->view()->theLockingInset())-> getStatus(argument); - } else if (owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)) { + } else if (owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) { ret = static_cast (owner->view()->theLockingInset()-> - GetFirstLockingInsetOfType(Inset::TABULAR_CODE))-> + getFirstLockingInsetOfType(Inset::TABULAR_CODE))-> getStatus(argument); } flag |= ret; disable = false; } else { - static InsetTabular inset(*owner->buffer(), 1, 1); - func_status ret; - - disable = true; - ret = inset.getStatus(argument); - if ((ret & LyXFunc::ToggleOn) || - (ret & LyXFunc::ToggleOff)) - flag |= LyXFunc::ToggleOff; + static InsetTabular inset(*owner->buffer(), 1, 1); + func_status::value_type ret; + + disable = true; + ret = inset.getStatus(argument); + if ((ret & func_status::ToggleOn) || + (ret & func_status::ToggleOff)) + flag |= func_status::ToggleOff; } break; @@ -494,44 +487,258 @@ LyXFunc::func_status LyXFunc::getStatus(int ac, case LFUN_BOOKMARK_GOTO: disable = !owner->view()-> isSavedPosition(strToUnsignedInt(argument)); + break; + + + case LFUN_INSET_TOGGLE: + disable = (TEXT(false)->getInset() == 0); + break; + + case LFUN_MATH_VALIGN: { + // I think this test can be simplified (Andre') + // mathcursor is != 0 iff we are in math mode + //Inset * tli = owner->view()->theLockingInset(); + //if (tli && (tli->lyxCode() == Inset::MATH_CODE + // || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + // + if (mathcursor) { + char align = mathcursor->valign(); + if (align == '\0') { + disable = true; + break; + } + if (argument.empty()) { + flag = func_status::OK; + break; + } + if (!contains("tcb", argument[0])) { + disable = true; + break; + } + if (argument[0] == align) + flag |= func_status::ToggleOn; + else + flag |= func_status::ToggleOff; + } else + disable = true; + break; + } + case LFUN_MATH_HALIGN: { + //Inset * tli = owner->view()->theLockingInset(); + //if (tli && (tli->lyxCode() == Inset::MATH_CODE + // || tli->lyxCode() == Inset::MATHMACRO_CODE)) { + if (mathcursor) { + char align = mathcursor->halign(); + if (align == '\0') { + disable = true; + break; + } + if (argument.empty()) { + flag = func_status::OK; + break; + } + if (!contains("lcr", argument[0])) { + disable = true; + break; + } + if (argument[0] == align) + flag |= func_status::ToggleOn; + else + flag |= func_status::ToggleOff; + } else + disable = true; + break; + } + case LFUN_MATH_MUTATE: { + 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; + } else if (argument == "display") { + if (type == LM_OT_EQUATION) + box = func_status::ToggleOn; + } else if (argument == "eqnarray") { + if (type == LM_OT_EQNARRAY) + box = func_status::ToggleOn; + } else if (argument == "align") { + if (type == LM_OT_ALIGN) + box = func_status::ToggleOn; + } else { + box = func_status::OK; + disable = true; + } + flag |= box; + } else + disable = true; + break; + } + + // we just need to be in math mode to enable that + case LFUN_MATH_SIZE: + case LFUN_MATH_SPACE: + case LFUN_MATH_LIMITS: + case LFUN_MATH_NONUMBER: + case LFUN_MATH_NUMBER: + disable = !mathcursor; + break; + + // we need to be math mode and a math array for that + // Hack: halign produces non-zero result iff we are in a math array + case LFUN_MATH_ROW_INSERT: + case LFUN_MATH_ROW_DELETE: + case LFUN_MATH_COLUMN_INSERT: + case LFUN_MATH_COLUMN_DELETE: + disable = !mathcursor || !mathcursor->halign(); + break; + default: break; - } - if (disable) - flag |= LyXFunc::Disabled; - - if (buf) { - func_status box = LyXFunc::ToggleOff; - LyXFont const & font = - TEXT(false)->real_current_font; - switch (action) { - case LFUN_EMPH: - if (font.emph() == LyXFont::ON) - box = LyXFunc::ToggleOn; - break; - case LFUN_NOUN: - if (font.noun() == LyXFont::ON) - box = LyXFunc::ToggleOn; - break; - case LFUN_BOLD: - if (font.series() == LyXFont::BOLD_SERIES) - box = LyXFunc::ToggleOn; - break; - case LFUN_TEX: - if (font.latex() == LyXFont::ON) - box = LyXFunc::ToggleOn; - break; - case LFUN_READ_ONLY_TOGGLE: - if (buf->isReadonly()) - box = LyXFunc::ToggleOn; - break; - default: - box = LyXFunc::OK; - break; - } - flag |= box; } + // the functions which insert insets + Inset::Code code = Inset::NO_CODE; + switch (action) { + case LFUN_INSET_TEXT: + code = Inset::TEXT_CODE; + break; + case LFUN_INSET_ERT: + code = Inset::ERT_CODE; + break; + case LFUN_FIGURE: + case LFUN_INSET_GRAPHICS: + code = Inset::GRAPHICS_CODE; + break; + case LFUN_INSET_FOOTNOTE: + code = Inset::FOOT_CODE; + break; + case LFUN_DIALOG_TABULAR_INSERT: + case LFUN_INSET_TABULAR: + code = Inset::TABULAR_CODE; + break; + case LFUN_INSET_EXTERNAL: + code = Inset::EXTERNAL_CODE; + break; + case LFUN_INSET_MARGINAL: + code = Inset::MARGIN_CODE; + break; + case LFUN_INSET_MINIPAGE: + code = Inset::MINIPAGE_CODE; + break; + case LFUN_INSET_FLOAT: + case LFUN_INSET_WIDE_FLOAT: + code = Inset::FLOAT_CODE; + break; + case LFUN_FLOAT_LIST: + code = Inset::FLOAT_LIST_CODE; + break; +#if 0 + case LFUN_INSET_LIST: + code = Inset::LIST_CODE; + break; + case LFUN_INSET_THEOREM: + code = Inset::THEOREM_CODE; + break; +#endif + case LFUN_INSET_CAPTION: + code = Inset::CAPTION_CODE; + break; + case LFUN_INSERT_NOTE: + code = Inset::IGNORE_CODE; + break; + case LFUN_INSERT_LABEL: + code = Inset::LABEL_CODE; + break; + case LFUN_REF_INSERT: + code = Inset::REF_CODE; + break; + case LFUN_CITATION_CREATE: + case LFUN_CITATION_INSERT: + code = Inset::CITE_CODE; + break; + case LFUN_INSERT_BIBTEX: + code = Inset::BIBTEX_CODE; + break; + case LFUN_INDEX_INSERT: + case LFUN_INDEX_INSERT_LAST: + case LFUN_INDEX_CREATE: + code = Inset::INDEX_CODE; + break; + case LFUN_INDEX_PRINT: + code = Inset::INDEX_PRINT_CODE; + break; + case LFUN_CHILD_INSERT: + code = Inset::INCLUDE_CODE; + break; + case LFUN_TOC_INSERT: + code = Inset::TOC_CODE; + break; + case LFUN_PARENTINSERT: + code = Inset::PARENT_CODE; + break; + case LFUN_HTMLURL: + case LFUN_URL: + case LFUN_INSERT_URL: + code = Inset::URL_CODE; + break; + case LFUN_QUOTE: + // always allow this, since we will inset a raw quote + // if an inset is not allowed. + break; + case LFUN_HYPHENATION: + case LFUN_LIGATURE_BREAK: + case LFUN_HFILL: + case LFUN_MENU_SEPARATOR: + case LFUN_LDOTS: + case LFUN_END_OF_SENTENCE: + case LFUN_PROTECTEDSPACE: + code = Inset::SPECIALCHAR_CODE; + break; + default: + break; + } + if (code != Inset::NO_CODE + && owner->view()->theLockingInset() + && !owner->view()->theLockingInset()->insetAllowed(code)) { + disable = true; + } + + if (disable) + flag |= func_status::Disabled; + + // the font related functions (and a few others) + func_status::value_type box = func_status::ToggleOff; + LyXFont const & font = + TEXT(false)->real_current_font; + 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; + break; + case LFUN_APPENDIX: + if (TEXT(false)->cursor.par()->params().startOfAppendix()) + box = func_status::ToggleOn; + break; + default: + box = func_status::OK; + break; + } + flag |= box; + return flag; } @@ -539,22 +746,24 @@ LyXFunc::func_status LyXFunc::getStatus(int ac, // temporary dispatch method void LyXFunc::miniDispatch(string const & s) { - Dispatch(s); + if (!s.empty()) { + dispatch(s); + } } -string const LyXFunc::Dispatch(string const & s) +string const LyXFunc::dispatch(string const & s) { // Split command string into command and argument string cmd; string line = frontStrip(s); - string arg = strip(frontStrip(split(line, cmd, ' '))); + string const arg = strip(frontStrip(split(line, cmd, ' '))); - return Dispatch(lyxaction.LookupFunc(cmd), arg); + return dispatch(lyxaction.LookupFunc(cmd), arg); } -string const LyXFunc::Dispatch(int ac, +string const LyXFunc::dispatch(int ac, string const & do_not_use_this_arg) { lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac @@ -579,65 +788,27 @@ string const LyXFunc::Dispatch(int ac, if (!do_not_use_this_arg.empty()) 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 + // 2. the bufferview's dispatch + // 3. the lyxview's dispatch +#endif + selection_possible = false; if (owner->view()->available()) owner->view()->hideCursor(); // We cannot use this function here - if (getStatus(ac, do_not_use_this_arg) & Disabled) + if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) { + lyxerr << "LyXFunc::Dispatch: " + << lyxaction.getActionName(ac) + << " [" << ac << "] is disabled at this location" + << endl; goto exit_with_message; - - commandshortcut.erase(); - - if (lyxrc.display_shortcuts && show_sc) { - if (action != LFUN_SELFINSERT) { - // Put name of command and list of shortcuts - // for it in minibuffer - string comname = lyxaction.getActionName(action); - - int pseudoaction = action; - bool argsadded = false; - - if (!argument.empty()) { - // If we have the command with argument, - // this is better - pseudoaction = - lyxaction.searchActionArg(action, - argument); - - if (pseudoaction == -1) { - pseudoaction = action; - } else { - comname += " " + argument; - argsadded = true; - } - } - - string const shortcuts = - toplevel_keymap->findbinding(pseudoaction); - - if (!shortcuts.empty()) { - comname += ": " + shortcuts; - } else if (!argsadded) { - comname += " " + argument; - } - - if (!comname.empty()) { - comname = strip(comname); - commandshortcut = "(" + comname + ')'; - owner->message(commandshortcut); - - // Here we could even add a small pause, - // to annoy the user and make him learn - // the shortcuts. - // No! That will just annoy, not teach - // anything. The user will read the messages - // if they are interested. (Asger) - } - } - } + } if (owner->view()->available() && owner->view()->theLockingInset()) { UpdatableInset::RESULT result; @@ -647,77 +818,116 @@ string const LyXFunc::Dispatch(int ac, if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){ argument = keyseq.getiso(); } - // Undo/Redo pre 0.13 is a bit tricky for insets. - if (action == LFUN_UNDO) { + // 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(); - inset->GetCursorPos(owner->view(), slx, sly); + 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())) { + isInset(TEXT()->cursor.pos())) { inset = static_cast( TEXT()->cursor.par()-> - GetInset(TEXT()-> + 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); + 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); + inset->getCursorPos(owner->view(), slx, sly); owner->view()->unlockInset(inset); owner->view()->menuRedo(); inset = static_cast( TEXT()->cursor.par()-> - GetInset(TEXT()-> + getInset(TEXT()-> cursor.pos())); if (inset) - inset->Edit(owner->view(),slx,sly,0); + inset->edit(owner->view(),slx,sly,0); return string(); } else if (((result=owner->view()->theLockingInset()-> - LocalDispatch(owner->view(), action, - argument)) == - UpdatableInset::DISPATCHED) || - (result == UpdatableInset::DISPATCHED_NOUPDATE)) + localDispatch(owner->view(), action, argument)) == + UpdatableInset::DISPATCHED) || + (result == UpdatableInset::DISPATCHED_NOUPDATE)) + return string(); + else if (result == UpdatableInset::FINISHED) { + if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_RIGHT) { + if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_UP) { + if (TEXT()->cursor.row()->previous()) { + TEXT()->cursorUp(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); + } + return string(); + } else if (result == UpdatableInset::FINISHED_DOWN) { + if (TEXT()->cursor.row()->next()) + TEXT()->cursorDown(owner->view()); + else + TEXT()->cursorRight(owner->view()); + moveCursorUpdate(true, false); + owner->showState(); return string(); - else { + } else { //setMessage(N_("Text mode")); switch (action) { case LFUN_UNKNOWN_ACTION: case LFUN_BREAKPARAGRAPH: case LFUN_BREAKLINE: - TEXT()->CursorRight(owner->view()); + TEXT()->cursorRight(owner->view()); owner->view()->setState(); owner->showState(); break; case LFUN_RIGHT: if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { - TEXT()->CursorRight(owner->view()); + TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); } return string(); case LFUN_LEFT: if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) { - TEXT()->CursorRight(owner->view()); + TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); } return string(); case LFUN_DOWN: if (TEXT()->cursor.row()->next()) - TEXT()->CursorDown(owner->view()); + TEXT()->cursorDown(owner->view()); else - TEXT()->CursorRight(owner->view()); + TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); return string(); @@ -728,8 +938,6 @@ string const LyXFunc::Dispatch(int ac, } } - lyx::Assert(action != LFUN_SELECT_FILE_SYNC); - switch (action) { case LFUN_ESCAPE: @@ -740,15 +948,15 @@ string const LyXFunc::Dispatch(int ac, UpdatableInset * tli = owner->view()->theLockingInset(); if (tli) { - UpdatableInset * lock = tli->GetLockingInset(); + UpdatableInset * lock = tli->getLockingInset(); if (tli == lock) { owner->view()->unlockInset(tli); - TEXT()->CursorRight(owner->view()); + TEXT()->cursorRight(owner->view()); moveCursorUpdate(true, false); owner->showState(); } else { - tli->UnlockInsetInInset(owner->view(), + tli->unlockInsetInInset(owner->view(), lock, true); } @@ -768,34 +976,11 @@ string const LyXFunc::Dispatch(int ac, } else { searched_string = last_search; } - - if (!searched_string.empty() && - ((action == LFUN_WORDFINDBACKWARD) ? - SearchBackward(owner->view(), searched_string) : - SearchForward(owner->view(), searched_string))) { - - // ??? What is that ??? - owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR); - - // ??? Needed ??? - // clear the selection (if there is any) - owner->view()->toggleSelection(); - TEXT()->ClearSelection(owner->view()); - - // Move cursor so that successive C-s 's will not stand in place. - if (action == LFUN_WORDFINDFORWARD ) - TEXT()->CursorRightOneWord(owner->view()); - TEXT()->FinishUndo(); - moveCursorUpdate(true, false); - - // ??? Needed ??? - // set the new selection - // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected); - owner->view()->toggleSelection(false); + bool fw = (action == LFUN_WORDFINDBACKWARD); + if (!searched_string.empty()) { + LyXFind(owner->view(), searched_string, fw); } - - // REMOVED : if (owner->view()->getWorkArea()->focus) - owner->view()->showCursor(); +// owner->view()->showCursor(); } break; @@ -828,7 +1013,7 @@ string const LyXFunc::Dispatch(int ac, meta_fake_bit = 0; if (owner->view()->available()) // cancel any selection - Dispatch(LFUN_MARK_OFF); + dispatch(LFUN_MARK_OFF); setMessage(N_("Cancel")); break; @@ -856,15 +1041,15 @@ string const LyXFunc::Dispatch(int ac, // --- Menus ----------------------------------------------- case LFUN_MENUNEW: - MenuNew(false); + menuNew(false); break; case LFUN_MENUNEWTMPLT: - MenuNew(true); + menuNew(true); break; case LFUN_CLOSEBUFFER: - CloseBuffer(); + closeBuffer(); break; case LFUN_MENUWRITE: @@ -973,7 +1158,7 @@ string const LyXFunc::Dispatch(int ac, case LFUN_REMOVEERRORS: if (owner->view()->removeAutoInsets()) { owner->view()->redraw(); - owner->view()->fitCursor(TEXT()); + owner->view()->fitCursor(); } break; @@ -992,12 +1177,6 @@ string const LyXFunc::Dispatch(int ac, case LFUN_FREE: owner->getDialogs()->setUserFreeFont(); break; - - case LFUN_TEX: - Tex(owner->view()); - owner->view()->setState(); - owner->showState(); - break; case LFUN_RECONFIGURE: Reconfigure(owner->view()); @@ -1019,13 +1198,13 @@ string const LyXFunc::Dispatch(int ac, #warning Find another implementation here (or another lyxfunc)! #endif #endif - case LFUN_HELP_COPYRIGHT: - owner->getDialogs()->showCopyright(); + case LFUN_HELP_ABOUTLYX: + owner->getDialogs()->showAboutlyx(); break; + case LFUN_HELP_COPYRIGHT: case LFUN_HELP_CREDITS: - owner->getDialogs()->showCredits(); - break; + case LFUN_HELP_OPEN: { @@ -1034,37 +1213,24 @@ string const LyXFunc::Dispatch(int ac, setErrorMessage(N_("Missing argument")); break; } - ProhibitInput(owner->view()); + owner->prohibitInput(); string const fname = i18nLibFileSearch("doc", arg, "lyx"); if (fname.empty()) { lyxerr << "LyX: unable to find documentation file `" << arg << "'. Bad installation?" << endl; - AllowInput(owner->view()); + owner->allowInput(); break; } ostringstream str; str << _("Opening help file") << ' ' << MakeDisplayPath(fname) << "..."; owner->message(str.str().c_str()); - owner->view()->buffer(bufferlist.loadLyXFile(fname,false)); - AllowInput(owner->view()); + owner->view()->buffer(bufferlist.loadLyXFile(fname, false)); + owner->allowInput(); break; } - case LFUN_HELP_VERSION: { - ProhibitInput(owner->view()); - string msg(_("LyX Version ")); - msg += LYX_VERSION; - msg += " of "; - msg += LYX_RELEASE; - fl_show_message(msg.c_str(), - (_("Library directory: ") - + MakeDisplayPath(system_lyxdir)).c_str(), - (_("User directory: ") - + MakeDisplayPath(user_lyxdir)).c_str()); - AllowInput(owner->view()); - break; - } + case LFUN_HELP_VERSION: // --- version control ------------------------------- case LFUN_VC_REGISTER: @@ -1124,7 +1290,7 @@ string const LyXFunc::Dispatch(int ac, break; case LFUN_FILE_OPEN: - Open(argument); + open(argument); break; case LFUN_LATEX_LOG: @@ -1133,9 +1299,9 @@ string const LyXFunc::Dispatch(int ac, case LFUN_LAYOUTNO: { - lyxerr.debug() << "LFUN_LAYOUTNO: (arg) " << argument << endl; + lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (arg) " << argument << endl; int sel = strToInt(argument); - lyxerr.debug() << "LFUN_LAYOUTNO: (sel) "<< sel << endl; + lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (sel) "<< sel << endl; // Should this give a setMessage instead? if (sel == 0) @@ -1144,7 +1310,7 @@ string const LyXFunc::Dispatch(int ac, --sel; // sel 1..., but layout 0... // Pretend we got the name instead. - Dispatch(int(LFUN_LAYOUT), + dispatch(int(LFUN_LAYOUT), textclasslist.NameOfLayout(owner->view() ->buffer()->params.textclass, sel)); @@ -1152,28 +1318,28 @@ string const LyXFunc::Dispatch(int ac, } case LFUN_LAYOUT_DOCUMENT: - owner->getDialogs()->showLayoutDocument(); + owner->getDialogs()->showDocument(); break; case LFUN_LAYOUT_PARAGRAPH: - owner->getDialogs()->showLayoutParagraph(); + owner->getDialogs()->showParagraph(); break; case LFUN_LAYOUT_CHARACTER: - owner->getDialogs()->showLayoutCharacter(); + owner->getDialogs()->showCharacter(); break; case LFUN_LAYOUT_TABULAR: if (owner->view()->theLockingInset()) { - if (owner->view()->theLockingInset()->LyxCode()==Inset::TABULAR_CODE) { + if (owner->view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) { InsetTabular * inset = static_cast (owner->view()->theLockingInset()); - inset->OpenLayoutDialog(owner->view()); + inset->openLayoutDialog(owner->view()); } else if (owner->view()->theLockingInset()-> - GetFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) { + getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) { InsetTabular * inset = static_cast( - owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)); - inset->OpenLayoutDialog(owner->view()); + owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE)); + inset->openLayoutDialog(owner->view()); } } break; @@ -1196,15 +1362,15 @@ string const LyXFunc::Dispatch(int ac, case LFUN_SPELLCHECK: if (lyxrc.isp_command != "none") - ShowSpellChecker(owner->view()); - break; // RVDK_PATCH_5 + owner->getDialogs()->showSpellchecker(); + break; // --- lyxserver commands ---------------------------- case LFUN_GETNAME: setMessage(owner->buffer()->fileName()); - lyxerr.debug() << "FNAME[" + lyxerr[Debug::INFO] << "FNAME[" << owner->buffer()->fileName() << "] " << endl; break; @@ -1220,19 +1386,20 @@ string const LyXFunc::Dispatch(int ac, case LFUN_GOTOFILEROW: { - char file_name[100]; + string file_name; int row; - ::sscanf(argument.c_str(), " %s %d", file_name, &row); - + istringstream istr(argument.c_str()); + istr >> file_name >> row; // Must replace extension of the file to be .lyx and get full path - string s = ChangeExtension(string(file_name), ".lyx"); + string const s(ChangeExtension(file_name, ".lyx")); // Either change buffer or load the file - if (bufferlist.exists(s)) + if (bufferlist.exists(s)) { owner->view()->buffer(bufferlist.getBuffer(s)); - else + } else { owner->view()->buffer(bufferlist.loadLyXFile(s)); - + } + // Set the cursor owner->view()->setCursorFromRow(row); @@ -1247,12 +1414,18 @@ string const LyXFunc::Dispatch(int ac, int id; istr >> id; - LyXParagraph * par = TEXT()->GetParFromID(id); - if (par == 0) + Paragraph * par = owner->buffer()->getParFromID(id); + if (par == 0) { + lyxerr[Debug::INFO] << "No matching paragraph found! [" + << id << "]" << std::endl; break; + } else { + lyxerr << "Paragraph " << par->id() + << " found." << endl; + } // Set the cursor - TEXT()->SetCursor(owner->view(), par, 0); + owner->view()->text->setCursor(owner->view(), par, 0); owner->view()->setState(); owner->showState(); @@ -1302,32 +1475,9 @@ string const LyXFunc::Dispatch(int ac, // --- insert characters ---------------------------------------- // --- Mathed stuff. If we are here, there is no locked inset yet. - - // Greek mode - case LFUN_GREEK: - { - if (!greek_kb_flag) { - greek_kb_flag = 1; - setMessage(N_("Math greek mode on")); - } else - greek_kb_flag = 0; - } - break; - - // Greek keyboard - case LFUN_GREEK_TOGGLE: - { - greek_kb_flag = greek_kb_flag ? 0 : 2; - if (greek_kb_flag) { - setMessage(N_("Math greek keyboard on")); - } else { - setMessage(N_("Math greek keyboard off")); - } - } - break; - case LFUN_MATH_EXTERN: case LFUN_MATH_NUMBER: + case LFUN_MATH_NONUMBER: case LFUN_MATH_LIMITS: { setErrorMessage(N_("This is only allowed in math mode!")); @@ -1353,7 +1503,7 @@ string const LyXFunc::Dispatch(int ac, } else { p.setContents( argument ); } - Dispatch(LFUN_CITATION_INSERT, p.getAsString()); + dispatch(LFUN_CITATION_INSERT, p.getAsString()); } else owner->getDialogs()->createCitation( p.getAsString() ); } @@ -1400,7 +1550,7 @@ string const LyXFunc::Dispatch(int ac, while (argument.find(';') != string::npos) { string first; argument = split(argument, first, ';'); - Dispatch(first); + dispatch(first); } } break; @@ -1424,8 +1574,8 @@ string const LyXFunc::Dispatch(int ac, fontloader.update(); // Of course we should only do the resize and the textcache.clear // if values really changed...but not very important right now. (Lgb) - // All buffers will need resize - bufferlist.resize(); + // All visible buffers will need resize + owner->resize(); // We also need to empty the textcache so that // the buffer will be formatted correctly after // a zoom change. @@ -1472,12 +1622,62 @@ string const LyXFunc::Dispatch(int ac, // Then if it was none of the above if (!owner->view()->Dispatch(action, argument)) lyxerr << "A truly unknown func [" - << action << "]!" << endl; + << lyxaction.getActionName(action) << "]!" + << endl; break; } // end of switch exit_with_message: + commandshortcut.erase(); + + if (lyxrc.display_shortcuts && show_sc) { + if (action != LFUN_SELFINSERT) { + // Put name of command and list of shortcuts + // for it in minibuffer + string comname = lyxaction.getActionName(action); + + int pseudoaction = action; + bool argsadded = false; + + if (!argument.empty()) { + // If we have the command with argument, + // this is better + pseudoaction = + lyxaction.searchActionArg(action, + argument); + + if (pseudoaction == -1) { + pseudoaction = action; + } else { + comname += " " + argument; + argsadded = true; + } + } + + string const shortcuts = + toplevel_keymap->findbinding(pseudoaction); + + if (!shortcuts.empty()) { + comname += ": " + shortcuts; + } else if (!argsadded) { + comname += " " + argument; + } + + if (!comname.empty()) { + comname = strip(comname); + commandshortcut = "(" + comname + ')'; + + // Here we could even add a small pause, + // to annoy the user and make him learn + // the shortcuts. + // No! That will just annoy, not teach + // anything. The user will read the messages + // if they are interested. (Asger) + } + } + } + string const res = getMessage(); if (res.empty()) { @@ -1500,14 +1700,14 @@ void LyXFunc::setupLocalKeymap() } -void LyXFunc::MenuNew(bool fromTemplate) +void LyXFunc::menuNew(bool fromTemplate) { string initpath = lyxrc.document_path; if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } @@ -1529,7 +1729,7 @@ void LyXFunc::MenuNew(bool fromTemplate) if (result.second.empty()) { owner->message(_("Canceled.")); - lyxerr.debug() << "New Document Cancelled." << endl; + lyxerr[Debug::INFO] << "New Document Cancelled." << endl; return; } @@ -1560,31 +1760,28 @@ void LyXFunc::MenuNew(bool fromTemplate) } } // Check whether the file already exists - if (IsLyXFilename(s)) { - FileInfo fi(s); - if (fi.readable() && - AskQuestion(_("File already exists:"), - MakeDisplayPath(s, 50), - _("Do you want to open the document?"))) { + FileInfo fi(s); + if (fi.readable() && + AskQuestion(_("File already exists:"), + MakeDisplayPath(s, 50), + _("Do you want to open the document?"))) { // loads document - string const disp_fn(MakeDisplayPath(s)); - - ostringstream str; - str << _("Opening document") << ' ' - << disp_fn << "..."; - - owner->message(str.str().c_str()); - //XFlush(fl_get_display()); - owner->view()->buffer( - bufferlist.loadLyXFile(s)); - ostringstream str2; - str2 << _("Document") << ' ' - << disp_fn << ' ' << _("opened."); - - owner->message(str2.str().c_str()); - - return; - } + string const disp_fn(MakeDisplayPath(s)); + + ostringstream str; + str << _("Opening document") << ' ' + << disp_fn << "..."; + + owner->message(str.str().c_str()); + //XFlush(fl_get_display()); + owner->view()->buffer(bufferlist.loadLyXFile(s)); + ostringstream str2; + str2 << _("Document") << ' ' + << disp_fn << ' ' << _("opened."); + + owner->message(str2.str().c_str()); + + return; } } else { s = AddName(lyxrc.document_path, @@ -1610,7 +1807,7 @@ void LyXFunc::MenuNew(bool fromTemplate) string(lyxrc.template_path))); FileDialog::Result result = - fileDlg.Select(initpath, + fileDlg.Select(lyxrc.template_path, _("*.lyx|LyX Documents (*.lyx)")); if (result.first == FileDialog::Later) @@ -1624,19 +1821,19 @@ void LyXFunc::MenuNew(bool fromTemplate) } // find a free buffer - lyxerr.debug() << "Find a free buffer." << endl; + lyxerr[Debug::INFO] << "Find a free buffer." << endl; owner->view()->buffer(bufferlist.newFile(s, templname)); } -void LyXFunc::Open(string const & fname) +void LyXFunc::open(string const & fname) { string initpath = lyxrc.document_path; if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } @@ -1667,12 +1864,16 @@ void LyXFunc::Open(string const & fname) } else filename = fname; - // get absolute path of file and make sure the filename ends - // with .lyx - filename = MakeAbsPath(filename); - if (!IsLyXFilename(filename)) - filename += ".lyx"; + // get absolute path of file and add ".lyx" to the filename if + // necessary + string const fullpath = FileSearch(string(), filename, "lyx"); + if (fullpath.empty()) { + WriteAlert(_("Error"), _("Could not find file"), filename); + return; + } + filename = fullpath; + // loads document string const disp_fn(MakeDisplayPath(filename)); @@ -1689,7 +1890,7 @@ void LyXFunc::Open(string const & fname) owner->message(str.str().c_str()); } else { ostringstream str; - str << _("Could not open docuent") << ' ' << disp_fn; + str << _("Could not open document") << ' ' << disp_fn; owner->message(str.str().c_str()); } } @@ -1700,8 +1901,8 @@ void LyXFunc::doImport(string const & argument) { string format; string filename = split(argument, format, ' '); - lyxerr.debug() << "LyXFunc::doImport: " << format - << " file: " << filename << endl; + lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format + << " file: " << filename << endl; if (filename.empty()) { // need user interaction string initpath = lyxrc.document_path; @@ -1709,11 +1910,11 @@ void LyXFunc::doImport(string const & argument) if (owner->view()->available()) { string const trypath = owner->buffer()->filepath; // If directory is writeable, use this as default. - if (IsDirWriteable(trypath) == 1) + if (IsDirWriteable(trypath)) initpath = trypath; } - string const text = _("Select ") + formats.PrettyName(format) + string const text = _("Select ") + formats.prettyName(format) + _(" file to import"); FileDialog fileDlg(owner, text, @@ -1723,9 +1924,9 @@ void LyXFunc::doImport(string const & argument) make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples")))); - string const extension = "*." + formats.Extension(format) - + "| " + formats.PrettyName(format) - + " (*." + formats.Extension(format) + ")"; + string const extension = "*." + formats.extension(format) + + "| " + formats.prettyName(format) + + " (*." + formats.extension(format) + ")"; FileDialog::Result result = fileDlg.Select(initpath, extension); @@ -1792,7 +1993,7 @@ void LyXFunc::reloadBuffer() } -void LyXFunc::CloseBuffer() +void LyXFunc::closeBuffer() { if (bufferlist.close(owner->buffer()) && !quitting) { if (bufferlist.empty()) { @@ -1853,7 +2054,7 @@ void LyXFunc::initMiniBuffer() text += nicename; if (tmpbuf->lyxvc.inUse()) { text += " ["; - text += tmpbuf->lyxvc.version(); + text += tmpbuf->lyxvc.versionString(); text += ' '; text += tmpbuf->lyxvc.locker(); if (tmpbuf->isReadonly())