#include <config.h>
#include "lyxfunc.h"
-#include "kbmap.h"
-#include "bufferlist.h"
+
+#include "BranchList.h"
#include "buffer.h"
#include "buffer_funcs.h"
+#include "bufferlist.h"
+#include "bufferparams.h"
#include "BufferView.h"
-#include "funcrequest.h"
-#include "iterators.h"
-#include "lyxserver.h"
-#include "intl.h"
-#include "lyx_cb.h"
-#include "LyXAction.h"
+#include "cursor.h"
#include "debug.h"
-#include "gettext.h"
-#include "Lsstream.h"
+#include "dispatchresult.h"
#include "encoding.h"
-#include "frontends/LyXView.h"
-#include "frontends/lyx_gui.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/insetbox.h"
+#include "insets/insetbranch.h"
#include "insets/insetcommand.h"
+#include "insets/insetert.h"
#include "insets/insetexternal.h"
+#include "insets/insetfloat.h"
+#include "insets/insetgraphics.h"
+#include "insets/insetnote.h"
#include "insets/insettabular.h"
+#include "insets/insetvspace.h"
+#include "insets/insetwrap.h"
#include "mathed/math_cursor.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 "frontends/Toolbar.h"
-#include "support/LAssert.h"
-#include "support/filetools.h"
#include "support/FileInfo.h"
+#include "support/filetools.h"
#include "support/forkedcontr.h"
-#include "support/tostr.h"
#include "support/path.h"
#include "support/path_defines.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
+#include "support/os.h"
+
+using bv_funcs::changeDepth;
+using bv_funcs::currentState;
+using bv_funcs::DEC_DEPTH;
+using bv_funcs::freefont2string;
+using bv_funcs::INC_DEPTH;
+
+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 namespace lyx::support;
-
-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::pair;
+using std::string;
+using std::istringstream;
+
extern BufferList bufferlist;
extern LyXServer * lyxserver;
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
-extern void ShowLatexLog();
-
-LyXFunc::LyXFunc(LyXView * o)
- : owner(o),
+LyXFunc::LyXFunc(LyXView * lv)
+ : owner(lv),
encoded_last_key(0),
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get()),
}
-void LyXFunc::moveCursorUpdate()
-{
- LyXText * lt = view()->text;
- if (lt->selection.mark())
- lt->setSelection();
- view()->update();
- view()->switchKeyMap();
-}
-
-
void LyXFunc::handleKeyFunc(kb_action action)
{
char c = encoded_last_key;
// 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;
}
}
- UpdatableInset * tli = view()->theLockingInset();
+ UpdatableInset * tli = view()->cursor().innerInset();
+ InsetTabular * tab = view()->cursor().innerInsetTabular();
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
&& !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() != InsetOld::TABULAR_CODE) {
- in = tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE);
- }
- if (in && static_cast<InsetTabular*>(in)->hasSelection()) {
- disable = false;
- break;
- }
- }
- disable = !mathcursor && !view()->getLyXText()->selection.set();
+ if (tab && tab->hasSelection())
+ disable = false;
+ else
+ disable = !mathcursor && !view()->getLyXText()->selection.set();
break;
+
case LFUN_RUNCHKTEX:
disable = !buf->isLatex() || lyxrc.chktex_command == "none";
break;
+
case LFUN_BUILDPROG:
disable = !Exporter::IsExportable(*buf, "program");
break;
case LFUN_LAYOUT_TABULAR:
- disable = !tli
- || (tli->lyxCode() != InsetOld::TABULAR_CODE
- && !tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
+ disable = !view()->cursor().innerInsetTabular();
break;
case LFUN_DEPTH_MIN:
- disable = !changeDepth(view(), view()->getLyXText(), DEC_DEPTH, true);
+ disable = !changeDepthAllowed(view(), view()->getLyXText(), DEC_DEPTH);
break;
case LFUN_DEPTH_PLUS:
- disable = !changeDepth(view(), view()->getLyXText(), INC_DEPTH, true);
+ disable = !changeDepthAllowed(view(), view()->getLyXText(), INC_DEPTH);
break;
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH: {
- InsetOld * inset = view()->getLyXText()->cursor.par()->inInset();
+ InsetOld * inset = view()->getLyXText()->cursorPar()->inInset();
disable = inset && inset->forceDefaultParagraphs(inset);
break;
}
case LFUN_INSET_OPTARG:
- disable = (view()->getLyXText()->cursor.par()->layout()->optionalargs == 0);
+ disable = (view()->getLyXText()->cursorPar()->layout()->optionalargs == 0);
break;
case LFUN_TABULAR_FEATURE:
- if (mathcursor) {
#if 0
+ if (mathcursor) {
// FIXME: check temporarily disabled
// valign code
char align = mathcursor->valign();
break;
}
flag.setOnOff(ev.argument[0] == align);
- } else
+ } else {
disable = true;
char align = mathcursor->halign();
break;
}
flag.setOnOff(ev.argument[0] == align);
-#endif
disable = !mathcursor->halign();
break;
if (tli) {
FuncStatus ret;
//ret.disabled(true);
- if (tli->lyxCode() == InsetOld::TABULAR_CODE) {
- ret = static_cast<InsetTabular *>(tli)
- ->getStatus(ev.argument);
- flag |= ret;
- disable = false;
- } else if (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)) {
- ret = static_cast<InsetTabular *>
- (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE))
- ->getStatus(ev.argument);
+ InsetTabular * tab = view()->cursor().innerInsetTabular();
+ if (tab) {
+ ret = tab->getStatus(ev.argument);
flag |= ret;
disable = false;
} else {
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);
}
+#endif
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:
- 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;
- break;
- case LFUN_INSET_TOGGLE: {
- LyXText * lt = view()->getLyXText();
- disable = !(isEditableInset(lt->getInset())
- || (lt->inset_owner
- && lt->inset_owner->owner()
- && lt->inset_owner->owner()->isOpen()));
+ disable = !buf->params().tracking_changes;
break;
- }
case LFUN_INSET_SETTINGS: {
disable = true;
- UpdatableInset * inset = view()->theLockingInset();
+ UpdatableInset * inset = view()->cursor().innerInset();
if (!inset)
break;
- // get the innermost inset
- inset = inset->getLockingInset();
-
// jump back to owner if an InsetText, so
// we get back to the InsetTabular or whatever
if (inset->lyxCode() == InsetOld::TEXT_CODE)
case InsetOld::FLOAT_CODE:
disable = ev.argument != "float";
break;
- case InsetOld::MINIPAGE_CODE:
- disable = ev.argument != "minipage";
- break;
case InsetOld::WRAP_CODE:
disable = ev.argument != "wrap";
break;
case InsetOld::BRANCH_CODE:
disable = ev.argument != "branch";
break;
+ case InsetOld::BOX_CODE:
+ disable = ev.argument != "box";
+ break;
default:
break;
}
disable = !Exporter::IsExportable(*buf, "dvi") ||
lyxrc.print_command == "none";
} else if (name == "character") {
- UpdatableInset * tli = view()->theLockingInset();
+ UpdatableInset * tli = view()->cursor().innerInset();
disable = tli && tli->lyxCode() == InsetOld::ERT_CODE;
} else if (name == "vclog") {
- disable = !buf->lyxvc.inUse();
+ disable = !buf->lyxvc().inUse();
} else if (name == "latexlog") {
disable = !IsFileReadable(buf->getLogName().second);
}
code = InsetOld::BIBITEM_CODE;
else if (ev.argument == "bibtex")
code = InsetOld::BIBTEX_CODE;
+ else if (ev.argument == "box")
+ code = InsetOld::BOX_CODE;
+ else if (ev.argument == "branch")
+ code = InsetOld::BRANCH_CODE;
else if (ev.argument == "citation")
code = InsetOld::CITE_CODE;
else if (ev.argument == "ert")
code = InsetOld::INDEX_CODE;
else if (ev.argument == "label")
code = InsetOld::LABEL_CODE;
- else if (ev.argument == "minipage")
- code = InsetOld::MINIPAGE_CODE;
+ else if (ev.argument == "note")
+ code = InsetOld::NOTE_CODE;
else if (ev.argument == "ref")
code = InsetOld::REF_CODE;
else if (ev.argument == "toc")
code = InsetOld::TOC_CODE;
else if (ev.argument == "url")
code = InsetOld::URL_CODE;
+ else if (ev.argument == "vspace")
+ code = InsetOld::VSPACE_CODE;
else if (ev.argument == "wrap")
code = InsetOld::WRAP_CODE;
break;
case LFUN_INSET_MARGINAL:
code = InsetOld::MARGIN_CODE;
break;
- case LFUN_INSET_MINIPAGE:
- code = InsetOld::MINIPAGE_CODE;
- break;
case LFUN_INSET_FLOAT:
case LFUN_INSET_WIDE_FLOAT:
code = InsetOld::FLOAT_CODE;
case LFUN_INSERT_NOTE:
code = InsetOld::NOTE_CODE;
break;
+ case LFUN_INSERT_CHARSTYLE:
+ code = InsetOld::CHARSTYLE_CODE;
+ if (buf->params().getLyXTextClass().charstyles().empty())
+ disable = true;
+ break;
+ case LFUN_INSERT_BOX:
+ code = InsetOld::BOX_CODE;
+ break;
case LFUN_INSERT_BRANCH:
code = InsetOld::BRANCH_CODE;
- if (buf->params.branchlist.empty())
+ if (buf->params().branchlist().empty())
disable = true;
break;
case LFUN_INSERT_LABEL:
code = InsetOld::OPTARG_CODE;
break;
case LFUN_ENVIRONMENT_INSERT:
- code = InsetOld::MINIPAGE_CODE;
+ code = InsetOld::BOX_CODE;
break;
case LFUN_INDEX_INSERT:
code = InsetOld::INDEX_CODE;
code = InsetOld::SPACE_CODE;
break;
case LFUN_INSET_DIALOG_SHOW: {
- LyXText * lt = view()->getLyXText();
- InsetOld * inset = lt->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;
- }
+ 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;
}
flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
- flag.setOnOff(view()->getLyXText()->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;
}
+#ifdef LOCK
// the font related toggles
if (!mathcursor) {
LyXFont const & font = view()->getLyXText()->real_current_font;
break;
}
}
+#endif
// this one is difficult to get right. As a half-baked
// 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 {
- bool ensureBufferClean(BufferView * bv) {
-
- 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: cmd: " << func << endl;
+ lyxerr << "LyXFunc::dispatch: cmd: " << func << 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"
<< endl;
setErrorMessage(getStatusMessage());
- goto exit_with_message;
- }
-
- if (view()->available())
- view()->hideCursor();
-
- if (view()->available() && view()->theLockingInset()) {
- InsetOld::RESULT result;
- if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
- !keyseq.deleted()))
- {
- UpdatableInset * inset = view()->theLockingInset();
-#if 1
- int inset_x;
- int dummy_y;
- inset->getCursorPos(view(), inset_x, dummy_y);
-#endif
- 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(ev);
- 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) {
- 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))
- goto exit_with_message;
- // If UNDISPATCHED, just soldier on
- else if (result == 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) {
- view()->text->cursorRight(view());
- moveCursorUpdate();
- owner->clearMessage();
- goto exit_with_message;
- } else if (result == FINISHED_UP) {
- RowList::iterator const irow = view()->text->cursorIRow();
- if (irow != view()->text->firstRow()) {
-#if 1
- view()->text->setCursorFromCoordinates(
- view()->text->cursor.x() + inset_x,
- view()->text->cursor.y() -
- irow->baseline() - 1);
- view()->text->cursor.x_fix(view()->text->cursor.x());
-#else
- view()->text->cursorUp(view());
-#endif
- moveCursorUpdate();
- } else {
- view()->update();
- }
- owner->clearMessage();
- goto exit_with_message;
- } else if (result == FINISHED_DOWN) {
- RowList::iterator const irow = view()->text->cursorIRow();
- if (irow != view()->text->lastRow()) {
-#if 1
- view()->text->setCursorFromCoordinates(
- view()->text->cursor.x() + inset_x,
- view()->text->cursor.y() -
- irow->baseline() +
- irow->height() + 1);
- view()->text->cursor.x_fix(view()->text->cursor.x());
-#else
- view()->text->cursorDown(view());
-#endif
- } else {
- view()->text->cursorRight(view());
- }
- 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:
- view()->text->cursorRight(view());
- view()->switchKeyMap();
- owner->view_state_changed();
- break;
- case LFUN_RIGHT:
- if (!view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- view()->text->cursorRight(view());
- moveCursorUpdate();
- owner->view_state_changed();
- }
- goto exit_with_message;
- case LFUN_LEFT:
- if (view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- view()->text->cursorRight(view());
- moveCursorUpdate();
- owner->view_state_changed();
- }
- goto exit_with_message;
- case LFUN_DOWN:
- if (view()->text->cursorRow() != view()->text->lastRow())
- view()->text->cursorDown(view());
- else
- view()->text->cursorRight(view());
- moveCursorUpdate();
- owner->view_state_changed();
- goto exit_with_message;
- default:
- break;
- }
- }
- }
- }
+ } else {
- switch (action) {
+ if (view()->available())
+ view()->hideCursor();
- case LFUN_ESCAPE: {
- if (!view()->available())
- break;
- // this function should be used always [asierra060396]
- UpdatableInset * tli = view()->theLockingInset();
- if (tli) {
- UpdatableInset * lock = tli->getLockingInset();
+ switch (action) {
- if (tli == lock) {
- view()->unlockInset(tli);
- view()->text->cursorRight(view());
- moveCursorUpdate();
- owner->view_state_changed();
- } else {
- tli->unlockInsetInInset(view(), lock, true);
- }
- finishUndo();
+ case LFUN_ESCAPE: {
+ if (!view()->available())
+ break;
+ view()->cursor().pop();
// Tell the paragraph dialog that we changed paragraph
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+ break;
}
- break;
- }
- case LFUN_WORDFINDFORWARD:
- case LFUN_WORDFINDBACKWARD: {
- static string last_search;
- string searched_string;
+ case LFUN_WORDFINDFORWARD:
+ case LFUN_WORDFINDBACKWARD: {
+ static string last_search;
+ string searched_string;
- if (!argument.empty()) {
- last_search = argument;
- searched_string = argument;
- } else {
- searched_string = last_search;
+ if (!argument.empty()) {
+ last_search = argument;
+ searched_string = argument;
+ } else {
+ searched_string = last_search;
+ }
+ bool fw = (action == LFUN_WORDFINDFORWARD);
+ if (!searched_string.empty())
+ lyx::find::find(view(), searched_string,
+ true, false, fw);
+ break;
}
- bool fw = (action == LFUN_WORDFINDFORWARD);
- if (!searched_string.empty())
- lyx::find::find(view(), searched_string, fw);
- break;
- }
- case LFUN_PREFIX:
- if (view()->available() && !view()->theLockingInset())
- view()->update();
- owner->message(keyseq.printOptions());
- break;
+ case LFUN_PREFIX:
+ owner->message(keyseq.printOptions());
+ break;
- // --- Misc -------------------------------------------
- case LFUN_EXEC_COMMAND:
- owner->focus_command_buffer();
- break;
+ case LFUN_EXEC_COMMAND:
+ owner->focus_command_buffer();
+ break;
- case LFUN_CANCEL:
- keyseq.reset();
- meta_fake_bit = key_modifier::none;
- if (view()->available())
- // cancel any selection
- dispatch(LFUN_MARK_OFF);
- setMessage(N_("Cancel"));
- break;
+ case LFUN_CANCEL:
+ keyseq.reset();
+ meta_fake_bit = key_modifier::none;
+ if (view()->available())
+ // cancel any selection
+ dispatch(FuncRequest(LFUN_MARK_OFF));
+ setMessage(N_("Cancel"));
+ break;
- case LFUN_META_FAKE:
- meta_fake_bit = key_modifier::alt;
- setMessage(keyseq.print());
- break;
+ case LFUN_META_FAKE:
+ meta_fake_bit = key_modifier::alt;
+ setMessage(keyseq.print());
+ break;
- case LFUN_READ_ONLY_TOGGLE:
- if (owner->buffer()->lyxvc.inUse())
- owner->buffer()->lyxvc.toggleReadOnly();
- else
- owner->buffer()->setReadonly(
- !owner->buffer()->isReadonly());
- break;
+ case LFUN_READ_ONLY_TOGGLE:
+ 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.
- view()->center();
- break;
+ case LFUN_CENTER: // this is center and redraw.
+ view()->center();
+ break;
// --- Menus -----------------------------------------------
- case LFUN_MENUNEW:
- menuNew(argument, false);
- break;
-
- case LFUN_MENUNEWTMPLT:
- menuNew(argument, true);
- break;
-
- case LFUN_CLOSEBUFFER:
- closeBuffer();
- break;
-
- case LFUN_MENUWRITE:
- if (!owner->buffer()->isUnnamed()) {
- string const str = bformat(_("Saving document %1$s..."),
- MakeDisplayPath(owner->buffer()->fileName()));
- owner->message(str);
- MenuWrite(owner->buffer());
- owner->message(str + _(" done."));
- } else
- WriteAs(owner->buffer());
- break;
-
- case LFUN_WRITEAS:
- WriteAs(owner->buffer(), argument);
- break;
-
- case LFUN_MENURELOAD: {
- string const file = MakeDisplayPath(view()->buffer()->fileName(), 20);
- string text = bformat(_("Any changes will be lost. Are you sure "
- "you want to revert to the saved version of the document %1$s?"), file);
- int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 0, 1, _("&Revert"), _("&Cancel"));
+ case LFUN_MENUNEW:
+ menuNew(argument, false);
+ break;
- if (ret == 0)
- view()->reload();
- break;
- }
+ case LFUN_MENUNEWTMPLT:
+ menuNew(argument, true);
+ break;
- case LFUN_UPDATE:
- Exporter::Export(owner->buffer(), argument, true);
- view()->showErrorList(BufferFormat(*owner->buffer()));
- break;
+ case LFUN_CLOSEBUFFER:
+ closeBuffer();
+ break;
- case LFUN_PREVIEW:
- Exporter::Preview(owner->buffer(), argument);
- view()->showErrorList(BufferFormat(*owner->buffer()));
- break;
+ case LFUN_MENUWRITE:
+ if (!owner->buffer()->isUnnamed()) {
+ string const str = bformat(_("Saving document %1$s..."),
+ MakeDisplayPath(owner->buffer()->fileName()));
+ owner->message(str);
+ MenuWrite(owner->buffer());
+ owner->message(str + _(" done."));
+ } else
+ WriteAs(owner->buffer());
+ break;
- case LFUN_BUILDPROG:
- Exporter::Export(owner->buffer(), "program", true);
- view()->showErrorList(_("Build"));
- break;
+ case LFUN_WRITEAS:
+ WriteAs(owner->buffer(), argument);
+ break;
- case LFUN_RUNCHKTEX:
- owner->buffer()->runChktex();
- view()->showErrorList(_("ChkTeX"));
- break;
+ case LFUN_MENURELOAD: {
+ string const file = MakeDisplayPath(view()->buffer()->fileName(), 20);
+ string text = bformat(_("Any changes will be lost. Are you sure "
+ "you want to revert to the saved version of the document %1$s?"), file);
+ int const ret = Alert::prompt(_("Revert to saved document?"),
+ text, 0, 1, _("&Revert"), _("&Cancel"));
- case LFUN_EXPORT:
- if (argument == "custom")
- owner->getDialogs().showSendto();
- else {
- Exporter::Export(owner->buffer(), argument, false);
- view()->showErrorList(BufferFormat(*owner->buffer()));
+ if (ret == 0)
+ view()->reload();
+ break;
}
- break;
- case LFUN_IMPORT:
- doImport(argument);
- break;
+ case LFUN_UPDATE:
+ Exporter::Export(owner->buffer(), argument, true);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
+ break;
- case LFUN_QUIT:
- QuitLyX();
- break;
+ case LFUN_PREVIEW:
+ Exporter::Preview(owner->buffer(), argument);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
+ break;
- case LFUN_TOCVIEW:
- {
- InsetCommandParams p("tableofcontents");
- string const data = InsetCommandMailer::params2string("toc", p);
- owner->getDialogs().show("toc", data, 0);
- break;
- }
+ case LFUN_BUILDPROG:
+ Exporter::Export(owner->buffer(), "program", true);
+ view()->showErrorList(_("Build"));
+ break;
- case LFUN_AUTOSAVE:
- AutoSave(view());
- break;
+ case LFUN_RUNCHKTEX:
+ owner->buffer()->runChktex();
+ view()->showErrorList(_("ChkTeX"));
+ break;
- case LFUN_UNDO:
- view()->undo();
- break;
+ case LFUN_EXPORT:
+ if (argument == "custom")
+ owner->getDialogs().showSendto();
+ else {
+ Exporter::Export(owner->buffer(), argument, false);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
+ }
+ break;
- case LFUN_REDO:
- view()->redo();
- break;
+ case LFUN_IMPORT:
+ doImport(argument);
+ break;
- case LFUN_DEPTH_MIN:
- changeDepth(view(), view()->getLyXText(), DEC_DEPTH, false);
- owner->view_state_changed();
- break;
+ case LFUN_QUIT:
+ QuitLyX();
+ break;
- case LFUN_DEPTH_PLUS:
- changeDepth(view(), view()->getLyXText(), INC_DEPTH, false);
- owner->view_state_changed();
- break;
+ case LFUN_TOCVIEW: {
+ InsetCommandParams p("tableofcontents");
+ string const data = InsetCommandMailer::params2string("toc", p);
+ owner->getDialogs().show("toc", data, 0);
+ break;
+ }
- case LFUN_FREEFONT_APPLY:
- apply_freefont(view());
- break;
+ case LFUN_AUTOSAVE:
+ AutoSave(view());
+ break;
- case LFUN_FREEFONT_UPDATE:
- update_and_apply_freefont(view(), argument);
- break;
+ case LFUN_UNDO:
+ view()->undo();
+ break;
- case LFUN_RECONFIGURE:
- Reconfigure(view());
- break;
+ case LFUN_REDO:
+ view()->redo();
+ break;
-#if 0
- case LFUN_FLOATSOPERATE:
- if (argument == "openfoot")
- view()->allFloats(1,0);
- else if (argument == "closefoot")
- view()->allFloats(0,0);
- else if (argument == "openfig")
- view()->allFloats(1,1);
- else if (argument == "closefig")
- view()->allFloats(0,1);
- break;
-#else
-#ifdef WITH_WARNINGS
-//#warning Find another implementation here (or another lyxfunc)!
-#endif
-#endif
- case LFUN_HELP_OPEN:
- {
- string const arg = argument;
- if (arg.empty()) {
- setErrorMessage(N_("Missing argument"));
+ case LFUN_RECONFIGURE:
+ Reconfigure(view());
break;
- }
- string const fname = i18nLibFileSearch("doc", arg, "lyx");
- if (fname.empty()) {
- lyxerr << "LyX: unable to find documentation file `"
- << arg << "'. Bad installation?" << endl;
+
+ case LFUN_HELP_OPEN: {
+ string const arg = argument;
+ if (arg.empty()) {
+ setErrorMessage(N_("Missing argument"));
+ break;
+ }
+ string const fname = i18nLibFileSearch("doc", arg, "lyx");
+ if (fname.empty()) {
+ lyxerr << "LyX: unable to find documentation file `"
+ << arg << "'. Bad installation?" << endl;
+ break;
+ }
+ owner->message(bformat(_("Opening help file %1$s..."),
+ MakeDisplayPath(fname)));
+ view()->loadLyXFile(fname, false);
break;
}
- owner->message(bformat(_("Opening help file %1$s..."),
- MakeDisplayPath(fname)));
- view()->loadLyXFile(fname, false);
- break;
- }
// --- version control -------------------------------
- case LFUN_VC_REGISTER:
- {
- if (!ensureBufferClean(view()))
+ case LFUN_VC_REGISTER:
+ if (!ensureBufferClean(view()))
+ break;
+ if (!owner->buffer()->lyxvc().inUse()) {
+ owner->buffer()->lyxvc().registrer();
+ view()->reload();
+ }
break;
- if (!owner->buffer()->lyxvc.inUse()) {
- owner->buffer()->lyxvc.registrer();
- view()->reload();
- }
- }
- break;
- case LFUN_VC_CHECKIN:
- {
- if (!ensureBufferClean(view()))
+ case LFUN_VC_CHECKIN:
+ if (!ensureBufferClean(view()))
+ break;
+ if (owner->buffer()->lyxvc().inUse()
+ && !owner->buffer()->isReadonly()) {
+ owner->buffer()->lyxvc().checkIn();
+ view()->reload();
+ }
break;
- if (owner->buffer()->lyxvc.inUse()
- && !owner->buffer()->isReadonly()) {
- owner->buffer()->lyxvc.checkIn();
- view()->reload();
- }
- }
- break;
- case LFUN_VC_CHECKOUT:
- {
- if (!ensureBufferClean(view()))
+ case LFUN_VC_CHECKOUT:
+ if (!ensureBufferClean(view()))
+ break;
+ if (owner->buffer()->lyxvc().inUse()
+ && owner->buffer()->isReadonly()) {
+ owner->buffer()->lyxvc().checkOut();
+ view()->reload();
+ }
break;
- if (owner->buffer()->lyxvc.inUse()
- && owner->buffer()->isReadonly()) {
- owner->buffer()->lyxvc.checkOut();
- view()->reload();
- }
- }
- break;
- case LFUN_VC_REVERT:
- {
- owner->buffer()->lyxvc.revert();
- view()->reload();
- }
- break;
+ case LFUN_VC_REVERT:
+ owner->buffer()->lyxvc().revert();
+ view()->reload();
+ break;
- case LFUN_VC_UNDO:
- {
- owner->buffer()->lyxvc.undoLast();
- view()->reload();
- }
- break;
+ case LFUN_VC_UNDO:
+ owner->buffer()->lyxvc().undoLast();
+ view()->reload();
+ break;
- // --- buffers ----------------------------------------
+ // --- buffers ----------------------------------------
+ case LFUN_SWITCHBUFFER:
+ view()->buffer(bufferlist.getBuffer(argument));
+ break;
- case LFUN_SWITCHBUFFER:
- view()->buffer(bufferlist.getBuffer(argument));
- break;
+ case LFUN_FILE_NEW:
+ NewFile(view(), argument);
+ break;
- case LFUN_FILE_NEW:
- NewFile(view(), argument);
- break;
+ case LFUN_FILE_OPEN:
+ open(argument);
+ break;
- case LFUN_FILE_OPEN:
- open(argument);
- break;
+ case LFUN_LAYOUT_TABULAR:
+ if (InsetTabular * tab = view()->cursor().innerInsetTabular())
+ tab->openLayoutDialog(view());
+ break;
- case LFUN_LAYOUT_TABULAR:
- if (view()->theLockingInset()) {
- if (view()->theLockingInset()->lyxCode()== InsetOld::TABULAR_CODE) {
- InsetTabular * inset = static_cast<InsetTabular *>
- (view()->theLockingInset());
- inset->openLayoutDialog(view());
- } else if (view()->theLockingInset()->
- getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)!=0) {
- InsetTabular * inset = static_cast<InsetTabular *>(
- view()->theLockingInset()->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
- inset->openLayoutDialog(view());
- }
- }
- break;
+ case LFUN_DROP_LAYOUTS_CHOICE:
+ owner->getToolbar().openLayoutList();
+ break;
- case LFUN_DROP_LAYOUTS_CHOICE:
- owner->getToolbar().openLayoutList();
- break;
+ case LFUN_MENU_OPEN_BY_NAME:
+ owner->getMenubar().openByName(argument);
+ break;
- case LFUN_MENU_OPEN_BY_NAME:
- owner->getMenubar().openByName(argument);
- break; // RVDK_PATCH_5
+ // --- lyxserver commands ----------------------------
+ case LFUN_GETNAME:
+ setMessage(owner->buffer()->fileName());
+ lyxerr[Debug::INFO] << "FNAME["
+ << owner->buffer()->fileName()
+ << "] " << endl;
+ break;
- // --- lyxserver commands ----------------------------
+ case LFUN_NOTIFY:
+ dispatch_buffer = keyseq.print();
+ lyxserver->notifyClient(dispatch_buffer);
+ break;
+ case LFUN_GOTOFILEROW: {
+ string file_name;
+ int row;
+ 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 {
+ // 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);
+ }
+ }
- case LFUN_GETNAME:
- setMessage(owner->buffer()->fileName());
- lyxerr[Debug::INFO] << "FNAME["
- << owner->buffer()->fileName()
- << "] " << endl;
- break;
+ view()->setCursorFromRow(row);
- case LFUN_NOTIFY:
- {
- dispatch_buffer = keyseq.print();
- lyxserver->notifyClient(dispatch_buffer);
- }
- break;
-
- 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));
- } else {
- view()->loadLyXFile(s);
+ view()->center();
+ // see BufferView_pimpl::center()
+ view()->updateScrollbar();
+ break;
}
- view()->setCursorFromRow(row);
+ case LFUN_GOTO_PARAGRAPH: {
+ istringstream is(argument);
+ int 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()
+ << " found." << endl;
+ }
- view()->center();
- // see BufferView_pimpl::center()
- view()->updateScrollbar();
- }
- break;
+ par.lockPath(view());
+ LyXText * lt = par.text(*view()->buffer());
- case LFUN_GOTO_PARAGRAPH:
- {
- istringstream istr(argument.c_str());
+ // Set the cursor
+ lt->setCursor(par.pit(), 0);
+ view()->switchKeyMap();
+ owner->view_state_changed();
- int id;
- istr >> id;
- ParIterator par = owner->buffer()->getParFromID(id);
- if (par == owner->buffer()->par_iterator_end()) {
- lyxerr[Debug::INFO] << "No matching paragraph found! ["
- << id << ']' << endl;
+ view()->center();
+ // see BufferView_pimpl::center()
+ view()->updateScrollbar();
break;
- } else {
- lyxerr[Debug::INFO] << "Paragraph " << par->id()
- << " found." << endl;
}
- if (view()->theLockingInset())
- view()->unlockInset(view()->theLockingInset());
- if (par->inInset()) {
- FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
- par->inInset()->localDispatch(cmd);
- }
- // Set the cursor
- view()->getLyXText()->setCursor(par.pit(), 0);
- view()->switchKeyMap();
- owner->view_state_changed();
-
- view()->center();
- // see BufferView_pimpl::center()
- view()->updateScrollbar();
- }
- break;
-
- // --- insert characters ----------------------------------------
-
- // --- Mathed stuff. If we are here, there is no locked inset yet.
- 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;
+ // --- Mathed stuff. If we are here, there is no locked inset yet.
+ 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(FuncRequest(view(), LFUN_SELFINSERT, "_"));
- break;
- case LFUN_SUPERSCRIPT:
- dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
- break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = func.getArg(0);
+ string data = trim(func.argument.substr(name.size()));
- case LFUN_DIALOG_SHOW: {
- string const name = ev.getArg(0);
- string data = trim(ev.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;
- }
+ 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 if (name == "latexlog") {
+ pair<Buffer::LogType, string> const logfile =
+ owner->buffer()->getLogName();
+ switch (logfile.first) {
+ case Buffer::latexlog:
+ data = "latex ";
+ break;
+ case Buffer::buildlog:
+ data = "literate ";
+ break;
+ }
+ data += logfile.second;
+ owner->getDialogs().show("log", data);
+ }
+ else if (name == "vclog") {
+ string const data = "vc " +
+ owner->buffer()->lyxvc().getLogFile();
+ owner->getDialogs().show("log", data);
+ }
+ else
+ owner->getDialogs().show(name, data);
+ break;
+ }
- case LFUN_DIALOG_SHOW_NEW_INSET: {
- string const & name = argument;
- string data;
- if (name == "bibitem" ||
- name == "bibtex" ||
- name == "include" ||
- name == "index" ||
- name == "ref" ||
- name == "toc" ||
- name == "url") {
- InsetCommandParams p(name);
- data = InsetCommandMailer::params2string(name, p);
- } else if (name == "citation") {
- InsetCommandParams p("cite");
- data = InsetCommandMailer::params2string(name, p);
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const name = func.getArg(0);
+ string data = trim(func.argument.substr(name.size()));
+ if (name == "bibitem" ||
+ name == "bibtex" ||
+ name == "include" ||
+ name == "index" ||
+ name == "label" ||
+ name == "ref" ||
+ name == "toc" ||
+ name == "url") {
+ InsetCommandParams p(name);
+ data = InsetCommandMailer::params2string(name, p);
+ } else if (name == "box") {
+ // \c data == "Boxed" || "Frameless" etc
+ InsetBoxParams p(data);
+ data = InsetBoxMailer::params2string(p);
+ } else if (name == "branch") {
+ InsetBranchParams p;
+ data = InsetBranchMailer::params2string(p);
+ } else if (name == "citation") {
+ InsetCommandParams p("cite");
+ data = InsetCommandMailer::params2string(name, p);
+ } else if (name == "ert") {
+ data = InsetERTMailer::params2string(InsetCollapsable::Open);
+ } else if (name == "external") {
+ InsetExternalParams p;
+ Buffer const & buffer = *owner->buffer();
+ data = InsetExternalMailer::params2string(p, buffer);
+ } else if (name == "float") {
+ InsetFloatParams p;
+ data = InsetFloatMailer::params2string(p);
+ } else if (name == "graphics") {
+ InsetGraphicsParams p;
+ Buffer const & buffer = *owner->buffer();
+ data = InsetGraphicsMailer::params2string(p, buffer);
+ } else if (name == "note") {
+ InsetNoteParams p;
+ data = InsetNoteMailer::params2string(p);
+ } else if (name == "vspace") {
+ VSpace space;
+ data = InsetVSpaceMailer::params2string(space);
+ } else if (name == "wrap") {
+ InsetWrapParams p;
+ data = InsetWrapMailer::params2string(p);
+ }
+ owner->getDialogs().show(name, data, 0);
+ break;
}
- owner->getDialogs().show(name, data, 0);
- }
- break;
- case LFUN_DIALOG_SHOW_NEXT_INSET: {
- }
- break;
+ case LFUN_DIALOG_SHOW_NEXT_INSET:
+ break;
- case LFUN_INSET_DIALOG_SHOW: {
- LyXText * lt = view()->getLyXText();
- InsetOld * inset = lt->getInset();
- if (inset) {
- FuncRequest cmd(view(), LFUN_INSET_DIALOG_SHOW);
- inset->localDispatch(cmd);
+ 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;
- // Can only update a dialog connected to an existing inset
- InsetBase * inset = owner->getDialogs().getOpenInset(name);
- if (inset) {
- FuncRequest fr(view(), LFUN_INSET_DIALOG_UPDATE,
- ev.argument);
- inset->localDispatch(fr);
- } else if (name == "paragraph") {
- dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+
+ case LFUN_DIALOG_UPDATE: {
+ string const & name = argument;
+ // Can only update a dialog connected to an existing inset
+ InsetBase * inset = owner->getDialogs().getOpenInset(name);
+ if (inset) {
+ FuncRequest fr(view(), LFUN_INSET_DIALOG_UPDATE,
+ func.argument);
+ inset->dispatch(fr);
+ } else if (name == "paragraph") {
+ dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+ }
+ break;
}
- }
- break;
- case LFUN_DIALOG_HIDE:
- Dialogs::hide(argument, 0);
- break;
+ case LFUN_DIALOG_HIDE:
+ Dialogs::hide(argument, 0);
+ break;
- case LFUN_DIALOG_DISCONNECT_INSET:
- owner->getDialogs().disconnect(argument);
- break;
+ case LFUN_DIALOG_DISCONNECT_INSET:
+ owner->getDialogs().disconnect(argument);
+ break;
- case LFUN_CHILDOPEN:
- {
- string const filename =
- 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()->loadLyXFile(filename);
- }
- break;
+ case LFUN_CHILDOPEN: {
+ string const filename =
+ MakeAbsPath(argument, owner->buffer()->filePath());
+ setMessage(N_("Opening child document ") +
+ MakeDisplayPath(filename) + "...");
+ view()->savePosition(0);
+ string const parentfilename = owner->buffer()->fileName();
+ if (bufferlist.exists(filename))
+ view()->buffer(bufferlist.getBuffer(filename));
+ else
+ view()->loadLyXFile(filename);
+ // Set the parent name of the child document.
+ // This makes insertion of citations and references in the child work,
+ // when the target is in the parent or another child document.
+ owner->buffer()->setParentName(parentfilename);
+ break;
+ }
- case LFUN_TOGGLECURSORFOLLOW:
- lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
- break;
+ case LFUN_TOGGLECURSORFOLLOW:
+ lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
+ break;
- case LFUN_KMAP_OFF:
- owner->getIntl().KeyMapOn(false);
- break;
+ case LFUN_KMAP_OFF:
+ owner->getIntl().KeyMapOn(false);
+ break;
- case LFUN_KMAP_PRIM:
- owner->getIntl().KeyMapPrim();
- break;
+ case LFUN_KMAP_PRIM:
+ owner->getIntl().KeyMapPrim();
+ break;
- case LFUN_KMAP_SEC:
- owner->getIntl().KeyMapSec();
- break;
+ case LFUN_KMAP_SEC:
+ owner->getIntl().KeyMapSec();
+ break;
- case LFUN_KMAP_TOGGLE:
- owner->getIntl().ToggleKeyMap();
- break;
+ case LFUN_KMAP_TOGGLE:
+ owner->getIntl().ToggleKeyMap();
+ break;
- case LFUN_SEQUENCE:
- {
- // argument contains ';'-terminated commands
- while (!argument.empty()) {
- string first;
- argument = split(argument, first, ';');
- dispatch(first);
+ 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;
}
- }
- break;
- case LFUN_SAVEPREFERENCES:
- {
- Path p(user_lyxdir());
- lyxrc.write("preferences");
- }
- 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()->update();
- }
- break;
+ case LFUN_SEQUENCE:
+ // argument contains ';'-terminated commands
+ while (!argument.empty()) {
+ string first;
+ argument = split(argument, first, ';');
+ dispatch(lyxaction.lookupFunc(first));
+ }
+ break;
+
+ case LFUN_SAVEPREFERENCES: {
+ Path p(user_lyxdir());
+ lyxrc.write("preferences");
+ break;
+ }
- 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>"));
+ case LFUN_SCREEN_FONT_UPDATE:
+ // handle the screen font changes.
+ lyxrc.set_font_norm_type();
+ lyx_gui::update_fonts();
+ // All visible buffers will need resize
+ view()->resize();
break;
+
+ 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) &&
- x11_name != lcolor.getX11Name(LColor::graphicsbg));
+ bool const graphicsbg_changed =
+ (lyx_name == lcolor.getLyXName(LColor::graphicsbg) &&
+ x11_name != lcolor.getX11Name(LColor::graphicsbg));
- if (!lcolor.setColor(lyx_name, x11_name)) {
- setErrorMessage(
- bformat(_("Set-color \"%1$s\" failed "
- "- color is undefined or "
- "may not be redefined"), lyx_name));
- break;
- }
+ LColor::color col = lcolor.getFromLyXName(lyx_name);
+ if (!lcolor.setColor(col, x11_name)) {
+ setErrorMessage(
+ bformat(_("Set-color \"%1$s\" failed "
+ "- color is undefined or "
+ "may not be redefined"), lyx_name));
+ break;
+ }
- lyx_gui::update_color(lcolor.getFromLyXName(lyx_name));
+ lyx_gui::update_color(lcolor.getFromLyXName(lyx_name));
- if (graphicsbg_changed) {
+ if (graphicsbg_changed) {
#ifdef WITH_WARNINGS
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
- lyx::graphics::GCache & gc =
- lyx::graphics::GCache::get();
- gc.changeDisplay(true);
+ lyx::graphics::GCache::get().changeDisplay(true);
#endif
+ }
+ break;
}
- view()->update();
- break;
- }
-
- case LFUN_MESSAGE:
- owner->message(argument);
- break;
+ case LFUN_MESSAGE:
+ owner->message(argument);
+ break;
- case LFUN_FORKS_KILL:
- {
- if (!isStrInt(argument))
+ case LFUN_FORKS_KILL:
+ if (isStrInt(argument))
+ ForkedcallsController::get().kill(strToInt(argument));
break;
- pid_t const pid = strToInt(argument);
- ForkedcallsController & fcc = ForkedcallsController::get();
- fcc.kill(pid);
- break;
- }
+ case LFUN_TOOLTIPS_TOGGLE:
+ owner->getDialogs().toggleTooltips();
+ break;
- case LFUN_TOOLTIPS_TOGGLE:
- owner->getDialogs().toggleTooltips();
- break;
+ case LFUN_EXTERNAL_EDIT:
+ InsetExternal().dispatch(FuncRequest(view(), action, argument));
+ break;
- case LFUN_EXTERNAL_EDIT: {
- InsetExternal()
- .localDispatch(FuncRequest(view(), action, argument));
- break;
+ default: {
+ DispatchResult result =
+ view()->cursor().dispatch(FuncRequest(func, view()));
+ if (result.dispatched())
+ lyxerr << "dispatched by Cursor::dispatch()" << endl;
+ else
+ lyxerr << "### NOT DISPATCHED BY Cursor::dispatch() ###" << endl;
+ break;
+ }
+ }
}
- default:
- // Then if it was none of the above
- // Trying the BufferView::pimpl dispatch:
- if (!view()->dispatch(ev))
- lyxerr << "A truly unknown func ["
- << lyxaction.getActionName(ev.action) << "]!"
- << endl;
- break;
- } // end of switch
-
-exit_with_message:
-
view()->owner()->updateLayoutChoice();
if (view()->available()) {
- if (view()->fitCursor()) {
- lyxerr << "LyXFunc->fitCursor->update" << endl;
-
- view()->update();
- }
-
- // If we executed a mutating lfun, mark the buffer as dirty
- if (!getStatus(ev).disabled()
- && !lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
- && !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
+ view()->fitCursor();
+ view()->update();
+ view()->cursor().updatePos();
+ // if we executed a mutating lfun, mark the buffer as dirty
+ 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()) {
void LyXFunc::setupLocalKeymap()
{
- keyseq.stdmap = keyseq.curmap = toplevel_keymap.get();
- cancel_meta_seq.stdmap = cancel_meta_seq.curmap = toplevel_keymap.get();
+ keyseq.stdmap = toplevel_keymap.get();
+ keyseq.curmap = toplevel_keymap.get();
+ cancel_meta_seq.stdmap = toplevel_keymap.get();
+ cancel_meta_seq.curmap = toplevel_keymap.get();
}
if (result.first == FileDialog::Later)
return;
-
- string const fname = result.second;
-
- if (fname.empty())
+ if (result.second.empty())
return;
- templname = fname;
+ templname = result.second;
}
view()->newFile(filename, templname, !name.empty());
BufferView * LyXFunc::view() const
{
- Assert(owner);
+ BOOST_ASSERT(owner);
return owner->view().get();
}