-/* This file is part of
- * ======================================================
+/**
+ * \file lyxfunc.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ * \author Dekel Tsur
+ * \author Martin Vermeer
+ * \author Jürgen Vigna
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
#include "lyxfunc.h"
-#include "version.h"
-#include "kbmap.h"
-#include "lyxrow.h"
+
+#include "BranchList.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferlist.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "lyxserver.h"
-#include "intl.h"
-#include "lyx_main.h"
-#include "lyx_cb.h"
-#include "LyXAction.h"
+#include "cursor.h"
#include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "Lsstream.h"
-#include "trans_mgr.h"
+#include "dispatchresult.h"
#include "encoding.h"
-#include "layout.h"
-#include "bufferview_funcs.h"
-#include "frontends/LyXView.h"
-#include "frontends/lyx_gui.h"
-#include "vspace.h"
-#include "FloatList.h"
-#include "format.h"
#include "exporter.h"
+#include "format.h"
+#include "funcrequest.h"
+#include "gettext.h"
#include "importer.h"
-#include "TextCache.h"
+#include "intl.h"
+#include "iterators.h"
+#include "kbmap.h"
+#include "LColor.h"
+#include "lyx_cb.h"
+#include "LyXAction.h"
#include "lyxfind.h"
-#include "undo_funcs.h"
+#include "lyxrc.h"
+#include "lyxrow.h"
+#include "lyxserver.h"
+#include "lyxvc.h"
+#include "paragraph.h"
#include "ParagraphParameters.h"
+#include "undo.h"
#include "insets/insetcommand.h"
+#include "insets/insetexternal.h"
#include "insets/insettabular.h"
-#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
-#include "mathed/math_inset.h"
-#include "frontends/FileDialog.h"
+#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
+#include "frontends/FileDialog.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXKeySym.h"
+#include "frontends/LyXView.h"
#include "frontends/Menubar.h"
-#include "frontends/Alert.h"
-
-#include "graphics/GraphicsCache.h"
+#include "frontends/Toolbar.h"
-#include "support/lyxalgo.h"
-#include "support/LAssert.h"
-#include "support/filetools.h"
#include "support/FileInfo.h"
+#include "support/filetools.h"
#include "support/forkedcontr.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
#include "support/path.h"
-#include "support/lyxfunctional.h"
-
-#include <ctime>
-#include <clocale>
-#include <cstdlib>
-#include <cctype>
-
-#include <utility>
-#include <algorithm>
+#include "support/path_defines.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
+#include "support/os.h"
+
+using bv_funcs::apply_freefont;
+using bv_funcs::changeDepth;
+using bv_funcs::currentState;
+using bv_funcs::DEC_DEPTH;
+using bv_funcs::freefont2string;
+using bv_funcs::INC_DEPTH;
+using bv_funcs::update_and_apply_freefont;
+
+using lyx::support::AddName;
+using lyx::support::AddPath;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::FileInfo;
+using lyx::support::FileSearch;
+using lyx::support::ForkedcallsController;
+using lyx::support::i18nLibFileSearch;
+using lyx::support::IsDirWriteable;
+using lyx::support::IsFileReadable;
+using lyx::support::isStrInt;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::Path;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::strToInt;
+using lyx::support::strToUnsignedInt;
+using lyx::support::system_lyxdir;
+using lyx::support::token;
+using lyx::support::trim;
+using lyx::support::user_lyxdir;
+using lyx::support::prefixIs;
+using lyx::support::os::getTmpDir;
-using std::pair;
-using std::make_pair;
using std::endl;
-using std::find_if;
-using std::vector;
-using std::transform;
-using std::back_inserter;
-using namespace bv_funcs;
+using std::make_pair;
+using std::string;
+using std::istringstream;
+
extern BufferList bufferlist;
extern LyXServer * lyxserver;
}
-inline
-LyXText * LyXFunc::TEXT(bool flag = true) const
+void LyXFunc::moveCursorUpdate()
{
- if (flag)
- return view()->text;
- return view()->getLyXText();
-}
-
-
-inline
-void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
-{
- if (selecting || TEXT(flag)->selection.mark()) {
- TEXT(flag)->setSelection();
- if (!TEXT(flag)->isInInset())
- view()->toggleToggle();
- }
- view()->update(TEXT(flag), BufferView::SELECT);
-
+ LyXText * lt = view()->text;
+ if (lt->selection.mark())
+ lt->setSelection();
+ view()->update();
view()->switchKeyMap();
}
}
owner->getIntl().getTransManager()
- .deadkey(c, get_accent(action).accent, TEXT(false));
+ .deadkey(c, get_accent(action).accent, view()->getLyXText());
// Need to clear, in case the minibuffer calls these
// actions
keyseq.clear();
// copied verbatim from do_accent_char
- view()->update(TEXT(false), BufferView::SELECT);
- TEXT(false)->selection.cursor = TEXT(false)->cursor;
+ view()->update();
+ view()->getLyXText()->selection.cursor = view()->getLyXText()->cursor;
}
// cancel and meta-fake keys. RVDK_PATCH_5
cancel_meta_seq.reset();
- int action = cancel_meta_seq.addkey(keysym, state);
- lyxerr[Debug::KEY] << "action first set to [" << action << ']' << endl;
+ FuncRequest func = cancel_meta_seq.addkey(keysym, state);
+ lyxerr[Debug::KEY] << "action first set to [" << func.action << ']' << endl;
// When not cancel or meta-fake, do the normal lookup.
// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
// Mostly, meta_fake_bit = key_modifier::none. RVDK_PATCH_5.
- if ((action != LFUN_CANCEL) && (action != LFUN_META_FAKE)) {
+ if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_FAKE)) {
// remove Caps Lock and Mod2 as a modifiers
- action = keyseq.addkey(keysym, (state | meta_fake_bit));
+ func = keyseq.addkey(keysym, (state | meta_fake_bit));
lyxerr[Debug::KEY] << "action now set to ["
- << action << ']' << endl;
+ << func.action << ']' << endl;
}
// Dont remove this unless you know what you are doing.
meta_fake_bit = key_modifier::none;
// can this happen now ?
- if (action == LFUN_NOACTION) {
- action = LFUN_PREFIX;
+ if (func.action == LFUN_NOACTION) {
+ func = FuncRequest(LFUN_PREFIX);
}
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Key [action="
- << action << "]["
+ << func.action << "]["
<< keyseq.print() << ']'
<< endl;
}
// Maybe user can only reach the key via holding down shift.
// Let's see. But only if shift is the only modifier
- if (action == LFUN_UNKNOWN_ACTION && state == key_modifier::shift) {
+ if (func.action == LFUN_UNKNOWN_ACTION &&
+ state == key_modifier::shift) {
lyxerr[Debug::KEY] << "Trying without shift" << endl;
- action = keyseq.addkey(keysym, key_modifier::none);
- lyxerr[Debug::KEY] << "Action now " << action << endl;
+ func = keyseq.addkey(keysym, key_modifier::none);
+ lyxerr[Debug::KEY] << "Action now " << func.action << endl;
}
- if (action == LFUN_UNKNOWN_ACTION) {
+ if (func.action == LFUN_UNKNOWN_ACTION) {
// Hmm, we didn't match any of the keysequences. See
// if it's normal insertable text not already covered
// by a binding
if (keysym->isText() && keyseq.length() == 1) {
lyxerr[Debug::KEY] << "isText() is true, inserting." << endl;
- action = LFUN_SELFINSERT;
+ func = FuncRequest(LFUN_SELFINSERT);
} else {
lyxerr[Debug::KEY] << "Unknown, !isText() - giving up" << endl;
owner->message(_("Unknown function."));
}
}
- if (action == LFUN_SELFINSERT) {
+ if (func.action == LFUN_SELFINSERT) {
if (encoded_last_key != 0) {
string arg;
arg += encoded_last_key;
<< argument << "']" << endl;
}
} else {
- dispatch(action);
+ dispatch(func);
}
}
-FuncStatus LyXFunc::getStatus(int ac) const
-{
- return getStatus(lyxaction.retrieveActionArg(ac));
-}
-
-
FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
{
FuncStatus flag;
if (ev.action == LFUN_NOACTION) {
setStatusMessage(N_("Nothing to do"));
- return flag.disabled(true);
+ flag.disabled(true);
+ return flag;
}
switch (ev.action) {
case LFUN_THESAURUS_ENTRY:
#endif
flag.unknown(true);
+ flag.disabled(true);
break;
default:
flag |= lyx_gui::getStatus(ev);
} else {
// no
setStatusMessage(N_("Command not allowed with"
- "out any document open"));
- return flag.disabled(true);
+ "out any document open"));
+ flag.disabled(true);
+ return flag;
}
}
// encode this in the function itself.
bool disable = false;
switch (ev.action) {
- case LFUN_MENUPRINT:
- disable = !Exporter::IsExportable(buf, "dvi")
- || lyxrc.print_command == "none";
- break;
case LFUN_EXPORT:
disable = ev.argument != "custom"
- && !Exporter::IsExportable(buf, ev.argument);
+ && !Exporter::IsExportable(*buf, ev.argument);
break;
case LFUN_UNDO:
- disable = buf->undostack.empty();
+ disable = buf->undostack().empty();
break;
case LFUN_REDO:
- disable = buf->redostack.empty();
+ disable = buf->redostack().empty();
break;
case LFUN_CUT:
case LFUN_COPY:
if (tli) {
UpdatableInset * in = tli;
- if (in->lyxCode() != Inset::TABULAR_CODE) {
- in = tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE);
+ if (in->lyxCode() != InsetOld::TABULAR_CODE) {
+ in = tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE);
}
if (in && static_cast<InsetTabular*>(in)->hasSelection()) {
disable = false;
disable = !buf->isLatex() || lyxrc.chktex_command == "none";
break;
case LFUN_BUILDPROG:
- disable = !Exporter::IsExportable(buf, "program");
- break;
-
- case LFUN_LAYOUT_CHARACTER:
- disable = tli && tli->lyxCode() == Inset::ERT_CODE;
+ disable = !Exporter::IsExportable(*buf, "program");
break;
case LFUN_LAYOUT_TABULAR:
disable = !tli
- || (tli->lyxCode() != Inset::TABULAR_CODE
- && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ || (tli->lyxCode() != InsetOld::TABULAR_CODE
+ && !tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
break;
case LFUN_DEPTH_MIN:
- disable = !changeDepth(view(), TEXT(false), DEC_DEPTH, true);
+ disable = !changeDepth(view(), view()->getLyXText(), DEC_DEPTH, true);
break;
case LFUN_DEPTH_PLUS:
- disable = !changeDepth(view(), TEXT(false), INC_DEPTH, true);
+ disable = !changeDepth(view(), view()->getLyXText(), INC_DEPTH, true);
break;
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH: {
- Inset * inset = TEXT(false)->cursor.par()->inInset();
+ InsetOld * inset = view()->getLyXText()->cursorPar()->inInset();
disable = inset && inset->forceDefaultParagraphs(inset);
break;
}
case LFUN_INSET_OPTARG:
- disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+ disable = (view()->getLyXText()->cursorPar()->layout()->optionalargs == 0);
break;
case LFUN_TABULAR_FEATURE:
break;
}
flag.setOnOff(ev.argument[0] == align);
- } else
+ } else {
disable = true;
char align = mathcursor->halign();
if (tli) {
FuncStatus ret;
//ret.disabled(true);
- if (tli->lyxCode() == Inset::TABULAR_CODE) {
+ if (tli->lyxCode() == InsetOld::TABULAR_CODE) {
ret = static_cast<InsetTabular *>(tli)
->getStatus(ev.argument);
flag |= ret;
disable = false;
- } else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+ } else if (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
- (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
+ (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE))
->getStatus(ev.argument);
flag |= ret;
disable = false;
disable = true;
}
} else {
- static InsetTabular inset(*owner->buffer(), 1, 1);
- FuncStatus ret;
-
+ static InsetTabular inset(*buf, 1, 1);
disable = true;
- ret = inset.getStatus(ev.argument);
+ FuncStatus ret = inset.getStatus(ev.argument);
if (ret.onoff(true) || ret.onoff(false))
flag.setOnOff(false);
}
break;
case LFUN_VC_REGISTER:
- disable = buf->lyxvc.inUse();
+ disable = buf->lyxvc().inUse();
break;
case LFUN_VC_CHECKIN:
- disable = !buf->lyxvc.inUse() || buf->isReadonly();
+ disable = !buf->lyxvc().inUse() || buf->isReadonly();
break;
case LFUN_VC_CHECKOUT:
- disable = !buf->lyxvc.inUse() || !buf->isReadonly();
+ disable = !buf->lyxvc().inUse() || !buf->isReadonly();
break;
case LFUN_VC_REVERT:
case LFUN_VC_UNDO:
- case LFUN_VC_HISTORY:
- disable = !buf->lyxvc.inUse();
+ disable = !buf->lyxvc().inUse();
break;
case LFUN_MENURELOAD:
disable = buf->isUnnamed() || buf->isClean();
break;
case LFUN_BOOKMARK_GOTO:
- disable = !view()->
+ disable = !view()->
isSavedPosition(strToUnsignedInt(ev.argument));
break;
+
case LFUN_MERGE_CHANGES:
case LFUN_ACCEPT_CHANGE:
case LFUN_REJECT_CHANGE:
case LFUN_ACCEPT_ALL_CHANGES:
case LFUN_REJECT_ALL_CHANGES:
- disable = !buf->params.tracking_changes;
+ disable = !buf->params().tracking_changes;
break;
+
case LFUN_INSET_TOGGLE: {
LyXText * lt = view()->getLyXText();
disable = !(isEditableInset(lt->getInset())
case LFUN_INSET_SETTINGS: {
disable = true;
UpdatableInset * inset = view()->theLockingInset();
-
+
if (!inset)
break;
// jump back to owner if an InsetText, so
// we get back to the InsetTabular or whatever
- if (inset->lyxCode() == Inset::TEXT_CODE)
- inset = static_cast<UpdatableInset*>(inset->owner());
+ if (inset->lyxCode() == InsetOld::TEXT_CODE)
+ inset = inset->owner();
- Inset::Code code = inset->lyxCode();
+ InsetOld::Code code = inset->lyxCode();
switch (code) {
- case Inset::TABULAR_CODE:
+ case InsetOld::TABULAR_CODE:
disable = ev.argument != "tabular";
break;
- case Inset::ERT_CODE:
+ case InsetOld::ERT_CODE:
disable = ev.argument != "ert";
break;
- case Inset::FLOAT_CODE:
+ case InsetOld::FLOAT_CODE:
disable = ev.argument != "float";
break;
- case Inset::MINIPAGE_CODE:
+ case InsetOld::MINIPAGE_CODE:
disable = ev.argument != "minipage";
break;
- case Inset::WRAP_CODE:
+ case InsetOld::WRAP_CODE:
disable = ev.argument != "wrap";
break;
+ case InsetOld::NOTE_CODE:
+ disable = ev.argument != "note";
+ break;
+ case InsetOld::BRANCH_CODE:
+ disable = ev.argument != "branch";
+ break;
+ case InsetOld::BOX_CODE:
+ disable = ev.argument != "box";
+ break;
default:
break;
}
break;
}
- case LFUN_LATEX_LOG:
- disable = !IsFileReadable(buf->getLogName().second);
- break;
-
case LFUN_MATH_MUTATE:
if (mathcursor)
//flag.setOnOff(mathcursor->formula()->hullType() == ev.argument);
disable = !mathcursor;
break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = ev.getArg(0);
+ if (!buf) {
+ disable = !(name == "aboutlyx" ||
+ name == "file" ||
+ name == "forks" ||
+ name == "preferences" ||
+ name == "texinfo");
+ break;
+ }
+
+ if (name == "print") {
+ disable = !Exporter::IsExportable(*buf, "dvi") ||
+ lyxrc.print_command == "none";
+ } else if (name == "character") {
+ UpdatableInset * tli = view()->theLockingInset();
+ disable = tli && tli->lyxCode() == InsetOld::ERT_CODE;
+ } else if (name == "vclog") {
+ disable = !buf->lyxvc().inUse();
+ } else if (name == "latexlog") {
+ disable = !IsFileReadable(buf->getLogName().second);
+ }
+ break;
+ }
+
default:
break;
}
// the functions which insert insets
- Inset::Code code = Inset::NO_CODE;
+ InsetOld::Code code = InsetOld::NO_CODE;
switch (ev.action) {
case LFUN_DIALOG_SHOW_NEW_INSET:
if (ev.argument == "bibitem")
- code = Inset::BIBITEM_CODE;
+ code = InsetOld::BIBITEM_CODE;
else if (ev.argument == "bibtex")
- code = Inset::BIBTEX_CODE;
+ code = InsetOld::BIBTEX_CODE;
else if (ev.argument == "citation")
- code = Inset::CITE_CODE;
+ code = InsetOld::CITE_CODE;
else if (ev.argument == "ert")
- code = Inset::ERT_CODE;
+ code = InsetOld::ERT_CODE;
else if (ev.argument == "external")
- code = Inset::EXTERNAL_CODE;
+ code = InsetOld::EXTERNAL_CODE;
else if (ev.argument == "float")
- code = Inset::FLOAT_CODE;
+ code = InsetOld::FLOAT_CODE;
else if (ev.argument == "graphics")
- code = Inset::GRAPHICS_CODE;
+ code = InsetOld::GRAPHICS_CODE;
else if (ev.argument == "include")
- code = Inset::INCLUDE_CODE;
+ code = InsetOld::INCLUDE_CODE;
else if (ev.argument == "index")
- code = Inset::INDEX_CODE;
+ code = InsetOld::INDEX_CODE;
else if (ev.argument == "label")
- code = Inset::LABEL_CODE;
+ code = InsetOld::LABEL_CODE;
else if (ev.argument == "minipage")
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
else if (ev.argument == "ref")
- code = Inset::REF_CODE;
+ code = InsetOld::REF_CODE;
else if (ev.argument == "toc")
- code = Inset::TOC_CODE;
+ code = InsetOld::TOC_CODE;
else if (ev.argument == "url")
- code = Inset::URL_CODE;
+ code = InsetOld::URL_CODE;
else if (ev.argument == "wrap")
- code = Inset::WRAP_CODE;
+ code = InsetOld::WRAP_CODE;
break;
case LFUN_INSET_ERT:
- code = Inset::ERT_CODE;
+ code = InsetOld::ERT_CODE;
break;
case LFUN_INSET_FOOTNOTE:
- code = Inset::FOOT_CODE;
+ code = InsetOld::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
- code = Inset::TABULAR_CODE;
+ code = InsetOld::TABULAR_CODE;
break;
case LFUN_INSET_MARGINAL:
- code = Inset::MARGIN_CODE;
+ code = InsetOld::MARGIN_CODE;
break;
case LFUN_INSET_MINIPAGE:
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INSET_FLOAT:
case LFUN_INSET_WIDE_FLOAT:
- code = Inset::FLOAT_CODE;
+ code = InsetOld::FLOAT_CODE;
break;
case LFUN_INSET_WRAP:
- code = Inset::WRAP_CODE;
+ code = InsetOld::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
- code = Inset::FLOAT_LIST_CODE;
+ code = InsetOld::FLOAT_LIST_CODE;
break;
#if 0
case LFUN_INSET_LIST:
- code = Inset::LIST_CODE;
+ code = InsetOld::LIST_CODE;
break;
case LFUN_INSET_THEOREM:
- code = Inset::THEOREM_CODE;
+ code = InsetOld::THEOREM_CODE;
break;
#endif
case LFUN_INSET_CAPTION:
- code = Inset::CAPTION_CODE;
+ code = InsetOld::CAPTION_CODE;
break;
case LFUN_INSERT_NOTE:
- code = Inset::NOTE_CODE;
+ code = InsetOld::NOTE_CODE;
+ break;
+ case LFUN_INSERT_BOX:
+ code = InsetOld::BOX_CODE;
+ break;
+ case LFUN_INSERT_BRANCH:
+ code = InsetOld::BRANCH_CODE;
+ if (buf->params().branchlist().empty())
+ disable = true;
break;
case LFUN_INSERT_LABEL:
- code = Inset::LABEL_CODE;
+ code = InsetOld::LABEL_CODE;
break;
case LFUN_INSET_OPTARG:
- code = Inset::OPTARG_CODE;
+ code = InsetOld::OPTARG_CODE;
break;
case LFUN_ENVIRONMENT_INSERT:
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INDEX_INSERT:
- code = Inset::INDEX_CODE;
+ code = InsetOld::INDEX_CODE;
break;
case LFUN_INDEX_PRINT:
- code = Inset::INDEX_PRINT_CODE;
+ code = InsetOld::INDEX_PRINT_CODE;
break;
case LFUN_TOC_INSERT:
- code = Inset::TOC_CODE;
- break;
- case LFUN_PARENTINSERT:
- code = Inset::PARENT_CODE;
+ code = InsetOld::TOC_CODE;
break;
case LFUN_HTMLURL:
case LFUN_URL:
- code = Inset::URL_CODE;
+ code = InsetOld::URL_CODE;
break;
case LFUN_QUOTE:
// always allow this, since we will inset a raw quote
case LFUN_MENU_SEPARATOR:
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
- code = Inset::SPECIALCHAR_CODE;
+ code = InsetOld::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (!mathcursor)
- code = Inset::SPACE_CODE;
+ code = InsetOld::SPACE_CODE;
+ break;
+ case LFUN_INSET_DIALOG_SHOW: {
+ InsetOld * inset = view()->getLyXText()->getInset();
+ disable = !inset;
+ if (!disable) {
+ code = inset->lyxCode();
+ if (!(code == InsetOld::INCLUDE_CODE
+ || code == InsetOld::BIBTEX_CODE
+ || code == InsetOld::FLOAT_LIST_CODE
+ || code == InsetOld::TOC_CODE))
+ disable = true;
+ }
break;
+ }
default:
break;
}
- if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code))
+ if (code != InsetOld::NO_CODE && tli && !tli->insetAllowed(code))
disable = true;
if (disable)
flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
- flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+ flag.setOnOff(view()->getLyXText()->cursorPar()->params().startOfAppendix());
break;
case LFUN_SWITCHBUFFER:
// toggle on the current buffer, but do not toggle off
flag.setOnOff(true);
break;
case LFUN_TRACK_CHANGES:
- flag.setOnOff(buf->params.tracking_changes);
+ flag.setOnOff(buf->params().tracking_changes);
break;
default:
break;
// the font related toggles
if (!mathcursor) {
- LyXFont const & font = TEXT(false)->real_current_font;
+ LyXFont const & font = view()->getLyXText()->real_current_font;
switch (ev.action) {
case LFUN_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
// solution, we consider only the first action of the sequence
if (ev.action == LFUN_SEQUENCE) {
// argument contains ';'-terminated commands
- flag = getStatus(lyxaction.LookupFunc(token(ev.argument, ';', 0)));
+#warning LyXAction arguments not handled here.
+ flag = getStatus(FuncRequest(lyxaction.lookupFunc(token(ev.argument, ';', 0))));
}
return flag;
}
-void LyXFunc::dispatch(string const & s, bool verbose)
-{
- int const action = lyxaction.LookupFunc(s);
-
- if (action == LFUN_UNKNOWN_ACTION) {
- owner->message(bformat(_("Unknown function (%1$s)"), s));
- return;
- }
-
- dispatch(action, verbose);
-}
-
+namespace {
-void LyXFunc::dispatch(int ac, bool verbose)
+bool ensureBufferClean(BufferView * bv)
{
- dispatch(lyxaction.retrieveActionArg(ac), verbose);
+ Buffer & buf = *bv->buffer();
+ if (buf.isClean())
+ return true;
+
+ string const file = MakeDisplayPath(buf.fileName(), 30);
+ string text = bformat(_("The document %1$s has unsaved "
+ "changes.\n\nDo you want to save "
+ "the document?"), file);
+ int const ret = Alert::prompt(_("Save changed document?"),
+ text, 0, 1, _("&Save"),
+ _("&Cancel"));
+
+ if (ret == 0)
+ bv->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
+
+ return buf.isClean();
}
+} //namespace anon
-void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
+void LyXFunc::dispatch(FuncRequest const & func, bool verbose)
{
- lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << ev.action
- <<"] arg[" << ev.argument << ']' << endl;
+ string argument = func.argument;
+ kb_action action = func.action;
+
+ lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << action
+ <<"] arg[" << argument << ']' << endl;
// we have not done anything wrong yet.
errorstat = false;
selection_possible = false;
- string argument = ev.argument;
- kb_action action = ev.action;
-
// We cannot use this function here
- if (getStatus(ev).disabled()) {
+ if (getStatus(func).disabled()) {
lyxerr[Debug::ACTION] << "LyXFunc::dispatch: "
<< lyxaction.getActionName(action)
<< " [" << action << "] is disabled at this location"
if (view()->available())
view()->hideCursor();
+#if 1
+ {
+ Cursor cursor;
+ buildCursor(cursor, *view());
+ DispatchResult result =
+ cursor.dispatch(FuncRequest(func, view()));
+
+ if (result.dispatched()) {
+ if (result.update()) {
+ view()->update();
+ }
+ lyxerr << "dispatched by Cursor::dispatch()\n";
+ goto exit_with_message;
+ }
+ lyxerr << "### NOT DispatchResult(true, true) BY Cursor::dispatch() ###\n";
+ }
+#endif
+
+
if (view()->available() && view()->theLockingInset()) {
- Inset::RESULT result;
- if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
- (!keyseq.deleted())))
+ DispatchResult result;
+ if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
+ !keyseq.deleted()))
{
UpdatableInset * inset = view()->theLockingInset();
#if 1
int dummy_y;
inset->getCursorPos(view(), inset_x, dummy_y);
#endif
- if ((action == LFUN_UNKNOWN_ACTION)
- && argument.empty()) {
+ if (action == LFUN_UNKNOWN_ACTION && argument.empty())
argument = encoded_last_key;
+
+ // the insets can't try to handle this,
+ // a table cell in the dummy position will
+ // lock its insettext, the insettext will
+ // pass it the bufferview, and succeed,
+ // so it will stay not locked. Not good
+ // if we've just done LFUN_ESCAPE (which
+ // injects an LFUN_PARAGRAPH_UPDATE)
+ if (action == LFUN_PARAGRAPH_UPDATE) {
+ view()->dispatch(func);
+ goto exit_with_message;
}
+
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
view()->undo();
goto exit_with_message;
- } else if (action == LFUN_REDO) {
+ }
+
+ if (action == LFUN_REDO) {
view()->redo();
goto exit_with_message;
- } else if (((result=inset->
- // Hand-over to inset's own dispatch:
- localDispatch(FuncRequest(view(), action, argument))) ==
- DISPATCHED) ||
- (result == DISPATCHED_NOUPDATE))
+ }
+
+ // Hand-over to inset's own dispatch:
+ result = inset->dispatch(FuncRequest(view(), action, argument));
+ if (result.dispatched()) {
+ if (result.update())
+ view()->update();
+
goto exit_with_message;
- // If UNDISPATCHED, just soldier on
- else if (result == FINISHED) {
+ }
+
+ // If DispatchResult(false), just soldier on
+ if (result.val() == FINISHED) {
owner->clearMessage();
goto exit_with_message;
// We do not need special RTL handling here:
// FINISHED means that the cursor should be
// one position after the inset.
- } else if (result == FINISHED_RIGHT) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ }
+
+ if (result.val() == FINISHED_RIGHT) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->clearMessage();
goto exit_with_message;
- } else if (result == FINISHED_UP) {
- if (TEXT()->cursor.irow() != TEXT()->rows().begin()) {
+ }
+
+ if (result.val() == FINISHED_UP) {
+ LyXText * text = view()->text;
+ ParagraphList::iterator pit = text->cursorPar();
+ Row const & row = *pit->getRow(text->cursor.pos());
+ if (text->isFirstRow(pit, row)) {
#if 1
- TEXT()->setCursorFromCoordinates(
- TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() - 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ text->setCursorFromCoordinates(
+ text->cursor.x() + inset_x,
+ text->cursor.y() -
+ row.baseline() - 1);
+ view()->x_target(text->cursor.x());
#else
- TEXT()->cursorUp(view());
+ text->cursorUp(view());
#endif
- moveCursorUpdate(true, false);
+ moveCursorUpdate();
} else {
- view()->update(TEXT(), BufferView::SELECT);
+ view()->update();
}
owner->clearMessage();
goto exit_with_message;
- } else if (result == FINISHED_DOWN) {
- if (boost::next(TEXT()->cursor.irow()) != TEXT()->rows().end()) {
+ }
+
+ if (result.val() == FINISHED_DOWN) {
+ LyXText * text = view()->text;
+ ParagraphList::iterator pit = text->cursorPar();
+ Row const & row = *pit->getRow(text->cursor.pos());
+ if (text->isLastRow(pit, row)) {
#if 1
- TEXT()->setCursorFromCoordinates(
- TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() +
- TEXT()->cursor.irow()->height() + 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ text->setCursorFromCoordinates(
+ text->cursor.x() + inset_x,
+ text->cursor.y() -
+ row.baseline() +
+ row.height() + 1);
+ view()->x_target(text->cursor.x());
#else
- TEXT()->cursorDown(view());
+ text->cursorDown(view());
#endif
} else {
- TEXT()->cursorRight(view());
+ text->cursorRight(view());
}
- moveCursorUpdate(true, false);
+ moveCursorUpdate();
owner->clearMessage();
goto exit_with_message;
}
+
#warning I am not sure this is still right, please have a look! (Jug 20020417)
- else { // result == UNDISPATCHED
- //setMessage(N_("Text mode"));
- switch (action) {
- case LFUN_UNKNOWN_ACTION:
- case LFUN_BREAKPARAGRAPH:
- case LFUN_BREAKLINE:
- TEXT()->cursorRight(view());
- view()->switchKeyMap();
+ // result == DispatchResult()
+ //setMessage(N_("Text mode"));
+ switch (action) {
+ case LFUN_UNKNOWN_ACTION:
+ case LFUN_BREAKPARAGRAPH:
+ case LFUN_BREAKLINE:
+ view()->text->cursorRight(view());
+ view()->switchKeyMap();
+ owner->view_state_changed();
+ break;
+ case LFUN_RIGHT:
+ if (!view()->text->cursorPar()->isRightToLeftPar(owner->buffer()->params())) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
- break;
- case LFUN_RIGHT:
- if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
- owner->view_state_changed();
- }
- goto exit_with_message;
- case LFUN_LEFT:
- if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
- owner->view_state_changed();
- }
- goto exit_with_message;
- case LFUN_DOWN:
- if (boost::next(TEXT()->cursor.row()) != TEXT()->rows().end())
- TEXT()->cursorDown(view());
- else
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ }
+ goto exit_with_message;
+ case LFUN_LEFT:
+ if (view()->text->cursorPar()->isRightToLeftPar(owner->buffer()->params())) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
- goto exit_with_message;
- default:
- break;
}
+ goto exit_with_message;
+ case LFUN_DOWN: {
+ LyXText * text = view()->text;
+ ParagraphList::iterator pit = text->cursorPar();
+ if (text->isLastRow(pit, *pit->getRow(text->cursor.pos())))
+ view()->text->cursorDown(view());
+ else
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
+ owner->view_state_changed();
+ goto exit_with_message;
+ }
+ default:
+ break;
}
}
}
switch (action) {
- case LFUN_ESCAPE:
- {
- if (!view()->available()) break;
+ case LFUN_ESCAPE: {
+ if (!view()->available())
+ break;
// this function should be used always [asierra060396]
- UpdatableInset * tli =
- view()->theLockingInset();
+ UpdatableInset * tli = view()->theLockingInset();
if (tli) {
UpdatableInset * lock = tli->getLockingInset();
if (tli == lock) {
view()->unlockInset(tli);
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
} else {
- tli->unlockInsetInInset(view(),
- lock,
- true);
+ tli->unlockInsetInInset(view(), lock, true);
}
finishUndo();
// Tell the paragraph dialog that we changed paragraph
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
+ break;
}
- break;
- // --- Misc -------------------------------------------
- case LFUN_WORDFINDFORWARD :
- case LFUN_WORDFINDBACKWARD : {
+ case LFUN_WORDFINDFORWARD:
+ case LFUN_WORDFINDBACKWARD: {
static string last_search;
string searched_string;
searched_string = last_search;
}
bool fw = (action == LFUN_WORDFINDFORWARD);
- if (!searched_string.empty()) {
- lyxfind::LyXFind(view(), searched_string, fw);
- }
+ if (!searched_string.empty())
+ lyx::find::find(view(), searched_string,
+ true, false, fw);
+ break;
}
- break;
case LFUN_PREFIX:
- {
- if (view()->available() && !view()->theLockingInset()) {
- view()->update(TEXT(), BufferView::SELECT);
- }
+ if (view()->available() && !view()->theLockingInset())
+ view()->update();
owner->message(keyseq.printOptions());
- }
- break;
+ break;
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
owner->focus_command_buffer();
break;
- case LFUN_CANCEL: // RVDK_PATCH_5
+ case LFUN_CANCEL:
keyseq.reset();
meta_fake_bit = key_modifier::none;
if (view()->available())
// cancel any selection
- dispatch(LFUN_MARK_OFF);
+ dispatch(FuncRequest(LFUN_MARK_OFF));
setMessage(N_("Cancel"));
break;
- case LFUN_META_FAKE: // RVDK_PATCH_5
- {
+ case LFUN_META_FAKE:
meta_fake_bit = key_modifier::alt;
setMessage(keyseq.print());
- }
- break;
+ break;
case LFUN_READ_ONLY_TOGGLE:
- if (owner->buffer()->lyxvc.inUse()) {
- owner->buffer()->lyxvc.toggleReadOnly();
- } else {
+ if (owner->buffer()->lyxvc().inUse())
+ owner->buffer()->lyxvc().toggleReadOnly();
+ else
owner->buffer()->setReadonly(
!owner->buffer()->isReadonly());
- }
break;
case LFUN_CENTER: // this is center and redraw.
string const str = bformat(_("Saving document %1$s..."),
MakeDisplayPath(owner->buffer()->fileName()));
owner->message(str);
- MenuWrite(view(), owner->buffer());
+ MenuWrite(owner->buffer());
owner->message(str + _(" done."));
} else
- WriteAs(view(), owner->buffer());
+ WriteAs(owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(view(), owner->buffer(), argument);
+ WriteAs(owner->buffer(), argument);
break;
case LFUN_MENURELOAD: {
case LFUN_UPDATE:
Exporter::Export(owner->buffer(), argument, true);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
break;
case LFUN_PREVIEW:
Exporter::Preview(owner->buffer(), argument);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
break;
case LFUN_BUILDPROG:
Exporter::Export(owner->buffer(), "program", true);
+ view()->showErrorList(_("Build"));
break;
case LFUN_RUNCHKTEX:
owner->buffer()->runChktex();
- break;
-
- case LFUN_MENUPRINT:
- owner->getDialogs().showPrint();
+ view()->showErrorList(_("ChkTeX"));
break;
case LFUN_EXPORT:
if (argument == "custom")
owner->getDialogs().showSendto();
- else
+ else {
Exporter::Export(owner->buffer(), argument, false);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
+ }
break;
case LFUN_IMPORT:
QuitLyX();
break;
- case LFUN_TOCVIEW:
- {
+ case LFUN_TOCVIEW: {
InsetCommandParams p("tableofcontents");
string const data = InsetCommandMailer::params2string("toc", p);
owner->getDialogs().show("toc", data, 0);
view()->redo();
break;
- case LFUN_MENUSEARCH:
- owner->getDialogs().showSearch();
- break;
-
- case LFUN_REMOVEERRORS:
- if (view()->removeAutoInsets()) {
-#warning repaint() or update() or nothing ?
- view()->repaint();
- view()->fitCursor();
- }
- break;
-
- case LFUN_DEPTH_MIN:
- changeDepth(view(), TEXT(false), DEC_DEPTH, false);
- owner->view_state_changed();
- break;
-
- case LFUN_DEPTH_PLUS:
- changeDepth(view(), TEXT(false), INC_DEPTH, false);
- owner->view_state_changed();
- break;
-
case LFUN_FREEFONT_APPLY:
apply_freefont(view());
break;
//#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
- case LFUN_HELP_ABOUTLYX:
- owner->getDialogs().show("about");
- break;
- case LFUN_HELP_TEXINFO:
- owner->getDialogs().showTexinfo();
- break;
-
- case LFUN_HELP_OPEN:
- {
+ case LFUN_HELP_OPEN: {
string const arg = argument;
if (arg.empty()) {
setErrorMessage(N_("Missing argument"));
}
owner->message(bformat(_("Opening help file %1$s..."),
MakeDisplayPath(fname)));
- view()->buffer(bufferlist.loadLyXFile(fname, false));
+ view()->loadLyXFile(fname, false);
break;
}
// --- version control -------------------------------
case LFUN_VC_REGISTER:
- {
- if (!owner->buffer()->lyxvc.inUse())
- owner->buffer()->lyxvc.registrer();
- }
- break;
+ if (!ensureBufferClean(view()))
+ break;
+ if (!owner->buffer()->lyxvc().inUse()) {
+ owner->buffer()->lyxvc().registrer();
+ view()->reload();
+ }
+ break;
case LFUN_VC_CHECKIN:
- {
- if (owner->buffer()->lyxvc.inUse()
- && !owner->buffer()->isReadonly())
- owner->buffer()->lyxvc.checkIn();
- }
- break;
+ if (!ensureBufferClean(view()))
+ break;
+ if (owner->buffer()->lyxvc().inUse()
+ && !owner->buffer()->isReadonly()) {
+ owner->buffer()->lyxvc().checkIn();
+ view()->reload();
+ }
+ break;
case LFUN_VC_CHECKOUT:
- {
- if (owner->buffer()->lyxvc.inUse()
- && owner->buffer()->isReadonly())
- owner->buffer()->lyxvc.checkOut();
- }
- break;
+ if (!ensureBufferClean(view()))
+ break;
+ if (owner->buffer()->lyxvc().inUse()
+ && owner->buffer()->isReadonly()) {
+ owner->buffer()->lyxvc().checkOut();
+ view()->reload();
+ }
+ break;
case LFUN_VC_REVERT:
- {
- owner->buffer()->lyxvc.revert();
- }
- break;
+ owner->buffer()->lyxvc().revert();
+ view()->reload();
+ break;
case LFUN_VC_UNDO:
- {
- owner->buffer()->lyxvc.undoLast();
- }
- break;
-
- case LFUN_VC_HISTORY:
- {
- owner->getDialogs().show("vclog");
+ owner->buffer()->lyxvc().undoLast();
+ view()->reload();
break;
- }
// --- buffers ----------------------------------------
break;
case LFUN_FILE_NEW:
- {
- // servercmd: argument must be <file>:<template>
- Buffer * tmpbuf = NewFile(argument);
- if (tmpbuf)
- view()->buffer(tmpbuf);
- }
- break;
+ NewFile(view(), argument);
+ break;
case LFUN_FILE_OPEN:
open(argument);
break;
- case LFUN_LATEX_LOG:
- owner->getDialogs().show("log");
- break;
-
- case LFUN_LAYOUT_DOCUMENT:
- owner->getDialogs().showDocument();
- break;
-
- case LFUN_LAYOUT_CHARACTER: {
- string data = freefont2string();
- if (!data.empty())
- owner->getDialogs().show("character", data);
- break;
- }
-
- case LFUN_LAYOUT_TABULAR:
- if (view()->theLockingInset()) {
- if (view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
- InsetTabular * inset = static_cast<InsetTabular *>
- (view()->theLockingInset());
- inset->openLayoutDialog(view());
- } else if (view()->theLockingInset()->
- getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
- InsetTabular * inset = static_cast<InsetTabular *>(
- view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
- inset->openLayoutDialog(view());
+ case LFUN_LAYOUT_TABULAR: {
+ UpdatableInset * tli = view()->theLockingInset();
+ if (tli) {
+ if (tli->lyxCode() == InsetOld::TABULAR_CODE) {
+ static_cast<InsetTabular *>(tli)->openLayoutDialog(view());
+ } else if (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)) {
+ static_cast<InsetTabular *>(
+ tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE))
+ ->openLayoutDialog(view());
+ }
}
- }
- break;
-
- case LFUN_LAYOUT_PREAMBLE:
- owner->getDialogs().showPreamble();
break;
+ }
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar().openLayoutList();
owner->getMenubar().openByName(argument);
break; // RVDK_PATCH_5
- case LFUN_SPELLCHECK:
- owner->getDialogs().showSpellchecker();
- break;
-
// --- lyxserver commands ----------------------------
break;
case LFUN_NOTIFY:
- {
dispatch_buffer = keyseq.print();
lyxserver->notifyClient(dispatch_buffer);
- }
- break;
+ break;
- case LFUN_GOTOFILEROW:
- {
+ case LFUN_GOTOFILEROW: {
string file_name;
int row;
- istringstream istr(argument.c_str());
- istr >> file_name >> row;
- // Must replace extension of the file to be .lyx and get full path
- string const s(ChangeExtension(file_name, ".lyx"));
-
- // Either change buffer or load the file
- if (bufferlist.exists(s)) {
- view()->buffer(bufferlist.getBuffer(s));
+ istringstream is(argument);
+ is >> file_name >> row;
+ if (prefixIs(file_name, getTmpDir())) {
+ // Needed by inverse dvi search. If it is a file
+ // in tmpdir, call the apropriated function
+ view()->buffer(bufferlist.getBufferFromTmp(file_name));
} else {
- view()->buffer(bufferlist.loadLyXFile(s));
+ // Must replace extension of the file to be .lyx
+ // and get full path
+ string const s = ChangeExtension(file_name, ".lyx");
+ // Either change buffer or load the file
+ if (bufferlist.exists(s)) {
+ view()->buffer(bufferlist.getBuffer(s));
+ } else {
+ view()->loadLyXFile(s);
+ }
}
view()->setCursorFromRow(row);
view()->center();
// see BufferView_pimpl::center()
view()->updateScrollbar();
+ break;
}
- break;
-
- case LFUN_GOTO_PARAGRAPH:
- {
- istringstream istr(argument.c_str());
+ case LFUN_GOTO_PARAGRAPH: {
+ istringstream is(argument);
int id;
- istr >> id;
+ is >> id;
ParIterator par = owner->buffer()->getParFromID(id);
if (par == owner->buffer()->par_iterator_end()) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
<< id << ']' << endl;
break;
} else {
- lyxerr[Debug::INFO] << "Paragraph " << (*par)->id()
+ lyxerr[Debug::INFO] << "Paragraph " << par->id()
<< " found." << endl;
}
if (view()->theLockingInset())
view()->unlockInset(view()->theLockingInset());
- if ((*par)->inInset()) {
+
+ LyXText * lt = view()->getLyXText();
+ if (par->inInset()) {
FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
- (*par)->inInset()->localDispatch(cmd);
+ par.inset()->dispatch(cmd);
+ lt = par->inInset()->getLyXText(view());
}
+
// Set the cursor
- view()->getLyXText()->setCursor(*par, 0);
+ lt->setCursor(par.pit(), 0);
view()->switchKeyMap();
owner->view_state_changed();
case LFUN_MATH_NUMBER:
case LFUN_MATH_NONUMBER:
case LFUN_MATH_LIMITS:
- {
setErrorMessage(N_("This is only allowed in math mode!"));
- }
- break;
+ break;
// passthrough hat and underscore outside mathed:
case LFUN_SUBSCRIPT:
dispatch(FuncRequest(view(), LFUN_SELFINSERT, "_"));
break;
+
case LFUN_SUPERSCRIPT:
dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
break;
- case LFUN_MATH_PANEL:
- owner->getDialogs().showMathPanel();
+ case LFUN_DIALOG_SHOW: {
+ string const name = func.getArg(0);
+ string data = trim(func.argument.substr(name.size()));
+
+ if (name == "character") {
+ data = freefont2string();
+ if (!data.empty())
+ owner->getDialogs().show("character", data);
+ } else if (name == "document")
+ owner->getDialogs().showDocument();
+ else if (name == "findreplace")
+ owner->getDialogs().showSearch();
+ else if (name == "forks")
+ owner->getDialogs().showForks();
+ else if (name == "preamble")
+ owner->getDialogs().showPreamble();
+ else if (name == "preferences")
+ owner->getDialogs().showPreferences();
+ else if (name == "print")
+ owner->getDialogs().showPrint();
+ else if (name == "spellchecker")
+ owner->getDialogs().showSpellchecker();
+ else
+ owner->getDialogs().show(name, data);
break;
+ }
case LFUN_DIALOG_SHOW_NEW_INSET: {
string const & name = argument;
data = InsetCommandMailer::params2string(name, p);
}
owner->getDialogs().show(name, data, 0);
+ break;
}
- break;
- case LFUN_DIALOG_SHOW_NEXT_INSET: {
+ case LFUN_DIALOG_SHOW_NEXT_INSET:
+ break;
+
+ case LFUN_INSET_DIALOG_SHOW: {
+ InsetOld * inset = view()->getLyXText()->getInset();
+ if (inset)
+ inset->dispatch(FuncRequest(view(), LFUN_INSET_DIALOG_SHOW));
+ break;
}
- break;
case LFUN_DIALOG_UPDATE: {
string const & name = argument;
InsetBase * inset = owner->getDialogs().getOpenInset(name);
if (inset) {
FuncRequest fr(view(), LFUN_INSET_DIALOG_UPDATE,
- ev.argument);
- inset->localDispatch(fr);
+ func.argument);
+ inset->dispatch(fr);
} else if (name == "paragraph") {
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
+ break;
}
- break;
case LFUN_DIALOG_HIDE:
Dialogs::hide(argument, 0);
owner->getDialogs().disconnect(argument);
break;
- case LFUN_CHILDOPEN:
- {
+ case LFUN_CHILDOPEN: {
string const filename =
- MakeAbsPath(argument,
- owner->buffer()->filePath());
+ MakeAbsPath(argument, owner->buffer()->filePath());
setMessage(N_("Opening child document ") +
MakeDisplayPath(filename) + "...");
view()->savePosition(0);
if (bufferlist.exists(filename))
view()->buffer(bufferlist.getBuffer(filename));
else
- view()->buffer(bufferlist.loadLyXFile(filename));
+ view()->loadLyXFile(filename);
+ break;
}
- break;
case LFUN_TOGGLECURSORFOLLOW:
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
owner->getIntl().ToggleKeyMap();
break;
+ case LFUN_REPEAT: {
+ // repeat command
+ string countstr;
+ argument = split(argument, countstr, ' ');
+ istringstream is(countstr);
+ int count = 0;
+ is >> count;
+ lyxerr << "repeat: count: " << count << " cmd: " << argument << endl;
+ for (int i = 0; i < count; ++i)
+ dispatch(lyxaction.lookupFunc(argument));
+ break;
+ }
+
case LFUN_SEQUENCE:
- {
// argument contains ';'-terminated commands
while (!argument.empty()) {
string first;
argument = split(argument, first, ';');
- dispatch(first);
+ dispatch(lyxaction.lookupFunc(first));
}
- }
- break;
-
- case LFUN_DIALOG_PREFERENCES:
- owner->getDialogs().showPreferences();
break;
- case LFUN_SAVEPREFERENCES:
- {
- Path p(user_lyxdir);
+ case LFUN_SAVEPREFERENCES: {
+ Path p(user_lyxdir());
lyxrc.write("preferences");
+ break;
}
- break;
case LFUN_SCREEN_FONT_UPDATE:
- {
// handle the screen font changes.
lyxrc.set_font_norm_type();
lyx_gui::update_fonts();
- // We also need to empty the textcache so that
- // the buffer will be formatted correctly after
- // a zoom change.
- textcache.clear();
- // Of course we should only do the resize and the textcache.clear
- // if values really changed...but not very important right now. (Lgb)
// All visible buffers will need resize
view()->resize();
- view()->repaint();
- }
- break;
+ view()->update();
+ break;
- case LFUN_SET_COLOR:
- {
+ case LFUN_SET_COLOR: {
string lyx_name;
string const x11_name = split(argument, lyx_name, ' ');
if (lyx_name.empty() || x11_name.empty()) {
setErrorMessage(N_("Syntax: set-color <lyx_name>"
" <x11_name>"));
break;
- }
+ }
bool const graphicsbg_changed =
(lyx_name == lcolor.getLyXName(LColor::graphicsbg) &&
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
- grfx::GCache & gc = grfx::GCache::get();
- gc.changeDisplay(true);
+ lyx::graphics::GCache::get().changeDisplay(true);
#endif
}
- view()->repaint();
+ view()->update();
break;
}
owner->message(argument);
break;
- case LFUN_FORKS_SHOW:
- owner->getDialogs().showForks();
- break;
-
case LFUN_FORKS_KILL:
- {
- if (!isStrInt(argument))
- break;
-
- pid_t const pid = strToInt(argument);
- ForkedcallsController & fcc = ForkedcallsController::get();
- fcc.kill(pid);
+ if (isStrInt(argument)) {
+ pid_t const pid = strToInt(argument);
+ ForkedcallsController & fcc = ForkedcallsController::get();
+ fcc.kill(pid);
+ }
break;
- }
case LFUN_TOOLTIPS_TOGGLE:
owner->getDialogs().toggleTooltips();
break;
+ case LFUN_EXTERNAL_EDIT:
+ InsetExternal().dispatch(FuncRequest(view(), action, argument));
+ break;
+
default:
// Then if it was none of the above
// Trying the BufferView::pimpl dispatch:
- if (!view()->dispatch(ev))
+ if (!view()->dispatch(func))
lyxerr << "A truly unknown func ["
- << lyxaction.getActionName(ev.action) << "]!"
+ << lyxaction.getActionName(func.action) << "]!"
<< endl;
break;
} // end of switch
view()->owner()->updateLayoutChoice();
if (view()->available()) {
- view()->fitCursor();
+ if (view()->fitCursor()) {
+ //lyxerr << "LyXFunc->fitCursor->update" << endl;
+ view()->update();
+ }
// If we executed a mutating lfun, mark the buffer as dirty
- if (!lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
- && !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
+ if (!getStatus(func).disabled()
+ && !lyxaction.funcHasFlag(func.action, LyXAction::NoBuffer)
+ && !lyxaction.funcHasFlag(func.action, LyXAction::ReadOnly))
view()->buffer()->markDirty();
}
- sendDispatchMessage(getMessage(), ev, verbose);
+ sendDispatchMessage(getMessage(), func, verbose);
}
-void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & ev, bool verbose)
+void LyXFunc::sendDispatchMessage(string const & msg,
+ FuncRequest const & func, bool verbose)
{
owner->updateMenubar();
owner->updateToolbar();
- if (ev.action == LFUN_SELFINSERT || !verbose) {
+ if (func.action == LFUN_SELFINSERT || !verbose) {
lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl;
if (!msg.empty())
owner->message(msg);
if (!dispatch_msg.empty())
dispatch_msg += ' ';
- string comname = lyxaction.getActionName(ev.action);
+ string comname = lyxaction.getActionName(func.action);
- int pseudoaction = ev.action;
bool argsadded = false;
- if (!ev.argument.empty()) {
- // the pseudoaction is useful for the bindings
- pseudoaction = lyxaction.searchActionArg(ev.action, ev.argument);
-
- if (pseudoaction == LFUN_UNKNOWN_ACTION) {
- pseudoaction = ev.action;
- } else {
- comname += ' ' + ev.argument;
+ if (!func.argument.empty()) {
+ if (func.action != LFUN_UNKNOWN_ACTION) {
+ comname += ' ' + func.argument;
argsadded = true;
}
}
- string const shortcuts = toplevel_keymap->findbinding(pseudoaction);
+ string const shortcuts = toplevel_keymap->findbinding(func);
if (!shortcuts.empty()) {
comname += ": " + shortcuts;
- } else if (!argsadded && !ev.argument.empty()) {
- comname += ' ' + ev.argument;
+ } else if (!argsadded && !func.argument.empty()) {
+ comname += ' ' + func.argument;
}
if (!comname.empty()) {
templname = fname;
}
- view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
+ view()->newFile(filename, templname, !name.empty());
}
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
FileDialog::Result result =
fileDlg.open(initpath,
FileInfo const f(filename, true);
if (!f.exist()) {
// the user specifically chose this name. Believe them.
- Buffer * buffer = bufferlist.newFile(filename, "", true);
- view()->buffer(buffer);
+ view()->newFile(filename, "", true);
return;
}
owner->message(bformat(_("Opening document %1$s..."), disp_fn));
- Buffer * openbuf = bufferlist.loadLyXFile(filename);
string str2;
- if (openbuf) {
- view()->buffer(openbuf);
+ if (view()->loadLyXFile(filename)) {
str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
str2 = bformat(_("Could not open document %1$s"), disp_fn);
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
{
if (bufferlist.close(owner->buffer(), true) && !quitting) {
if (bufferlist.empty()) {
- // need this otherwise SEGV may occur while trying to
- // set variables that don't exist
+ // need this otherwise SEGV may occur while
+ // trying to set variables that don't exist
// since there's no current buffer
owner->getDialogs().hideBufferDependent();
} else {
BufferView * LyXFunc::view() const
{
- lyx::Assert(owner);
+ BOOST_ASSERT(owner);
return owner->view().get();
}
+
+
+bool LyXFunc::wasMetaKey() const
+{
+ return (meta_fake_bit != key_modifier::none);
+}
projects / lyx.git / blobdiff