* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#include "Lsstream.h"
-
-#include <time.h>
-#include <locale.h>
-#include <utility>
-#include <algorithm>
-
-#include <cstdlib>
-#include <cctype>
-#include <cstring>
-
#ifdef __GNUG__
#pragma implementation
#endif
+#include "lyxfunc.h"
#include "version.h"
#include "kbmap.h"
-#include "lyxfunc.h"
+#include "lyxrow.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"
#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"
#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 "minibuffer.h"
-#include "vspace.h"
-#include "LyXView.h"
-#include "lyx_gui_misc.h"
+#include "mathed/math_cursor.h"
+#include "mathed/math_inset.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 <ctime>
+#include <clocale>
+#include <cstdlib>
+#include <cctype>
+
+#include <utility>
+#include <algorithm>
+
using std::pair;
using std::make_pair;
extern BufferList bufferlist;
extern LyXServer * lyxserver;
-extern int greek_kb_flag;
extern bool selection_possible;
extern void MenuSendto();
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
-extern LyXTextClass::size_type current_layout;
-
extern void ShowLatexLog();
+
+#if 0
+
+///
+class MiniBufferController : public SigC::Object {
+public:
+ ///
+ MiniBufferController() {
+ minibuffer
+ .cmdReady
+ .connect(slot(this,
+ &MiniBufferController::receiveCommand));
+ minibuffer
+ .argReady
+ .connect(slot(this,
+ &MiniBufferController::receiveArg));
+ }
+ ///
+ void receiveCmd(string const & cmd) {}
+ ///
+ void receiveArg(string const & arg) {}
+
+
+private:
+};
+
+namespace {
+
+MiniBufferController mb_ctrl;
+
+}
+#endif
+
+
/* === globals =========================================================== */
+// Initialization of static member var
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();
}
+
inline
-LyXText * LyXFunc::TEXT(bool flag=true) const
+LyXText * LyXFunc::TEXT(bool flag = true) const
{
if (flag)
return owner->view()->text;
return owner->view()->getLyXText();
}
+
// I changed this func slightly. I commented out the ...FinishUndo(),
// this means that all places that used to have a moveCursorUpdate, now
// have a ...FinishUndo() as the preceeding statement. I have also added
inline
void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
{
- if (selecting || TEXT(flag)->mark_set) {
- TEXT(flag)->SetSelection(owner->view());
+ if (selecting || TEXT(flag)->selection.mark()) {
+ TEXT(flag)->setSelection(owner->view());
if (TEXT(flag)->bv_owner)
owner->view()->toggleToggle();
}
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
- //owner->showState();
owner->view()->setState();
}
void LyXFunc::handleKeyFunc(kb_action action)
{
- char c = 0;
+ char c = keyseq.getiso();
- if (keyseq.length == -1 && keyseq.getiso() != 0)
- c = keyseq.getiso();
+ 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);
- TEXT(false)->sel_cursor = TEXT(false)->cursor;
+ TEXT(false)->selection.cursor = TEXT(false)->cursor;
}
-int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
+void LyXFunc::processKeySym(KeySym keysym, unsigned int state)
{
string argument;
if (lyxerr.debugging(Debug::KEY)) {
- char * tmp = XKeysymToString(keysym);
+ char const * tmp = XKeysymToString(keysym);
string const stm = (tmp ? tmp : "");
lyxerr << "KeySym is "
<< stm
if (keysym == NoSymbol) {
lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
<< endl;
- //return 0;
- return FL_PREEMPT;
+ return;
}
- if (owner->view()->available()) {
- // this function should be used always [asierra060396]
- UpdatableInset * tli = owner->view()->theLockingInset();
- if (tli && (keysym == XK_Escape)) {
- if (tli == tli->GetLockingInset()) {
- owner->view()->unlockInset(tli);
- TEXT()->CursorRight(owner->view());
- moveCursorUpdate(true, false);
- owner->showState();
- } else {
- tli->UnlockInsetInInset(owner->view(),
- tli->GetLockingInset(),true);
- }
- //return 0;
- return FL_PREEMPT;
- }
- }
-
- // 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?
if ((keysym >= XK_Shift_L && keysym <= XK_Hyper_R)
- || keysym == XK_Mode_switch || keysym == 0x0)
- return 0;
-
+ || keysym == XK_Mode_switch || keysym == 0x0) {
+ return;
+ }
+
// Do a one-deep top-level lookup for
// cancel and meta-fake keys. RVDK_PATCH_5
cancel_meta_seq.reset();
// Mostly, meta_fake_bit = 0. RVDK_PATCH_5.
if ((action != LFUN_CANCEL) && (action != LFUN_META_FAKE)) {
if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "meta_fake_bit is [" << meta_fake_bit << "]" << endl;
+ lyxerr << "meta_fake_bit is ["
+ << meta_fake_bit << "]" << endl;
}
// remove Caps Lock and Mod2 as a modifiers
action = keyseq.addkey(keysym,
&(ShiftMask|ControlMask
|Mod1Mask));
if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "action now set to [" << action << "]" << endl;
+ lyxerr << "action now set to ["
+ << action << "]" << endl;
}
}
// 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 ["
+ lyxerr << "Key [action="
<< action << "]["
- << buf << "]"
+ << keyseq.print() << "]"
<< endl;
}
// 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->getMiniBuffer()->Set(buf);
+ if (keyseq.length() > 1 && !keyseq.deleted()) {
+ owner->message(keyseq.print());
}
- if (action == -1) {
- if (keyseq.length < -1) { // unknown key sequence...
- string buf;
- keyseq.print(buf);
- owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf);
- return 0;
- }
-
- char const isochar = keyseq.getiso();
- if (!(state & ControlMask) &&
- !(state & Mod1Mask) &&
- (isochar && keysym < 0xF000)) {
- argument += isochar;
+ if (action == LFUN_UNKNOWN_ACTION) {
+ // It is unknown, but what if we remove all
+ // the modifiers? (Lgb)
+ action = keyseq.addkey(keysym, 0);
+
+ if (lyxerr.debugging(Debug::KEY)) {
+ lyxerr << "Removing modifiers...\n"
+ << "Action now set to ["
+ << action << "]" << endl;
}
- if (argument.empty()) {
- lyxerr.debug() << "Empty argument!" << endl;
- // This can`t possibly be of any use
- // so we`ll skip the dispatch.
- return 0;
+ if (action == LFUN_UNKNOWN_ACTION) {
+ owner->message(_("Unknown function."));
+ return;
}
- } else if (action == LFUN_SELFINSERT) {
- // We must set the argument to the char looked up by
- // XKeysymToString
- XKeyEvent xke;
- xke.type = KeyPress;
- xke.serial = 0;
- xke.send_event = False;
- xke.display = fl_get_display();
- xke.window = 0;
- xke.root = 0;
- xke.subwindow = 0;
- xke.time = 0;
- xke.x = 0;
- xke.y = 0;
- xke.x_root = 0;
- xke.y_root = 0;
- xke.state = state;
- xke.keycode = XKeysymToKeycode(fl_get_display(), keysym);
- xke.same_screen = True;
- char ret[10];
- KeySym tmpkeysym;
- int res = XLookupString(&xke, ret, 10, &tmpkeysym, 0);
- //Assert(keysym == tmpkeysym);
- lyxerr[Debug::KEY] << "TmpKeysym ["
- << tmpkeysym << "]" << endl;
+ }
+
+ if (action == LFUN_SELFINSERT) {
+ // This is very X dependent.
+ unsigned int c = keysym;
- if (res > 0)
- argument = string(ret, res);
- lyxerr[Debug::KEY] << "SelfInsert arg["
- << argument << "]" << endl;
+ c = kb_keymap::getiso(c);
+
+ if (c > 0)
+ argument = static_cast<char>(c);
+ lyxerr[Debug::KEY] << "SelfInsert arg[`"
+ << argument << "']" << endl;
}
-
bool tmp_sc = show_sc;
show_sc = false;
- Dispatch(action, argument);
+ dispatch(action, argument);
show_sc = tmp_sc;
- return 0;
+ //return 0;
}
-LyXFunc::func_status LyXFunc::getStatus(int ac) const
+
+FuncStatus LyXFunc::getStatus(int ac) const
{
return getStatus(ac, string());
}
-LyXFunc::func_status 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 flag = LyXFunc::OK;
- string argument;
- Buffer * buf = owner->buffer();
+ kb_action action;
+ FuncStatus flag;
+ string argument;
+ Buffer * buf = owner->buffer();
- if (lyxaction.isPseudoAction(ac))
+ if (lyxaction.isPseudoAction(ac))
action = lyxaction.retrieveActionArg(ac, argument);
else {
action = static_cast<kb_action>(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 LyXFunc::Unknown;
+ return flag.unknown(true);
}
// Check whether we need a buffer
LyXAction::ReadOnly)) {
// no
setErrorMessage(N_("Document is read-only"));
- flag |= LyXFunc::Disabled;
+ flag.disabled(true);
}
} else {
// no
setErrorMessage(N_("Command not allowed with"
"out any document open"));
- flag |= LyXFunc::Disabled;
- return flag;
+ return flag.disabled(true);
}
}
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;
disable = !Exporter::IsExportable(buf, "program");
break;
- case LFUN_INSERTFOOTNOTE:
- case LFUN_FOOTMELT:
- case LFUN_MARGINMELT:
- // 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) {
+ FuncStatus ret;
+ ret.disabled(true);
+ if (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) {
ret = static_cast<InsetTabular *>
(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<InsetTabular *>
(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);
+ FuncStatus ret;
+
+ disable = true;
+ ret = inset.getStatus(argument);
+ if (ret.onoff(true) || ret.onoff(false)) flag.setOnOff(false);
}
break;
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.clear();
+ break;
+ }
+ if (!contains("tcb", argument[0])) {
+ disable = true;
+ break;
+ }
+ flag.setOnOff(argument[0] == align);
+ } 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.clear();
+ break;
+ }
+ if (!contains("lcr", argument[0])) {
+ disable = true;
+ break;
+ }
+ flag.setOnOff(argument[0] == align);
+ } 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();
+ if (argument == "inline") {
+ flag.setOnOff(type == LM_OT_SIMPLE);
+ } else if (argument == "display") {
+ flag.setOnOff(type == LM_OT_EQUATION);
+ } else if (argument == "eqnarray") {
+ flag.setOnOff(type == LM_OT_EQNARRAY);
+ } else if (argument == "align") {
+ flag.setOnOff(type == LM_OT_ALIGN);
+ } else {
+ disable = true;
+ }
+ } 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;
+ // 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.disabled(true);
+
+ // A few general toggles
+ switch (action) {
+ case LFUN_READ_ONLY_TOGGLE:
+ flag.setOnOff(buf->isReadonly());
+ break;
+ case LFUN_APPENDIX:
+ flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+ break;
+ default:
+ break;
+ }
+
+ // the font related toggles
+ if (!mathcursor) {
+ LyXFont const & font = TEXT(false)->real_current_font;
switch (action) {
case LFUN_EMPH:
- if (font.emph() == LyXFont::ON)
- box = LyXFunc::ToggleOn;
+ flag.setOnOff(font.emph() == LyXFont::ON);
break;
case LFUN_NOUN:
- if (font.noun() == LyXFont::ON)
- box = LyXFunc::ToggleOn;
+ flag.setOnOff(font.noun() == LyXFont::ON);
break;
case LFUN_BOLD:
- if (font.series() == LyXFont::BOLD_SERIES)
- box = LyXFunc::ToggleOn;
+ flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
+ break;
+ case LFUN_SANS:
+ flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
break;
- case LFUN_TEX:
- if (font.latex() == LyXFont::ON)
- box = LyXFunc::ToggleOn;
+ case LFUN_ROMAN:
+ flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
+ break;
+ case LFUN_CODE:
+ flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
break;
default:
- box = LyXFunc::OK;
break;
}
- flag |= box;
}
-
+ 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;
}
-string const LyXFunc::Dispatch(string const & s)
+// temporary dispatch method
+void LyXFunc::miniDispatch(string const & s)
+{
+ string s2(frontStrip(strip(s)));
+
+ if (!s2.empty()) {
+ dispatch(s2);
+ }
+}
+
+
+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);
+ 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);
+ }
}
-string const LyXFunc::Dispatch(int ac,
- string const & do_not_use_this_arg)
+string const LyXFunc::dispatch(int ac,
+ string const & do_not_use_this_arg)
{
lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac
<<"] arg[" << do_not_use_this_arg << "]" << endl;
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).disabled()) {
+ lyxerr[Debug::ACTION] << "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->getMiniBuffer()->Set(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;
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
- (keyseq.length >= -1)))
+ (!keyseq.deleted())))
{
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) {
- int slx;
- int sly;
- UpdatableInset * inset =
- owner->view()->theLockingInset();
- inset->GetCursorPos(owner->view(), slx, sly);
- owner->view()->unlockInset(inset);
+ // Undo/Redo is a bit tricky for insets.
+ if (action == LFUN_UNDO) {
owner->view()->menuUndo();
- if (TEXT()->cursor.par()->
- IsInset(TEXT()->cursor.pos())) {
- inset = static_cast<UpdatableInset*>(
- TEXT()->cursor.par()->
- GetInset(TEXT()->
- cursor.pos()));
- } else {
- inset = 0;
- }
- if (inset)
- inset->Edit(owner->view(),slx,sly,0);
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<UpdatableInset*>(
- 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)) ==
- 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:
- TEXT()->CursorDown(owner->view());
+ if (TEXT()->cursor.row()->next())
+ TEXT()->cursorDown(owner->view());
+ else
+ TEXT()->cursorRight(owner->view());
moveCursorUpdate(true, false);
owner->showState();
return string();
}
}
- Assert(action != LFUN_SELECT_FILE_SYNC);
-
switch (action) {
+
+ case LFUN_ESCAPE:
+ {
+ if (!owner->view()->available()) break;
+ // this function should be used always [asierra060396]
+ UpdatableInset * tli =
+ owner->view()->theLockingInset();
+ if (tli) {
+ UpdatableInset * lock = tli->getLockingInset();
+
+ if (tli == lock) {
+ owner->view()->unlockInset(tli);
+ TEXT()->cursorRight(owner->view());
+ moveCursorUpdate(true, false);
+ owner->showState();
+ } else {
+ tli->unlockInsetInInset(owner->view(),
+ lock,
+ true);
+ }
+ finishUndo();
+ }
+ }
+ break;
+
// --- Misc -------------------------------------------
case LFUN_WORDFINDFORWARD :
case LFUN_WORDFINDBACKWARD : {
} 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;
case LFUN_PREFIX:
{
- if (owner->view()->available()) {
+ if (owner->view()->available() && !owner->view()->theLockingInset()) {
owner->view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR);
}
- string buf;
- keyseq.print(buf, true);
- owner->getMiniBuffer()->Set(buf, string(), string(), 1);
+ owner->message(keyseq.print());
}
break;
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
- owner->getMiniBuffer()->PrepareForCommand();
- break;
+ {
+ std::vector<string> allCmds;
+ std::transform(lyxaction.func_begin(), lyxaction.func_end(),
+ std::back_inserter(allCmds), lyx::firster());
+ static std::vector<string> hist;
+ owner->getMiniBuffer()->getString(MiniBuffer::spaces,
+ allCmds, hist);
+ }
+ break;
case LFUN_CANCEL: // RVDK_PATCH_5
keyseq.reset();
meta_fake_bit = 0;
if (owner->view()->available())
// cancel any selection
- Dispatch(LFUN_MARK_OFF);
+ dispatch(LFUN_MARK_OFF);
setMessage(N_("Cancel"));
break;
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;
// --- 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:
if (!owner->buffer()->isUnnamed()) {
- owner->getMiniBuffer()->Set(_("Saving document"),
- MakeDisplayPath(owner->buffer()->fileName()),
- "...");
+ ostringstream s1;
+ s1 << _("Saving document") << ' '
+ << MakeDisplayPath(owner->buffer()->fileName() + "...");
+ owner->message(s1.str().c_str());
MenuWrite(owner->view(), owner->buffer());
} else
WriteAs(owner->view(), owner->buffer());
break;
case LFUN_TOCVIEW:
+#if 0
case LFUN_LOFVIEW:
case LFUN_LOTVIEW:
case LFUN_LOAVIEW:
+#endif
{
InsetCommandParams p;
-
- if (action == LFUN_TOCVIEW )
- p.setCmdName( "tableofcontents" );
+
+#if 0
+ if (action == LFUN_TOCVIEW)
+#endif
+ p.setCmdName("tableofcontents");
+#if 0
else if (action == LFUN_LOAVIEW )
- p.setCmdName( "listofalgorithms" );
- else if (action == LFUN_LOFVIEW )
- p.setCmdName( "listoffigures" );
+ p.setCmdName("listof{algorithm}{List of Algorithms}");
+ else if (action == LFUN_LOFVIEW)
+ p.setCmdName("listoffigures");
else
- p.setCmdName( "listoftables" );
-
- owner->getDialogs()->createTOC( p.getAsString() );
+ p.setCmdName("listoftables");
+#endif
+ owner->getDialogs()->createTOC(p.getAsString());
break;
}
case LFUN_REMOVEERRORS:
if (owner->view()->removeAutoInsets()) {
owner->view()->redraw();
- owner->view()->fitCursor(TEXT());
+ owner->view()->fitCursor();
}
break;
-
-#ifndef NEW_INSETS
- case LFUN_OPENSTUFF:
- owner->view()->openStuff();
- break;
-#endif
-
- case LFUN_HYPHENATION:
- owner->view()->hyphenationPoint();
- break;
-
- case LFUN_LDOTS:
- owner->view()->ldots();
- break;
-
- case LFUN_END_OF_SENTENCE:
- owner->view()->endOfSentenceDot();
- break;
- case LFUN_MENU_SEPARATOR:
- owner->view()->menuSeparator();
- break;
-
- case LFUN_HFILL:
- owner->view()->hfill();
- break;
-
case LFUN_DEPTH:
changeDepth(owner->view(), TEXT(false), 0);
break;
case LFUN_FREE:
owner->getDialogs()->setUserFreeFont();
break;
-
- case LFUN_TEX:
- Tex(owner->view());
- owner->view()->setState();
- owner->showState();
- break;
-#ifndef NEW_INSETS
- case LFUN_MELT:
- Melt(owner->view());
- break;
-#endif
+
case LFUN_RECONFIGURE:
Reconfigure(owner->view());
break;
-#ifndef NEW_INSETS
- case LFUN_FOOTMELT:
- if (owner->view()->available()
- && !TEXT()->selection
- && TEXT()->cursor.par()->footnoteflag
- != LyXParagraph::NO_FOOTNOTE)
- { // only melt footnotes with FOOTMELT, not margins etc
- if (TEXT()->cursor.par()->footnotekind == LyXParagraph::FOOTNOTE)
- Melt(owner->view());
- }
- else
- Foot(owner->view());
- owner->view()->setState();
- break;
- case LFUN_MARGINMELT:
- if (owner->view()->available()
- && !TEXT()->selection
- && TEXT()->cursor.par()->footnoteflag
- != LyXParagraph::NO_FOOTNOTE) {
- // only melt margins
- if (TEXT()->cursor.par()->footnotekind == LyXParagraph::MARGIN)
- Melt(owner->view());
- } else
- Margin(owner->view());
- owner->view()->setState();
- break;
-#endif
-#ifndef NEW_INSETS
+#if 0
case LFUN_FLOATSOPERATE:
if (argument == "openfoot")
owner->view()->allFloats(1,0);
owner->view()->allFloats(0,1);
break;
#else
-#warning Find another implementation here (or another lyxfunc)!
+#ifdef WITH_WARNINGS
+//#warning Find another implementation here (or another lyxfunc)!
#endif
- case LFUN_HELP_COPYRIGHT:
- owner->getDialogs()->showCopyright();
+#endif
+ case LFUN_HELP_ABOUTLYX:
+ owner->getDialogs()->showAboutlyx();
break;
- case LFUN_HELP_CREDITS:
- owner->getDialogs()->showCredits();
+ case LFUN_HELP_TEXINFO:
+ owner->getDialogs()->showTexinfo();
break;
- case LFUN_HELP_OPEN: {
- string arg = argument;
+ case LFUN_HELP_OPEN:
+ {
+ string const arg = argument;
if (arg.empty()) {
setErrorMessage(N_("Missing argument"));
break;
}
- ProhibitInput(owner->view());
- string fname = i18nLibFileSearch("doc", arg, "lyx");
+ 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;
}
- owner->getMiniBuffer()->Set(_("Opening help file"),
- MakeDisplayPath(fname),"...");
- owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
- AllowInput(owner->view());
+ ostringstream str;
+ str << _("Opening help file") << ' '
+ << MakeDisplayPath(fname) << "...";
+ owner->message(str.str().c_str());
+ 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;
- }
-
// --- version control -------------------------------
case LFUN_VC_REGISTER:
{
break;
case LFUN_FILE_OPEN:
- Open(argument);
+ open(argument);
break;
case LFUN_LATEX_LOG:
owner->getDialogs()->showLogFile();
break;
- case LFUN_LAYOUTNO:
- {
- lyxerr.debug() << "LFUN_LAYOUTNO: (arg) " << argument << endl;
- int sel = strToInt(argument);
- lyxerr.debug() << "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()->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<InsetTabular *>
(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<InsetTabular *>(
- owner->view()->theLockingInset()->GetFirstLockingInsetOfType(Inset::TABULAR_CODE));
- inset->OpenLayoutDialog(owner->view());
+ owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ inset->openLayoutDialog(owner->view());
}
}
break;
owner->getDialogs()->showPreamble();
break;
- case LFUN_LAYOUT_SAVE_DEFAULT:
- MenuLayoutSave(owner->view());
- break;
-
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar()->openLayoutList();
break;
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;
case LFUN_NOTIFY:
{
- string buf;
- keyseq.print(buf);
- dispatch_buffer = buf;
+ dispatch_buffer = keyseq.print();
lyxserver->notifyClient(dispatch_buffer);
}
break;
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);
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();
// --- 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!"));
-
}
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;
} else {
p.setContents( argument );
}
- Dispatch(LFUN_CITATION_INSERT, p.getAsString());
+ dispatch(LFUN_CITATION_INSERT, p.getAsString());
} else
owner->getDialogs()->createCitation( p.getAsString() );
}
}
break;
-#ifndef NEW_INSETS
- case LFUN_INSERTFOOTNOTE:
- {
- LyXParagraph::footnote_kind kind;
- if (argument == "footnote") {
- kind = LyXParagraph::FOOTNOTE;
- } else if (argument == "margin") {
- kind = LyXParagraph::MARGIN;
- } else if (argument == "figure") {
- kind = LyXParagraph::FIG;
- } else if (argument == "table") {
- kind = LyXParagraph::TAB;
- } else if (argument == "wide-fig") {
- kind = LyXParagraph::WIDE_FIG;
- } else if (argument == "wide-tab") {
- kind = LyXParagraph::WIDE_TAB;
- } else if (argument == "algorithm") {
- kind = LyXParagraph::ALGORITHM;
- } else {
- setErrorMessage(N_("Unknown kind of footnote"));
- break;
- }
- TEXT()->InsertFootnoteEnvironment(owner->view(), kind);
- owner->view()->update(TEXT(),
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- owner->view()->setState();
- }
- break;
-#endif
case LFUN_TOGGLECURSORFOLLOW:
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
break;
while (argument.find(';') != string::npos) {
string first;
argument = split(argument, first, ';');
- Dispatch(first);
+ dispatch(first);
}
}
break;
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.
break;
}
+ case LFUN_MESSAGE:
+ owner->message(argument);
+ break;
+
+ case LFUN_MESSAGE_PUSH:
+ owner->messagePush(argument);
+ break;
+
+ case LFUN_MESSAGE_POP:
+ owner->messagePop();
+ break;
+
default:
// Then if it was none of the above
if (!owner->view()->Dispatch(action, argument))
- lyxerr << "A truly unknown func!" << endl;
+ lyxerr << "A truly unknown func ["
+ << 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);
+
+ kb_action 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 && !argument.empty()) {
+ 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()) {
if (!commandshortcut.empty()) {
- string const newbuf =
- owner->getMiniBuffer()->GetText();
- if (newbuf != commandshortcut) {
- owner->getMiniBuffer()->Set(newbuf
- + " " +
- commandshortcut);
- }
+ owner->getMiniBuffer()->addSet(commandshortcut);
}
} else {
- string msg(_(res));
- msg += " ";
- msg += commandshortcut;
- owner->getMiniBuffer()->Set(msg);
+ string const msg(_(res) + ' ' + commandshortcut);
+ owner->message(msg);
}
return res;
}
-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;
}
- static int newfile_number = 0;
+ static int newfile_number;
string s;
if (lyxrc.new_ask_filename) {
FileDialog fileDlg(owner, _("Enter filename for new document"),
- LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents")), string(lyxrc.document_path)),
- make_pair(string(_("Templates")), string(lyxrc.template_path)));
-
- FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx|LyX Documents (*.lyx)"), _("newfile"));
+ LFUN_SELECT_FILE_SYNC,
+ make_pair(string(_("Documents")),
+ string(lyxrc.document_path)),
+ make_pair(string(_("Templates")),
+ string(lyxrc.template_path)));
+
+ FileDialog::Result result =
+ fileDlg.Select(initpath,
+ _("*.lyx|LyX Documents (*.lyx)"),
+ _("newfile"));
if (result.second.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
- lyxerr.debug() << "New Document Cancelled." << endl;
+ owner->message(_("Canceled."));
+ lyxerr[Debug::INFO] << "New Document Cancelled." << endl;
return;
}
// Check if the document already is open
if (bufferlist.exists(s)) {
- switch (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)")))
+ 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)")))
{
case 1: // Yes: close the document
if (!bufferlist.close(bufferlist.getBuffer(s)))
owner->view()->buffer(bufferlist.getBuffer(s));
return;
case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
+ owner->message(_("Canceled."));
return;
}
}
// 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() &&
+ Alert::askQuestion(_("File already exists:"),
+ MakeDisplayPath(s, 50),
+ _("Do you want to open the document?"))) {
// loads document
- owner->getMiniBuffer()->Set(_("Opening document"),
- MakeDisplayPath(s), "...");
- XFlush(fl_get_display());
- owner->view()->buffer(
- bufferlist.loadLyXFile(s));
- owner->getMiniBuffer()->Set(_("Document"),
- MakeDisplayPath(s),
- _("opened."));
- 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,
if (fromTemplate) {
FileDialog fileDlg(owner, _("Select template file"),
LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents")), string(lyxrc.document_path)),
- make_pair(string(_("Templates")), string(lyxrc.template_path)));
-
- FileDialog::Result result = fileDlg.Select(initpath, _("*.lyx|LyX Documents (*.lyx)"));
+ make_pair(string(_("Documents")),
+ string(lyxrc.document_path)),
+ make_pair(string(_("Templates")),
+ string(lyxrc.template_path)));
+
+ FileDialog::Result result =
+ fileDlg.Select(lyxrc.template_path,
+ _("*.lyx|LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
return;
}
// 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;
}
if (fname.empty()) {
FileDialog fileDlg(owner, _("Select document to open"),
LFUN_FILE_OPEN,
- make_pair(string(_("Documents")), string(lyxrc.document_path)),
- make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples"))));
-
- FileDialog::Result result = fileDlg.Select(initpath, "*.lyx|LyX Documents (*.lyx)");
+ make_pair(string(_("Documents")),
+ string(lyxrc.document_path)),
+ make_pair(string(_("Examples")),
+ string(AddPath(system_lyxdir, "examples"))));
+
+ FileDialog::Result result =
+ fileDlg.Select(initpath,
+ "*.lyx|LyX Documents (*.lyx)");
if (result.first == FileDialog::Later)
return;
// check selected filename
if (filename.empty()) {
- owner->getMiniBuffer()->Set(_("Canceled."));
+ owner->message(_("Canceled."));
return;
}
} 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()) {
+ Alert::alert(_("Error"), _("Could not find file"), filename);
+ return;
+ }
+ filename = fullpath;
+
// loads document
- owner->getMiniBuffer()->Set(_("Opening document"),
- MakeDisplayPath(filename), "...");
+ string const disp_fn(MakeDisplayPath(filename));
+
+ ostringstream str;
+ str << _("Opening document") << ' ' << disp_fn << "...";
+
+ owner->message(str.str().c_str());
+
Buffer * openbuf = bufferlist.loadLyXFile(filename);
if (openbuf) {
owner->view()->buffer(openbuf);
- owner->getMiniBuffer()->Set(_("Document"),
- MakeDisplayPath(filename),
- _("opened."));
+ ostringstream str;
+ str << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
+ owner->message(str.str().c_str());
} else {
- owner->getMiniBuffer()->Set(_("Could not open document"),
- MakeDisplayPath(filename));
+ ostringstream str;
+ str << _("Could not open document") << ' ' << disp_fn;
+ owner->message(str.str().c_str());
}
}
{
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;
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,
LFUN_IMPORT,
- make_pair(string(_("Documents")), string(lyxrc.document_path)),
- make_pair(string(_("Examples")), string(AddPath(system_lyxdir, "examples"))));
+ make_pair(string(_("Documents")),
+ string(lyxrc.document_path)),
+ 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);
+ FileDialog::Result result = fileDlg.Select(initpath,
+ extension);
if (result.first == FileDialog::Later)
return;
filename = result.second;
// check selected filename
- if (filename.empty())
- owner->getMiniBuffer()->Set(_("Canceled."));
+ if (filename.empty())
+ owner->message(_("Canceled."));
}
// still no filename? abort
// Check if the document already is open
if (bufferlist.exists(lyxfile)) {
- switch (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)")))
+ 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)")))
{
case 1: // Yes: close the document
if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
owner->view()->buffer(bufferlist.getBuffer(lyxfile));
return;
case 3: // Cancel: Do nothing
- owner->getMiniBuffer()->Set(_("Canceled."));
+ owner->message(_("Canceled."));
return;
}
}
// 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->getMiniBuffer()->Set(_("Canceled."));
+ owner->message(_("Canceled"));
return;
}
// filename should be valid now
-
+
Importer::Import(owner, filename, format);
}
}
-void LyXFunc::CloseBuffer()
+void LyXFunc::closeBuffer()
{
if (bufferlist.close(owner->buffer()) && !quitting) {
if (bufferlist.empty()) {
{
dispatch_buffer = m;
}
+
+
+void LyXFunc::initMiniBuffer()
+{
+ string text = _("Welcome to LyX!");
+
+ // When meta-fake key is pressed, show the key sequence so far + "M-".
+ if (wasMetaKey()) {
+ text = keyseq.print();
+ text += "M-";
+ }
+
+ // Else, when a non-complete key sequence is pressed,
+ // show the available options.
+ if (keyseq.length() > 0 && !keyseq.deleted()) {
+ text = keyseq.printOptions();
+ }
+
+ // Else, show the buffer state.
+ else if (owner->view()->available()) {
+ Buffer * tmpbuf = owner->buffer();
+
+ string const nicename =
+ MakeDisplayPath(tmpbuf->fileName());
+ // Should we do this instead? (kindo like emacs)
+ // leaves more room for other information
+ text = "LyX: ";
+ text += nicename;
+ if (tmpbuf->lyxvc.inUse()) {
+ text += " [";
+ text += tmpbuf->lyxvc.versionString();
+ text += ' ';
+ text += tmpbuf->lyxvc.locker();
+ if (tmpbuf->isReadonly())
+ text += " (RO)";
+ text += ']';
+ } else if (tmpbuf->isReadonly())
+ text += " [RO]";
+ if (!tmpbuf->isLyxClean())
+ text += _(" (Changed)");
+ } else {
+ if (text != _("Welcome to LyX!")) // this is a hack
+ text = _("* No document open *");
+ }
+
+ owner->message(text);
+}
+
projects / lyx.git / blobdiff