#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 "support/std_sstream.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/insetcommand.h"
#include "insets/insetexternal.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::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 namespace lyx::support;
-
-using std::pair;
-using std::make_pair;
using std::endl;
-using std::find_if;
+using std::make_pair;
+using std::string;
using std::istringstream;
-using std::vector;
-using std::transform;
-using std::back_inserter;
-using namespace bv_funcs;
+
extern BufferList bufferlist;
extern LyXServer * lyxserver;
// 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;
}
}
&& !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:
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:
break;
}
flag.setOnOff(ev.argument[0] == align);
- } else
+ } else {
disable = true;
char align = mathcursor->halign();
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();
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();
case InsetOld::BRANCH_CODE:
disable = ev.argument != "branch";
break;
+ case InsetOld::BOX_CODE:
+ disable = ev.argument != "box";
+ break;
default:
break;
}
UpdatableInset * tli = view()->theLockingInset();
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);
}
case LFUN_INSERT_NOTE:
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())
+ if (buf->params().branchlist().empty())
disable = true;
break;
case LFUN_INSERT_LABEL:
disable = !inset;
if (!disable) {
code = inset->lyxCode();
- if (!(code == InsetOld::INCLUDE_CODE
- || code == InsetOld::BIBTEX_CODE
- || code == InsetOld::FLOAT_LIST_CODE
+ if (!(code == InsetOld::INCLUDE_CODE
+ || code == InsetOld::BIBTEX_CODE
+ || code == InsetOld::FLOAT_LIST_CODE
|| code == InsetOld::TOC_CODE))
disable = true;
}
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;
// 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 arguements 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: 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 0
+ {
+ Cursor cursor;
+ buildCursor(cursor, *view());
+ if (cursor.dispatch(FuncRequest(func, view())) == DISPATCHED) {
+ lyxerr << "dispatched by Cursor::dispatch()\n";
+ goto exit_with_message;
+ }
+ }
+#endif
+
+
if (view()->available() && view()->theLockingInset()) {
- InsetOld::RESULT result;
+ dispatch_result result;
if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
!keyseq.deleted()))
{
int dummy_y;
inset->getCursorPos(view(), inset_x, dummy_y);
#endif
- if ((action == LFUN_UNKNOWN_ACTION)
+ if (action == LFUN_UNKNOWN_ACTION
&& argument.empty()) {
argument = encoded_last_key;
}
// if we've just done LFUN_ESCAPE (which
// injects an LFUN_PARAGRAPH_UPDATE)
if (action == LFUN_PARAGRAPH_UPDATE) {
- view()->dispatch(ev);
+ view()->dispatch(func);
goto exit_with_message;
}
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 || result == DISPATCHED_NOUPDATE) {
goto exit_with_message;
- // If UNDISPATCHED, just soldier on
- else if (result == FINISHED) {
+ }
+
+ // If UNDISPATCHED, just soldier on
+ 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) {
+ }
+
+ 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 (result == FINISHED_UP) {
+ RowList::iterator const irow = view()->text->cursorRow();
if (irow != view()->text->firstRow()) {
#if 1
view()->text->setCursorFromCoordinates(
}
owner->clearMessage();
goto exit_with_message;
- } else if (result == FINISHED_DOWN) {
- RowList::iterator const irow = view()->text->cursorIRow();
+ }
+
+ if (result == FINISHED_DOWN) {
+ RowList::iterator const irow = view()->text->cursorRow();
if (irow != view()->text->lastRow()) {
#if 1
view()->text->setCursorFromCoordinates(
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:
+ // 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->cursorPar()->isRightToLeftPar(owner->buffer()->params())) {
view()->text->cursorRight(view());
- view()->switchKeyMap();
+ moveCursorUpdate();
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());
+ }
+ 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:
+ 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;
}
}
}
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;
break;
case LFUN_READ_ONLY_TOGGLE:
- if (owner->buffer()->lyxvc.inUse())
- owner->buffer()->lyxvc.toggleReadOnly();
+ if (owner->buffer()->lyxvc().inUse())
+ owner->buffer()->lyxvc().toggleReadOnly();
else
owner->buffer()->setReadonly(
!owner->buffer()->isReadonly());
view()->redo();
break;
- case LFUN_DEPTH_MIN:
- changeDepth(view(), view()->getLyXText(), DEC_DEPTH, false);
- owner->view_state_changed();
- break;
-
- case LFUN_DEPTH_PLUS:
- changeDepth(view(), view()->getLyXText(), INC_DEPTH, false);
- owner->view_state_changed();
- break;
-
case LFUN_FREEFONT_APPLY:
apply_freefont(view());
break;
{
if (!ensureBufferClean(view()))
break;
- if (!owner->buffer()->lyxvc.inUse()) {
- owner->buffer()->lyxvc.registrer();
+ if (!owner->buffer()->lyxvc().inUse()) {
+ owner->buffer()->lyxvc().registrer();
view()->reload();
}
}
{
if (!ensureBufferClean(view()))
break;
- if (owner->buffer()->lyxvc.inUse()
+ if (owner->buffer()->lyxvc().inUse()
&& !owner->buffer()->isReadonly()) {
- owner->buffer()->lyxvc.checkIn();
+ owner->buffer()->lyxvc().checkIn();
view()->reload();
}
}
{
if (!ensureBufferClean(view()))
break;
- if (owner->buffer()->lyxvc.inUse()
+ if (owner->buffer()->lyxvc().inUse()
&& owner->buffer()->isReadonly()) {
- owner->buffer()->lyxvc.checkOut();
+ owner->buffer()->lyxvc().checkOut();
view()->reload();
}
}
case LFUN_VC_REVERT:
{
- owner->buffer()->lyxvc.revert();
+ owner->buffer()->lyxvc().revert();
view()->reload();
}
break;
case LFUN_VC_UNDO:
{
- owner->buffer()->lyxvc.undoLast();
+ owner->buffer()->lyxvc().undoLast();
view()->reload();
}
break;
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));
+ 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()->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()->unlockInset(view()->theLockingInset());
if (par->inInset()) {
FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
- par->inInset()->localDispatch(cmd);
+ par->inInset()->dispatch(cmd);
}
// Set the cursor
view()->getLyXText()->setCursor(par.pit(), 0);
break;
case LFUN_DIALOG_SHOW: {
- string const name = ev.getArg(0);
- string data = trim(ev.argument.substr(name.size()));
+ string const name = func.getArg(0);
+ string data = trim(func.argument.substr(name.size()));
if (name == "character") {
data = freefont2string();
InsetOld * inset = lt->getInset();
if (inset) {
FuncRequest cmd(view(), LFUN_INSET_DIALOG_SHOW);
- inset->localDispatch(cmd);
+ inset->dispatch(cmd);
}
- }
- 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);
+ func.argument);
+ inset->dispatch(fr);
} else if (name == "paragraph") {
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
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);
while (!argument.empty()) {
string first;
argument = split(argument, first, ';');
- dispatch(first);
+ dispatch(lyxaction.lookupFunc(first));
}
}
break;
// 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_EXTERNAL_EDIT: {
- InsetExternal()
- .localDispatch(FuncRequest(view(), action, argument));
+ 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
if (view()->available()) {
if (view()->fitCursor()) {
- lyxerr << "LyXFunc->fitCursor->update" << endl;
-
+ //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))
+ 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()) {
BufferView * LyXFunc::view() const
{
- Assert(owner);
+ BOOST_ASSERT(owner);
return owner->view().get();
}
projects / lyx.git / blobdiff