#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxfunc.h"
#include "version.h"
#include "kbmap.h"
#include "lyxrow.h"
#include "bufferlist.h"
#include "BufferView.h"
-#include "frontends/xforms/ColorHandler.h"
#include "lyxserver.h"
#include "intl.h"
#include "lyx_main.h"
#include "gettext.h"
#include "Lsstream.h"
#include "trans_mgr.h"
+#include "encoding.h"
#include "layout.h"
#include "bufferview_funcs.h"
-#include "minibuffer.h"
-#include "vspace.h"
#include "frontends/LyXView.h"
+#include "frontends/lyx_gui.h"
+#include "vspace.h"
#include "FloatList.h"
-#include "converter.h"
+#include "format.h"
#include "exporter.h"
#include "importer.h"
-#include "frontends/font_loader.h"
#include "TextCache.h"
#include "lyxfind.h"
#include "undo_funcs.h"
#include "ParagraphParameters.h"
-#include "insets/inseturl.h"
-#include "insets/insetlatexaccent.h"
-#include "insets/insettoc.h"
-#include "insets/insetref.h"
-#include "insets/insetparent.h"
-#include "insets/insetindex.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insetcite.h"
-#include "insets/insettext.h"
+#include "insets/insetcommand.h"
+#include "insets/inseterror.h"
#include "insets/insetert.h"
-#include "insets/insetexternal.h"
-#include "insets/insetgraphics.h"
-#include "insets/insetfoot.h"
-#include "insets/insetmarginal.h"
-#include "insets/insetminipage.h"
-#include "insets/insetfloat.h"
-#if 0
-#include "insets/insetlist.h"
-#include "insets/insettheorem.h"
-#endif
#include "insets/insettabular.h"
-#include "insets/insetcaption.h"
#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
#include "support/path.h"
#include "support/lyxfunctional.h"
+#include "BoostFormat.h"
+
#include <ctime>
#include <clocale>
#include <cstdlib>
#include <utility>
#include <algorithm>
-
using std::pair;
using std::make_pair;
using std::endl;
extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
-extern void show_symbols_form(LyXFunc *);
-
-extern LyXAction lyxaction;
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
extern void ShowLatexLog();
-#if 0
-
-///
-class MiniBufferController : public SigC::Object {
-public:
- ///
- MiniBufferController() {
- minibuffer
- .cmdReady
- .connect(slot(this,
- &MiniBufferController::receiveCommand));
- minibuffer
- .argReady
- .connect(slot(this,
- &MiniBufferController::receiveArg));
- }
- ///
- void receiveCmd(string const & cmd) {}
- ///
- void receiveArg(string const & arg) {}
-
-
-private:
-};
-
-namespace {
-
-MiniBufferController mb_ctrl;
-
-}
-#endif
-
-
-/* === globals =========================================================== */
-
-
LyXFunc::LyXFunc(LyXView * o)
: owner(o),
+ encoded_last_key(0),
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
- cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get())
+ cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get()),
+ meta_fake_bit(key_modifier::none)
{
- meta_fake_bit = key_modifier::none;
- lyx_dead_action = LFUN_NOACTION;
- lyx_calling_dead_action = LFUN_NOACTION;
}
LyXText * LyXFunc::TEXT(bool flag = true) const
{
if (flag)
- return owner->view()->text;
- return owner->view()->getLyXText();
+ return view()->text;
+ return view()->getLyXText();
}
-// I changed this func slightly. I commented out the ...FinishUndo(),
-// this means that all places that used to have a moveCursorUpdate, now
-// have a ...FinishUndo() as the preceeding statement. I have also added
-// a moveCursorUpdate to some of the functions that updated the cursor, but
-// that did not show its new position.
inline
void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
{
if (selecting || TEXT(flag)->selection.mark()) {
- TEXT(flag)->setSelection(owner->view());
- if (TEXT(flag)->bv_owner)
- owner->view()->toggleToggle();
+ TEXT(flag)->setSelection(view());
+ if (TEXT(flag)->isTopLevel())
+ view()->toggleToggle();
}
- owner->view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
- owner->view()->showCursor();
+ view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
+ view()->showCursor();
- /* ---> Everytime the cursor is moved, show the current font state. */
- // should this too me moved out of this func?
- owner->view()->setState();
+ view()->switchKeyMap();
}
void LyXFunc::handleKeyFunc(kb_action action)
{
- char c = keyseq.getiso();
+ char c = encoded_last_key;
- if (keyseq.length() > 1) {
+ if (keyseq.length()) {
c = 0;
}
- owner->getIntl()->getTrans()
+ owner->getIntl().getTransManager()
.deadkey(c, get_accent(action).accent, TEXT(false));
// Need to clear, in case the minibuffer calls these
// actions
keyseq.clear();
// copied verbatim from do_accent_char
- owner->view()->update(TEXT(false),
+ view()->update(TEXT(false),
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
TEXT(false)->selection.cursor = TEXT(false)->cursor;
}
-void LyXFunc::processKeySym(KeySym keysym, key_modifier::state state)
+void LyXFunc::processKeySym(LyXKeySymPtr keysym,
+ key_modifier::state state)
{
string argument;
if (lyxerr.debugging(Debug::KEY)) {
- char const * tmp = XKeysymToString(keysym);
- string const stm = (tmp ? tmp : "");
lyxerr << "KeySym is "
- << stm
- << "["
- << keysym
+ << keysym->getSymbolName()
<< endl;
}
+
// Do nothing if we have nothing (JMarc)
- if (keysym == NoSymbol) {
+ if (!keysym->isOK()) {
lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
<< endl;
return;
}
- // Can we be sure that this will work for all X Window
- // implementations? (Lgb)
- // This code snippet makes lyx ignore some keys. Perhaps
- // all of them should be explictly mentioned?
- if ((keysym >= XK_Shift_L && keysym <= XK_Hyper_R)
- || keysym == XK_Mode_switch || keysym == 0x0) {
+ if (keysym->isModifier()) {
+ lyxerr[Debug::KEY] << "isModifier true" << endl;
return;
}
+ Encoding const * encoding = view()->getEncoding();
+
+ encoded_last_key = keysym->getISOEncoded(encoding ? encoding->Name() : "");
+
// Do a one-deep top-level lookup for
// cancel and meta-fake keys. RVDK_PATCH_5
cancel_meta_seq.reset();
int action = cancel_meta_seq.addkey(keysym, state);
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "action first set to [" << action << "]" << endl;
- }
+ lyxerr[Debug::KEY] << "action first set to [" << 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 0
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "meta_fake_bit is ["
- << meta_fake_bit << "]" << endl;
- }
-#endif
// remove Caps Lock and Mod2 as a modifiers
action = keyseq.addkey(keysym, (state | meta_fake_bit));
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "action now set to ["
- << action << "]" << endl;
- }
+ lyxerr[Debug::KEY] << "action now set to ["
+ << action << ']' << endl;
}
+
// Dont remove this unless you know what you are doing.
meta_fake_bit = key_modifier::none;
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Key [action="
<< action << "]["
- << keyseq.print() << "]"
+ << keyseq.print() << ']'
<< endl;
}
owner->message(keyseq.print());
}
- if (action == LFUN_UNKNOWN_ACTION) {
- // It is unknown, but what if we remove all
- // the modifiers? (Lgb)
+
+ // 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) {
+ lyxerr[Debug::KEY] << "Trying without shift" << endl;
action = keyseq.addkey(keysym, key_modifier::none);
+ lyxerr[Debug::KEY] << "Action now " << action << endl;
+ }
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "Removing modifiers...\n"
- << "Action now set to ["
- << action << "]" << endl;
- }
- if (action == LFUN_UNKNOWN_ACTION) {
+ if (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;
+ } else {
+ lyxerr[Debug::KEY] << "Unknown, !isText() - giving up" << endl;
owner->message(_("Unknown function."));
return;
}
}
if (action == LFUN_SELFINSERT) {
- // This is very X dependent.
- unsigned int c = keysym;
- string argument;
-
- c = kb_keymap::getiso(c);
+ if (encoded_last_key != 0) {
+ string arg;
+ arg += encoded_last_key;
- if (c > 0)
- argument = static_cast<char>(c);
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, arg));
- dispatch(LFUN_SELFINSERT, argument);
- lyxerr[Debug::KEY] << "SelfInsert arg[`"
+ lyxerr[Debug::KEY] << "SelfInsert arg[`"
<< argument << "']" << endl;
+ }
+ } else {
+ dispatch(action);
}
- else
- verboseDispatch(action, false);
}
FuncStatus LyXFunc::getStatus(int ac) const
{
- kb_action action;
- string argument;
- action = lyxaction.retrieveActionArg(ac, argument);
- return getStatus(action, argument);
+ return getStatus(lyxaction.retrieveActionArg(ac));
}
-FuncStatus LyXFunc::getStatus(kb_action action,
- string const & argument) const
+FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
{
FuncStatus flag;
Buffer * buf = owner->buffer();
- if (action == LFUN_NOACTION) {
+ if (ev.action == LFUN_NOACTION) {
setStatusMessage(N_("Nothing to do"));
return flag.disabled(true);
}
- if (action == LFUN_UNKNOWN_ACTION) {
+ switch (ev.action) {
+ case LFUN_UNKNOWN_ACTION:
+#ifndef HAVE_LIBAIKSAURUS
+ case LFUN_THESAURUS_ENTRY:
+#endif
+ flag.unknown(true);
+ break;
+ default:
+ flag |= lyx_gui::getStatus(ev);
+ }
+
+ if (flag.unknown()) {
setStatusMessage(N_("Unknown action"));
- return flag.unknown(true);
+ return flag;
}
// the default error message if we disable the command
setStatusMessage(N_("Command disabled"));
// Check whether we need a buffer
- if (!lyxaction.funcHasFlag(action, LyXAction::NoBuffer)) {
+ if (!lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)) {
// Yes we need a buffer, do we have one?
if (buf) {
// yes
// Can we use a readonly buffer?
if (buf->isReadonly() &&
- !lyxaction.funcHasFlag(action,
+ !lyxaction.funcHasFlag(ev.action,
LyXAction::ReadOnly)) {
// no
setStatusMessage(N_("Document is read-only"));
}
}
- UpdatableInset * tli = owner->view()->theLockingInset();
+ UpdatableInset * tli = view()->theLockingInset();
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
bool disable = false;
- switch (action) {
+ switch (ev.action) {
case LFUN_MENUPRINT:
disable = !Exporter::IsExportable(buf, "dvi")
|| lyxrc.print_command == "none";
break;
case LFUN_EXPORT:
- disable = argument == "fax" &&
- !Exporter::IsExportable(buf, argument);
+ disable = ev.argument != "custom"
+ && !Exporter::IsExportable(buf, ev.argument);
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
case LFUN_REDO:
disable = buf->redostack.empty();
break;
- case LFUN_SPELLCHECK:
- disable = lyxrc.isp_command == "none";
- break;
-#ifndef HAVE_LIBAIKSAURUS
- case LFUN_THESAURUS_ENTRY:
- disable = true;
+ 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 && static_cast<InsetTabular*>(in)->hasSelection()) {
+ disable = false;
+ break;
+ }
+ }
+ disable = !mathcursor && !view()->getLyXText()->selection.set();
break;
-#endif
case LFUN_RUNCHKTEX:
disable = lyxrc.chktex_command == "none";
break;
disable = !Exporter::IsExportable(buf, "program");
break;
+ case LFUN_LAYOUT_CHARACTER:
+ disable = tli && tli->lyxCode() == Inset::ERT_CODE;
+ break;
+
case LFUN_LAYOUT_TABULAR:
disable = !tli
|| (tli->lyxCode() != Inset::TABULAR_CODE
break;
}
+ case LFUN_INSET_OPTARG:
+ disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+ break;
+
case LFUN_TABULAR_FEATURE:
- disable = true;
+ if (mathcursor) {
+#if 0
+ // FIXME: check temporarily disabled
+ // valign code
+ char align = mathcursor->valign();
+ if (align == '\0') {
+ disable = true;
+ break;
+ }
+ if (ev.argument.empty()) {
+ flag.clear();
+ break;
+ }
+ if (!contains("tcb", ev.argument[0])) {
+ disable = true;
+ break;
+ }
+ flag.setOnOff(ev.argument[0] == align);
+ } else
+ disable = true;
+
+ char align = mathcursor->halign();
+ if (align == '\0') {
+ disable = true;
+ break;
+ }
+ if (ev.argument.empty()) {
+ flag.clear();
+ break;
+ }
+ if (!contains("lcr", ev.argument[0])) {
+ disable = true;
+ break;
+ }
+ flag.setOnOff(ev.argument[0] == align);
+#endif
+
+ disable = !mathcursor->halign();
+ break;
+ }
+
if (tli) {
FuncStatus ret;
//ret.disabled(true);
if (tli->lyxCode() == Inset::TABULAR_CODE) {
ret = static_cast<InsetTabular *>(tli)
- ->getStatus(argument);
+ ->getStatus(ev.argument);
} else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
(tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
- ->getStatus(argument);
+ ->getStatus(ev.argument);
}
flag |= ret;
disable = false;
FuncStatus ret;
disable = true;
- ret = inset.getStatus(argument);
+ ret = inset.getStatus(ev.argument);
if (ret.onoff(true) || ret.onoff(false))
flag.setOnOff(false);
}
case LFUN_VC_HISTORY:
disable = !buf->lyxvc.inUse();
break;
+ case LFUN_MENURELOAD:
+ disable = buf->isUnnamed() || buf->isClean();
+ break;
case LFUN_BOOKMARK_GOTO:
- disable = !owner->view()->
- isSavedPosition(strToUnsignedInt(argument));
+ 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 = owner->view()->getLyXText();
+ LyXText * lt = view()->getLyXText();
disable = !(isEditableInset(lt->getInset())
|| (lt->inset_owner
&& lt->inset_owner->owner()
&& lt->inset_owner->owner()->isOpen()));
break;
}
- case LFUN_MATH_VALIGN:
- if (mathcursor && mathcursor->formula()->getType() != LM_OT_SIMPLE) {
- char align = mathcursor->valign();
- if (align == '\0') {
- disable = true;
- break;
- }
- if (argument.empty()) {
- flag.clear();
- break;
- }
- if (!contains("tcb", argument[0])) {
- disable = true;
- break;
- }
- flag.setOnOff(argument[0] == align);
- } else
- disable = true;
- break;
-
- case LFUN_MATH_HALIGN:
- if (mathcursor && mathcursor->formula()->getType() != LM_OT_SIMPLE) {
- char align = mathcursor->halign();
- if (align == '\0') {
- disable = true;
- break;
- }
- if (argument.empty()) {
- flag.clear();
- break;
- }
- if (!contains("lcr", argument[0])) {
- disable = true;
- break;
- }
- flag.setOnOff(argument[0] == align);
- } else
- disable = true;
+ case LFUN_LATEX_LOG:
+ disable = !IsFileReadable(buf->getLogName().second);
break;
case LFUN_MATH_MUTATE:
- if (tli && (tli->lyxCode() == Inset::MATH_CODE)) {
- MathInsetTypes type = mathcursor->formula()->getType();
- if (argument == "inline") {
- flag.setOnOff(type == LM_OT_SIMPLE);
- } else if (argument == "display") {
- flag.setOnOff(type == LM_OT_EQUATION);
- } else if (argument == "eqnarray") {
- flag.setOnOff(type == LM_OT_EQNARRAY);
- } else if (argument == "align") {
- flag.setOnOff(type == LM_OT_ALIGN);
- } else if (argument == "none") {
- flag.setOnOff(type == LM_OT_NONE);
- } else {
- disable = true;
- }
- } else
+ if (mathcursor)
+ //flag.setOnOff(mathcursor->formula()->hullType() == ev.argument);
+ flag.setOnOff(false);
+ else
disable = true;
break;
case LFUN_MATH_LIMITS:
case LFUN_MATH_NONUMBER:
case LFUN_MATH_NUMBER:
+ case LFUN_MATH_EXTERN:
disable = !mathcursor;
break;
- // we need to be math mode and a math array for that
- // Hack: halign produces non-zero result iff we are in a math array
- case LFUN_MATH_ROW_INSERT:
- case LFUN_MATH_ROW_DELETE:
- case LFUN_MATH_COLUMN_INSERT:
- case LFUN_MATH_COLUMN_DELETE:
- disable = !mathcursor || !mathcursor->halign() ||
- mathcursor->formula()->getType() == LM_OT_SIMPLE;
- break;
-
default:
break;
}
// the functions which insert insets
Inset::Code code = Inset::NO_CODE;
- switch (action) {
+ switch (ev.action) {
case LFUN_INSET_ERT:
code = Inset::ERT_CODE;
break;
case LFUN_INSET_FOOTNOTE:
code = Inset::FOOT_CODE;
break;
- case LFUN_DIALOG_TABULAR_INSERT:
- case LFUN_INSET_TABULAR:
+ case LFUN_TABULAR_INSERT:
code = Inset::TABULAR_CODE;
break;
case LFUN_INSET_EXTERNAL:
case LFUN_INSET_WIDE_FLOAT:
code = Inset::FLOAT_CODE;
break;
+ case LFUN_INSET_WRAP:
+ code = Inset::WRAP_CODE;
+ break;
case LFUN_FLOAT_LIST:
code = Inset::FLOAT_LIST_CODE;
break;
code = Inset::CAPTION_CODE;
break;
case LFUN_INSERT_NOTE:
- code = Inset::IGNORE_CODE;
+ code = Inset::NOTE_CODE;
break;
case LFUN_INSERT_LABEL:
code = Inset::LABEL_CODE;
break;
+ case LFUN_INSET_OPTARG:
+ code = Inset::OPTARG_CODE;
+ break;
case LFUN_REF_INSERT:
code = Inset::REF_CODE;
break;
- case LFUN_CITATION_CREATE:
- case LFUN_CITATION_INSERT:
- code = Inset::CITE_CODE;
- break;
- case LFUN_INSERT_BIBTEX:
- code = Inset::BIBTEX_CODE;
- break;
case LFUN_INDEX_INSERT:
- case LFUN_INDEX_INSERT_LAST:
- case LFUN_INDEX_CREATE:
code = Inset::INDEX_CODE;
break;
case LFUN_INDEX_PRINT:
default:
break;
}
- if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code)) {
+ if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code))
disable = true;
- }
if (disable)
- flag.disabled(true);
+ flag.disabled(true);
// A few general toggles
- switch (action) {
+ switch (ev.action) {
case LFUN_TOOLTIPS_TOGGLE:
- flag.setOnOff(owner->getDialogs()->tooltipsEnabled());
+ flag.setOnOff(owner->getDialogs().tooltipsEnabled());
break;
case LFUN_READ_ONLY_TOGGLE:
case LFUN_SWITCHBUFFER:
// toggle on the current buffer, but do not toggle off
// the other ones (is that a good idea?)
- if (argument == buf->fileName())
+ if (ev.argument == buf->fileName())
flag.setOnOff(true);
break;
+ case LFUN_TRACK_CHANGES:
+ flag.setOnOff(buf->params.tracking_changes);
+ break;
default:
break;
}
// the font related toggles
if (!mathcursor) {
LyXFont const & font = TEXT(false)->real_current_font;
- switch (action) {
+ switch (ev.action) {
case LFUN_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
break;
default:
break;
}
- }
- else {
+ } else {
string tc = mathcursor->getLastCode();
- switch (action) {
+ switch (ev.action) {
case LFUN_BOLD:
flag.setOnOff(tc == "mathbf");
break;
}
}
- return flag;
-}
-
-
-// temporary dispatch method
-void LyXFunc::miniDispatch(string const & s)
-{
- string s2(frontStrip(strip(s)));
-
- if (!s2.empty()) {
- verboseDispatch(s2, true);
+ // 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)));
}
+
+ return flag;
}
-void LyXFunc::verboseDispatch(string const & s, bool show_sc)
+void LyXFunc::dispatch(string const & s, bool verbose)
{
- int action = lyxaction.LookupFunc(frontStrip(s));
+ int const action = lyxaction.LookupFunc(s);
if (action == LFUN_UNKNOWN_ACTION) {
+#if USE_BOOST_FORMAT
+boost::format fmt(_("Unknown function (%1$s)"));
+fmt % s;
+owner->message(fmt.str());
+#else
string const msg = string(_("Unknown function ("))
- + s + ")";
+ + s + ')';
owner->message(msg);
- } else {
- verboseDispatch(action, show_sc);
+#endif
+ return;
}
-}
-
-void LyXFunc::verboseDispatch(int ac, bool show_sc)
-{
- string argument;
- kb_action action;
-
- // get the real action and argument
- action = lyxaction.retrieveActionArg(ac, argument);
-
- verboseDispatch(action, argument, show_sc);
+ dispatch(action, verbose);
}
-
-void LyXFunc::verboseDispatch(kb_action action,
- string const & argument, bool show_sc)
+void LyXFunc::dispatch(int ac, bool verbose)
{
- string res = dispatch(action, argument);
-
- commandshortcut.erase();
-
- if (lyxrc.display_shortcuts && show_sc) {
- if (action != LFUN_SELFINSERT) {
- // Put name of command and list of shortcuts
- // for it in minibuffer
- string comname = lyxaction.getActionName(action);
-
- int pseudoaction = action;
- bool argsadded = false;
-
- if (!argument.empty()) {
- // the pseudoaction is useful for the bindings
- pseudoaction =
- lyxaction.searchActionArg(action,
- argument);
-
- if (pseudoaction == LFUN_UNKNOWN_ACTION) {
- pseudoaction = action;
- } else {
- comname += " " + argument;
- argsadded = true;
- }
- }
-
- string const shortcuts =
- toplevel_keymap->findbinding(pseudoaction);
-
- if (!shortcuts.empty()) {
- comname += ": " + shortcuts;
- } else if (!argsadded && !argument.empty()) {
- comname += " " + argument;
- }
-
- if (!comname.empty()) {
- comname = strip(comname);
- commandshortcut = "(" + comname + ')';
- }
- }
- }
-
- if (res.empty()) {
- if (!commandshortcut.empty()) {
- owner->getMiniBuffer()->addSet(commandshortcut);
- }
- } else {
- owner->getMiniBuffer()->addSet(' ' + commandshortcut);
- }
+ dispatch(lyxaction.retrieveActionArg(ac), verbose);
}
-string const LyXFunc::dispatch(kb_action action, string argument)
+
+void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
{
- lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << action
- <<"] arg[" << argument << "]" << endl;
+ lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << ev.action
+ <<"] arg[" << ev.argument << ']' << endl;
// we have not done anything wrong yet.
errorstat = false;
selection_possible = false;
- if (owner->view()->available())
- owner->view()->hideCursor();
+ if (view()->available())
+ view()->hideCursor();
+
+ string argument = ev.argument;
+ kb_action action = ev.action;
// We cannot use this function here
- if (getStatus(action, argument).disabled()) {
- lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: "
+ if (getStatus(ev).disabled()) {
+ lyxerr[Debug::ACTION] << "LyXFunc::dispatch: "
<< lyxaction.getActionName(action)
<< " [" << action << "] is disabled at this location"
<< endl;
goto exit_with_message;
}
- if (owner->view()->available() && owner->view()->theLockingInset()) {
- UpdatableInset::RESULT result;
+ if (view()->available() && view()->theLockingInset()) {
+ Inset::RESULT result;
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
(!keyseq.deleted())))
{
- UpdatableInset * inset = owner->view()->theLockingInset();
+ UpdatableInset * inset = view()->theLockingInset();
#if 1
int inset_x;
int dummy_y;
- inset->getCursorPos(owner->view(), inset_x, dummy_y);
+ inset->getCursorPos(view(), inset_x, dummy_y);
#endif
if ((action == LFUN_UNKNOWN_ACTION)
&& argument.empty()) {
- argument = keyseq.getiso();
+ argument = encoded_last_key;
}
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
- owner->view()->menuUndo();
+ view()->undo();
goto exit_with_message;
} else if (action == LFUN_REDO) {
- owner->view()->menuRedo();
+ view()->redo();
goto exit_with_message;
} else if (((result=inset->
// Hand-over to inset's own dispatch:
- localDispatch(owner->view(), action, argument)) ==
- UpdatableInset::DISPATCHED) ||
- (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ localDispatch(FuncRequest(view(), action, argument))) ==
+ DISPATCHED) ||
+ (result == DISPATCHED_NOUPDATE))
goto exit_with_message;
// If UNDISPATCHED, just soldier on
- else if (result == UpdatableInset::FINISHED) {
- if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(owner->view());
- moveCursorUpdate(true, false);
- owner->showState();
- }
- goto exit_with_message;
- } else if (result == UpdatableInset::FINISHED_RIGHT) {
- if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(owner->view());
- moveCursorUpdate(true, false);
- owner->showState();
- }
+ else if (result == FINISHED) {
+ 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);
+ owner->view_state_changed();
goto exit_with_message;
- } else if (result == UpdatableInset::FINISHED_UP) {
+ } else if (result == FINISHED_UP) {
if (TEXT()->cursor.irow()->previous()) {
#if 1
TEXT()->setCursorFromCoordinates(
- owner->view(), TEXT()->cursor.ix() + inset_x,
+ view(), TEXT()->cursor.ix() + inset_x,
TEXT()->cursor.iy() -
TEXT()->cursor.irow()->baseline() - 1);
TEXT()->cursor.x_fix(TEXT()->cursor.x());
#else
- TEXT()->cursorUp(owner->view());
+ TEXT()->cursorUp(view());
#endif
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
} else {
- owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
+ view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
}
goto exit_with_message;
- } else if (result == UpdatableInset::FINISHED_DOWN) {
+ } else if (result == FINISHED_DOWN) {
if (TEXT()->cursor.irow()->next()) {
#if 1
TEXT()->setCursorFromCoordinates(
- owner->view(), TEXT()->cursor.ix() + inset_x,
+ view(), TEXT()->cursor.ix() + inset_x,
TEXT()->cursor.iy() -
TEXT()->cursor.irow()->baseline() +
TEXT()->cursor.irow()->height() + 1);
TEXT()->cursor.x_fix(TEXT()->cursor.x());
#else
- TEXT()->cursorDown(owner->view());
+ TEXT()->cursorDown(view());
#endif
} else {
- TEXT()->cursorRight(owner->view());
+ TEXT()->cursorRight(view());
}
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
goto exit_with_message;
}
#warning I am not sure this is still right, please have a look! (Jug 20020417)
case LFUN_UNKNOWN_ACTION:
case LFUN_BREAKPARAGRAPH:
case LFUN_BREAKLINE:
- TEXT()->cursorRight(owner->view());
- owner->view()->setState();
- owner->showState();
+ TEXT()->cursorRight(view());
+ view()->switchKeyMap();
+ owner->view_state_changed();
break;
case LFUN_RIGHT:
if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(owner->view());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
}
goto exit_with_message;
case LFUN_LEFT:
if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(owner->view());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
}
goto exit_with_message;
case LFUN_DOWN:
if (TEXT()->cursor.row()->next())
- TEXT()->cursorDown(owner->view());
+ TEXT()->cursorDown(view());
else
- TEXT()->cursorRight(owner->view());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
goto exit_with_message;
default:
break;
case LFUN_ESCAPE:
{
- if (!owner->view()->available()) break;
+ if (!view()->available()) break;
// this function should be used always [asierra060396]
UpdatableInset * tli =
- owner->view()->theLockingInset();
+ view()->theLockingInset();
if (tli) {
UpdatableInset * lock = tli->getLockingInset();
if (tli == lock) {
- owner->view()->unlockInset(tli);
- TEXT()->cursorRight(owner->view());
+ view()->unlockInset(tli);
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
- owner->showState();
+ owner->view_state_changed();
} else {
- tli->unlockInsetInInset(owner->view(),
+ tli->unlockInsetInInset(view(),
lock,
true);
}
finishUndo();
// Tell the paragraph dialog that we changed paragraph
- owner->getDialogs()->updateParagraph();
+ owner->getDialogs().updateParagraph();
}
}
break;
} else {
searched_string = last_search;
}
- bool fw = (action == LFUN_WORDFINDBACKWARD);
+ bool fw = (action == LFUN_WORDFINDFORWARD);
if (!searched_string.empty()) {
- LyXFind(owner->view(), searched_string, fw);
+ lyxfind::LyXFind(view(), searched_string, fw);
}
-// owner->view()->showCursor();
+// view()->showCursor();
}
break;
case LFUN_PREFIX:
{
- if (owner->view()->available() && !owner->view()->theLockingInset()) {
- owner->view()->update(TEXT(),
+ if (view()->available() && !view()->theLockingInset()) {
+ view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR);
}
owner->message(keyseq.printOptions());
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
- {
- vector<string> allCmds;
- transform(lyxaction.func_begin(), lyxaction.func_end(),
- back_inserter(allCmds), lyx::firster());
- static vector<string> hist;
- owner->getMiniBuffer()->getString(MiniBuffer::spaces,
- allCmds, hist);
- }
- break;
+ owner->focus_command_buffer();
+ break;
case LFUN_CANCEL: // RVDK_PATCH_5
keyseq.reset();
meta_fake_bit = key_modifier::none;
- if (owner->view()->available())
+ if (view()->available())
// cancel any selection
dispatch(LFUN_MARK_OFF);
setMessage(N_("Cancel"));
break;
case LFUN_CENTER: // this is center and redraw.
- owner->view()->center();
+ view()->center();
break;
// --- Menus -----------------------------------------------
case LFUN_MENUNEW:
- menuNew(false);
+ menuNew(argument, false);
break;
case LFUN_MENUNEWTMPLT:
- menuNew(true);
+ menuNew(argument, true);
break;
case LFUN_CLOSEBUFFER:
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
ostringstream s1;
- s1 << _("Saving document") << ' '
- << MakeDisplayPath(owner->buffer()->fileName() + "...");
- owner->message(s1.str().c_str());
- MenuWrite(owner->view(), owner->buffer());
+#if USE_BOOST_FORMAT
+ s1 << boost::format(_("Saving document %1$s..."))
+ % MakeDisplayPath(owner->buffer()->fileName());
+#else
+ s1 << _("Saving document ")
+ << MakeDisplayPath(owner->buffer()->fileName())
+ << _("...");
+#endif
+ owner->message(STRCONV(s1.str()));
+ MenuWrite(view(), owner->buffer());
+ s1 << _(" done.");
+ owner->message(STRCONV(s1.str()));
} else
- WriteAs(owner->view(), owner->buffer());
+ WriteAs(view(), owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(owner->view(), owner->buffer(), argument);
+ WriteAs(view(), owner->buffer(), argument);
break;
case LFUN_MENURELOAD:
break;
case LFUN_MENUPRINT:
- owner->getDialogs()->showPrint();
+ owner->getDialogs().showPrint();
break;
case LFUN_EXPORT:
if (argument == "custom")
- owner->getDialogs()->showSendto();
+ owner->getDialogs().showSendto();
else
Exporter::Export(owner->buffer(), argument, false);
break;
break;
case LFUN_TOCVIEW:
-#if 0
- case LFUN_LOFVIEW:
- case LFUN_LOTVIEW:
- case LFUN_LOAVIEW:
-#endif
{
- InsetCommandParams p;
-
-#if 0
- if (action == LFUN_TOCVIEW)
-#endif
- p.setCmdName("tableofcontents");
-#if 0
- else if (action == LFUN_LOAVIEW)
- p.setCmdName("listof{algorithm}{List of Algorithms}");
- else if (action == LFUN_LOFVIEW)
- p.setCmdName("listoffigures");
- else
- p.setCmdName("listoftables");
-#endif
- owner->getDialogs()->createTOC(p.getAsString());
+ InsetCommandParams p("tableofcontents");
+ string const data = InsetCommandMailer::params2string("toc", p);
+ owner->getDialogs().show("toc", data, 0);
break;
}
- case LFUN_DIALOG_TABULAR_INSERT:
- owner->getDialogs()->showTabularCreate();
- break;
-
case LFUN_AUTOSAVE:
- AutoSave(owner->view());
+ AutoSave(view());
break;
case LFUN_UNDO:
- owner->view()->menuUndo();
+ view()->undo();
break;
case LFUN_REDO:
- owner->view()->menuRedo();
+ view()->redo();
break;
case LFUN_MENUSEARCH:
- owner->getDialogs()->showSearch();
+ owner->getDialogs().showSearch();
break;
case LFUN_REMOVEERRORS:
- if (owner->view()->removeAutoInsets()) {
- owner->view()->redraw();
- owner->view()->fitCursor();
+ if (view()->removeAutoInsets()) {
+#warning repaint() or update() or nothing ?
+ view()->repaint();
+ view()->fitCursor();
}
break;
case LFUN_DEPTH_MIN:
- changeDepth(owner->view(), TEXT(false), -1);
+ changeDepth(view(), TEXT(false), -1);
break;
case LFUN_DEPTH_PLUS:
- changeDepth(owner->view(), TEXT(false), 1);
+ changeDepth(view(), TEXT(false), 1);
break;
case LFUN_FREE:
- owner->getDialogs()->setUserFreeFont();
+ owner->getDialogs().setUserFreeFont();
break;
case LFUN_RECONFIGURE:
- Reconfigure(owner->view());
+ Reconfigure(view());
break;
#if 0
case LFUN_FLOATSOPERATE:
if (argument == "openfoot")
- owner->view()->allFloats(1,0);
+ view()->allFloats(1,0);
else if (argument == "closefoot")
- owner->view()->allFloats(0,0);
+ view()->allFloats(0,0);
else if (argument == "openfig")
- owner->view()->allFloats(1,1);
+ view()->allFloats(1,1);
else if (argument == "closefig")
- owner->view()->allFloats(0,1);
+ view()->allFloats(0,1);
break;
#else
#ifdef WITH_WARNINGS
#endif
#endif
case LFUN_HELP_ABOUTLYX:
- owner->getDialogs()->showAboutlyx();
+ owner->getDialogs().showAboutlyx();
break;
case LFUN_HELP_TEXINFO:
- owner->getDialogs()->showTexinfo();
+ owner->getDialogs().showTexinfo();
break;
case LFUN_HELP_OPEN:
setErrorMessage(N_("Missing argument"));
break;
}
- owner->prohibitInput();
string const fname = i18nLibFileSearch("doc", arg, "lyx");
if (fname.empty()) {
lyxerr << "LyX: unable to find documentation file `"
<< arg << "'. Bad installation?" << endl;
- owner->allowInput();
break;
}
ostringstream str;
- str << _("Opening help file") << ' '
- << MakeDisplayPath(fname) << "...";
- owner->message(str.str().c_str());
- owner->view()->buffer(bufferlist.loadLyXFile(fname, false));
- owner->allowInput();
+#if USE_BOOST_FORMAT
+ str << boost::format(_("Opening help file %1$s..."))
+ % MakeDisplayPath(fname);
+#else
+ str << _("Opening help file ")
+ << MakeDisplayPath(fname) << _("...");
+#endif
+ owner->message(STRCONV(str.str()));
+ view()->buffer(bufferlist.loadLyXFile(fname, false));
break;
}
case LFUN_VC_HISTORY:
{
- owner->getDialogs()->showVCLogFile();
+ owner->getDialogs().showVCLogFile();
break;
}
// --- buffers ----------------------------------------
case LFUN_SWITCHBUFFER:
- owner->view()->buffer(bufferlist.getBuffer(argument));
+ view()->buffer(bufferlist.getBuffer(argument));
break;
case LFUN_FILE_NEW:
{
// servercmd: argument must be <file>:<template>
- Buffer * tmpbuf = NewLyxFile(argument);
+ Buffer * tmpbuf = NewFile(argument);
if (tmpbuf)
- owner->view()->buffer(tmpbuf);
+ view()->buffer(tmpbuf);
}
break;
break;
case LFUN_LATEX_LOG:
- owner->getDialogs()->showLogFile();
+ owner->getDialogs().showLogFile();
break;
case LFUN_LAYOUT_DOCUMENT:
- owner->getDialogs()->showDocument();
+ owner->getDialogs().showDocument();
break;
case LFUN_LAYOUT_PARAGRAPH:
- owner->getDialogs()->showParagraph();
+ owner->getDialogs().showParagraph();
break;
case LFUN_LAYOUT_CHARACTER:
- owner->getDialogs()->showCharacter();
+ owner->getDialogs().showCharacter();
break;
case LFUN_LAYOUT_TABULAR:
- if (owner->view()->theLockingInset()) {
- if (owner->view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
+ if (view()->theLockingInset()) {
+ if (view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
InsetTabular * inset = static_cast<InsetTabular *>
- (owner->view()->theLockingInset());
- inset->openLayoutDialog(owner->view());
- } else if (owner->view()->theLockingInset()->
+ (view()->theLockingInset());
+ inset->openLayoutDialog(view());
+ } else if (view()->theLockingInset()->
getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
InsetTabular * inset = static_cast<InsetTabular *>(
- owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
- inset->openLayoutDialog(owner->view());
+ view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ inset->openLayoutDialog(view());
}
}
break;
case LFUN_LAYOUT_PREAMBLE:
- owner->getDialogs()->showPreamble();
+ owner->getDialogs().showPreamble();
break;
case LFUN_DROP_LAYOUTS_CHOICE:
- owner->getToolbar()->openLayoutList();
+ owner->getToolbar().openLayoutList();
break;
case LFUN_MENU_OPEN_BY_NAME:
- owner->getMenubar()->openByName(argument);
+ owner->getMenubar().openByName(argument);
break; // RVDK_PATCH_5
case LFUN_SPELLCHECK:
- if (lyxrc.isp_command != "none")
- owner->getDialogs()->showSpellchecker();
+ owner->getDialogs().showSpellchecker();
break;
// --- lyxserver commands ----------------------------
// Either change buffer or load the file
if (bufferlist.exists(s)) {
- owner->view()->buffer(bufferlist.getBuffer(s));
+ view()->buffer(bufferlist.getBuffer(s));
} else {
- owner->view()->buffer(bufferlist.loadLyXFile(s));
+ view()->buffer(bufferlist.loadLyXFile(s));
}
- // Set the cursor
- owner->view()->setCursorFromRow(row);
+ view()->setCursorFromRow(row);
- // Recenter screen
- owner->view()->center();
+ view()->center();
+ // see BufferView_pimpl::center()
+ view()->updateScrollbar();
}
break;
Paragraph * par = owner->buffer()->getParFromID(id);
if (par == 0) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
- << id << "]" << endl;
+ << id << ']' << endl;
break;
} else {
lyxerr[Debug::INFO] << "Paragraph " << par->id()
<< " found." << endl;
}
- if (owner->view()->theLockingInset())
- owner->view()->unlockInset(owner->view()->theLockingInset());
+ if (view()->theLockingInset())
+ view()->unlockInset(view()->theLockingInset());
if (par->inInset()) {
- par->inInset()->edit(owner->view());
+ par->inInset()->edit(view());
}
// Set the cursor
- owner->view()->getLyXText()->setCursor(owner->view(), par, 0);
- owner->view()->setState();
- owner->showState();
+ view()->getLyXText()->setCursor(view(), par, 0);
+ view()->switchKeyMap();
+ owner->view_state_changed();
- // Recenter screen
- owner->view()->center();
+ view()->center();
+ // see BufferView_pimpl::center()
+ view()->updateScrollbar();
}
break;
}
break;
- // --- toolbar ----------------------------------
- case LFUN_PUSH_TOOLBAR:
- {
- int nth = strToInt(argument);
- if (nth <= 0) {
- setErrorMessage(N_("Push-toolbar needs argument > 0"));
- } else {
- owner->getToolbar()->push(nth);
- }
- }
- break;
-
- case LFUN_ADD_TO_TOOLBAR:
- {
- if (lyxerr.debugging(Debug::GUI)) {
- lyxerr << "LFUN_ADD_TO_TOOLBAR:"
- "argument = `" << argument << '\'' << endl;
- }
- string tmp(argument);
- //lyxerr <<string("Argument: ") + argument);
- //lyxerr <<string("Tmp : ") + tmp);
- if (tmp.empty()) {
- setErrorMessage(N_("Usage: toolbar-add-to <LyX command>"));
- } else {
- owner->getToolbar()->add(argument, false);
- owner->getToolbar()->set();
- }
- }
- break;
-
// --- insert characters ----------------------------------------
// --- Mathed stuff. If we are here, there is no locked inset yet.
// passthrough hat and underscore outside mathed:
case LFUN_SUBSCRIPT:
- dispatch(LFUN_SELFINSERT, "_");
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, "_"));
break;
case LFUN_SUPERSCRIPT:
- dispatch(LFUN_SELFINSERT, "^");
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
break;
case LFUN_MATH_PANEL:
- owner->getDialogs()->showMathPanel();
- break;
+ owner->getDialogs().showMathPanel();
+ break;
+
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const & name = argument;
+ string data;
+ if (name == "bibitem" ||
+ name == "bibtex" ||
+ 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);
+ } else if (name == "ert") {
+ data = InsetERTMailer::params2string(name,
+ InsetERT::Open);
+ }
+ owner->getDialogs().show(name, data, 0);
+ }
+ break;
- case LFUN_CITATION_CREATE:
- {
- InsetCommandParams p("cite");
+ case LFUN_DIALOG_SHOW_NEXT_INSET: {
+ }
+ break;
- if (!argument.empty()) {
- // This should be set at source, ie when typing
- // "citation-insert foo" in the minibuffer.
- // Question: would pybibliographer also need to be
- // changed. Suspect so. Leave as-is therefore.
- if (contains(argument, "|")) {
- p.setContents(token(argument, '|', 0));
- p.setOptions( token(argument, '|', 1));
- } else {
- p.setContents(argument);
- }
- dispatch(LFUN_CITATION_INSERT, p.getAsString());
- } else
- owner->getDialogs()->createCitation(p.getAsString());
+ case LFUN_DIALOG_UPDATE: {
+ string const & name = argument;
+ // Can only update a dialog connected to an existing inset
+ InsetBase * i = owner->getDialogs().getOpenInset(name);
+ if (!i)
+ break;
+
+ if (name == "bibitem" ||
+ name == "bibtex" ||
+ name == "citation" ||
+ name == "index" ||
+ name == "ref" ||
+ name == "toc" ||
+ name == "url") {
+ InsetCommand * inset = dynamic_cast<InsetCommand *>(i);
+ if (!inset)
+ break;
+
+ InsetCommandMailer mailer(name, *inset);
+ mailer.updateDialog();
+
+ } else if (name == "error") {
+ InsetError * inset = dynamic_cast<InsetError *>(i);
+ if (!inset)
+ break;
+
+ owner->getDialogs().update("error",
+ inset->getContents());
+
+ } else if (name == "ert") {
+ InsetERT * inset = dynamic_cast<InsetERT *>(i);
+ if (!inset)
+ break;
+
+ InsetERTMailer mailer(*inset);
+ mailer.updateDialog();
+ }
}
break;
+ case LFUN_DIALOG_HIDE:
+ owner ->getDialogs().hide(argument);
+ break;
+
+ case LFUN_DIALOG_DISCONNECT_INSET:
+ owner->getDialogs().disconnect(argument);
+ break;
+
case LFUN_CHILDOPEN:
{
string const filename =
owner->buffer()->filePath());
setMessage(N_("Opening child document ") +
MakeDisplayPath(filename) + "...");
- owner->view()->savePosition(0);
+ view()->savePosition(0);
if (bufferlist.exists(filename))
- owner->view()->buffer(bufferlist.getBuffer(filename));
+ view()->buffer(bufferlist.getBuffer(filename));
else
- owner->view()->buffer(bufferlist.loadLyXFile(filename));
+ view()->buffer(bufferlist.loadLyXFile(filename));
}
break;
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
break;
- case LFUN_KMAP_OFF: // keymap off
- owner->getIntl()->KeyMapOn(false);
+ case LFUN_KMAP_OFF:
+ owner->getIntl().KeyMapOn(false);
break;
- case LFUN_KMAP_PRIM: // primary keymap
- owner->getIntl()->KeyMapPrim();
+ case LFUN_KMAP_PRIM:
+ owner->getIntl().KeyMapPrim();
break;
- case LFUN_KMAP_SEC: // secondary keymap
- owner->getIntl()->KeyMapSec();
+ case LFUN_KMAP_SEC:
+ owner->getIntl().KeyMapSec();
break;
- case LFUN_KMAP_TOGGLE: // toggle keymap
- owner->getIntl()->ToggleKeyMap();
+ case LFUN_KMAP_TOGGLE:
+ owner->getIntl().ToggleKeyMap();
break;
case LFUN_SEQUENCE:
{
// argument contains ';'-terminated commands
- while (argument.find(';') != string::npos) {
+ while (!argument.empty()) {
string first;
argument = split(argument, first, ';');
- verboseDispatch(first, false);
+ dispatch(first);
}
}
break;
case LFUN_DIALOG_PREFERENCES:
- owner->getDialogs()->showPreferences();
+ owner->getDialogs().showPreferences();
break;
case LFUN_SAVEPREFERENCES:
case LFUN_SCREEN_FONT_UPDATE:
{
// handle the screen font changes.
- //
lyxrc.set_font_norm_type();
- fontloader.update();
- // Of course we should only do the resize and the textcache.clear
- // if values really changed...but not very important right now. (Lgb)
- // All visible buffers will need resize
- owner->resize();
+ 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;
x11_name != lcolor.getX11Name(LColor::graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
- static string const err1 (N_("Set-color \""));
- static string const err2 (
- N_("\" failed - color is undefined "
- "or may not be redefined"));
- setErrorMessage(_(err1) + lyx_name + _(err2));
+#if USE_BOOST_FORMAT
+ setErrorMessage(
+ boost::io::str(
+ boost::format(
+ _("Set-color \"%1$s\" failed "
+ "- color is undefined or "
+ "may not be redefined"))
+ % lyx_name));
+#else
+ setErrorMessage(_("Set-color ") + lyx_name
+ + _(" failed - color is undefined"
+ " or may not be redefined"));
+#endif
+
break;
}
- lyxColorHandler->updateColor(lcolor.getFromLyXName(lyx_name));
+ lyx_gui::update_color(lcolor.getFromLyXName(lyx_name));
if (graphicsbg_changed) {
+#ifdef WITH_WARNINGS
+#warning FIXME!! The graphics cache no longer has a changeDisplay method.
+#endif
+#if 0
grfx::GCache & gc = grfx::GCache::get();
gc.changeDisplay(true);
+#endif
}
- owner->view()->redraw();
+ view()->repaint();
break;
}
owner->message(argument);
break;
- case LFUN_MESSAGE_PUSH:
- owner->messagePush(argument);
- break;
-
- case LFUN_MESSAGE_POP:
- owner->messagePop();
- break;
-
case LFUN_FORKS_SHOW:
- owner->getDialogs()->showForks();
+ owner->getDialogs().showForks();
break;
case LFUN_FORKS_KILL:
}
case LFUN_TOOLTIPS_TOGGLE:
- owner->getDialogs()->toggleTooltips();
+ owner->getDialogs().toggleTooltips();
break;
default:
// Then if it was none of the above
// Trying the BufferView::pimpl dispatch:
- if (!owner->view()->Dispatch(action, argument))
+ if (!view()->dispatch(ev))
lyxerr << "A truly unknown func ["
- << lyxaction.getActionName(action) << "]!"
+ << lyxaction.getActionName(ev.action) << "]!"
<< endl;
break;
} // end of switch
exit_with_message:
+ sendDispatchMessage(getMessage(), ev, verbose);
+}
- string const res = getMessage();
- if (!res.empty())
- owner->message(_(res));
+void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & ev, bool verbose)
+{
owner->updateMenubar();
owner->updateToolbar();
- return res;
+ if (ev.action == LFUN_SELFINSERT || !verbose) {
+ lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl;
+ if (!msg.empty())
+ owner->message(msg);
+ return;
+ }
+
+ string dispatch_msg = msg;
+ if (!dispatch_msg.empty())
+ dispatch_msg += ' ';
+
+ string comname = lyxaction.getActionName(ev.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;
+ argsadded = true;
+ }
+ }
+
+ string const shortcuts = toplevel_keymap->findbinding(pseudoaction);
+
+ if (!shortcuts.empty()) {
+ comname += ": " + shortcuts;
+ } else if (!argsadded && !ev.argument.empty()) {
+ comname += ' ' + ev.argument;
+ }
+
+ if (!comname.empty()) {
+ comname = rtrim(comname);
+ dispatch_msg += '(' + comname + ')';
+ }
+
+ lyxerr[Debug::ACTION] << "verbose dispatch msg " << dispatch_msg << endl;
+ if (!dispatch_msg.empty())
+ owner->message(dispatch_msg);
}
}
-void LyXFunc::menuNew(bool fromTemplate)
+void LyXFunc::menuNew(string const & name, bool fromTemplate)
{
string initpath = lyxrc.document_path;
+ string filename(name);
- if (owner->view()->available()) {
+ if (view()->available()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
}
static int newfile_number;
- string s;
-
- if (lyxrc.new_ask_filename) {
- FileDialog fileDlg(owner, _("Enter filename for new document"),
- LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents|#o#O")),
- string(lyxrc.document_path)),
- make_pair(string(_("Templates|#T#t")),
- string(lyxrc.template_path)));
-
- FileDialog::Result result =
- fileDlg.Select(initpath,
- _("*.lyx|LyX Documents (*.lyx)"),
- _("newfile"));
-
- if (result.second.empty()) {
- owner->message(_("Canceled."));
- lyxerr[Debug::INFO] << "New Document Cancelled." << endl;
- return;
- }
- // get absolute path of file and make sure the filename ends
- // with .lyx
- s = MakeAbsPath(result.second);
- if (!IsLyXFilename(s))
- s += ".lyx";
-
- // Check if the document already is open
- if (bufferlist.exists(s)) {
- switch (Alert::askConfirmation(_("Document is already open:"),
- MakeDisplayPath(s, 50),
- _("Do you want to close that document now?\n"
- "('No' will just switch to the open version)")))
- {
- case 1: // Yes: close the document
- if (!bufferlist.close(bufferlist.getBuffer(s)))
- // If close is canceled, we cancel here too.
- return;
- break;
- case 2: // No: switch to the open document
- owner->view()->buffer(bufferlist.getBuffer(s));
- return;
- case 3: // Cancel: Do nothing
- owner->message(_("Canceled."));
- return;
- }
- }
- // Check whether the file already exists
- FileInfo fi(s);
- if (fi.readable() &&
- Alert::askQuestion(_("File already exists:"),
- MakeDisplayPath(s, 50),
- _("Do you want to open the document?"))) {
- // loads document
- string const disp_fn(MakeDisplayPath(s));
-
- ostringstream str;
- str << _("Opening document") << ' '
- << disp_fn << "...";
-
- owner->message(str.str().c_str());
- //XFlush(fl_get_display());
- owner->view()->buffer(bufferlist.loadLyXFile(s));
- ostringstream str2;
- str2 << _("Document") << ' '
- << disp_fn << ' ' << _("opened.");
-
- owner->message(str2.str().c_str());
-
- return;
- }
- } else {
- s = AddName(lyxrc.document_path,
+ if (filename.empty()) {
+ filename = AddName(lyxrc.document_path,
"newfile" + tostr(++newfile_number) + ".lyx");
- FileInfo fi(s);
- while (bufferlist.exists(s) || fi.readable()) {
+ FileInfo fi(filename);
+ while (bufferlist.exists(filename) || fi.readable()) {
++newfile_number;
- s = AddName(lyxrc.document_path,
+ filename = AddName(lyxrc.document_path,
"newfile" + tostr(newfile_number) +
".lyx");
- fi.newFile(s);
+ fi.newFile(filename);
}
}
// The template stuff
string templname;
if (fromTemplate) {
- FileDialog fileDlg(owner, _("Select template file"),
+ FileDialog fileDlg(_("Select template file"),
LFUN_SELECT_FILE_SYNC,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
string(lyxrc.template_path)));
FileDialog::Result result =
- fileDlg.Select(lyxrc.template_path,
- _("*.lyx|LyX Documents (*.lyx)"));
+ fileDlg.open(lyxrc.template_path,
+ _("*.lyx| LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
return;
templname = fname;
}
- // find a free buffer
- lyxerr[Debug::INFO] << "Find a free buffer." << endl;
- owner->view()->buffer(bufferlist.newFile(s, templname));
+ view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
}
{
string initpath = lyxrc.document_path;
- if (owner->view()->available()) {
+ if (view()->available()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
string filename;
if (fname.empty()) {
- FileDialog fileDlg(owner, _("Select document to open"),
+ FileDialog fileDlg(_("Select document to open"),
LFUN_FILE_OPEN,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
string(AddPath(system_lyxdir, "examples"))));
FileDialog::Result result =
- fileDlg.Select(initpath,
- "*.lyx|LyX Documents (*.lyx)");
+ fileDlg.open(initpath,
+ _("*.lyx| LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
return;
// get absolute path of file and add ".lyx" to the filename if
// necessary
string const fullpath = FileSearch(string(), filename, "lyx");
- if (fullpath.empty()) {
- Alert::alert(_("Error"), _("Could not find file"), filename);
- return;
+ if (!fullpath.empty()) {
+ filename = fullpath;
}
- filename = fullpath;
-
- // loads document
string const disp_fn(MakeDisplayPath(filename));
+ // if the file doesn't exist, let the user create one
+ FileInfo const f(filename, true);
+ if (!f.exist()) {
+ if (!Alert::askQuestion(_("No such file"), disp_fn,
+ _("Start a new document with this filename ?"))) {
+ owner->message(_("Canceled."));
+ return;
+ }
+ // the user specifically chose this name. Believe them.
+ Buffer * buffer = bufferlist.newFile(filename, "", true);
+ view()->buffer(buffer);
+ return;
+ }
+
ostringstream str;
- str << _("Opening document") << ' ' << disp_fn << "...";
+#if USE_BOOST_FORMAT
+ str << boost::format(_("Opening document %1$s...")) % disp_fn;
+#else
+ str << _("Opening document ") << disp_fn << _("...");
+#endif
- owner->message(str.str().c_str());
+ owner->message(STRCONV(str.str()));
Buffer * openbuf = bufferlist.loadLyXFile(filename);
+ ostringstream str2;
if (openbuf) {
- owner->view()->buffer(openbuf);
- ostringstream str;
- str << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
- owner->message(str.str().c_str());
+ view()->buffer(openbuf);
+#if USE_BOOST_FORMAT
+ str2 << boost::format(_("Document %1$s opened.")) % disp_fn;
+#else
+ str2 << _("Document ") << disp_fn << _(" opened.");
+#endif
} else {
- ostringstream str;
- str << _("Could not open document") << ' ' << disp_fn;
- owner->message(str.str().c_str());
+#if USE_BOOST_FORMAT
+ str2 << boost::format(_("Could not open document %1$s"))
+ % disp_fn;
+#else
+ str2 << _("Could not open document ") << disp_fn;
+#endif
}
+ owner->message(STRCONV(str2.str()));
}
lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format
<< " file: " << filename << endl;
-
+
// need user interaction
if (filename.empty()) {
string initpath = lyxrc.document_path;
- if (owner->view()->available()) {
+ if (view()->available()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
initpath = trypath;
}
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Select %1$s file to import"));
+ fmt % formats.prettyName(format);
+ string const text = fmt.str();
+#else
string const text = _("Select ") + formats.prettyName(format)
- + _(" file to import");
+ + _(" file to import");;
+#endif
- FileDialog fileDlg(owner, text,
+ FileDialog fileDlg(text,
LFUN_IMPORT,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
- + " (*." + formats.extension(format) + ")";
+ + " (*." + formats.extension(format) + ')';
- FileDialog::Result result = fileDlg.Select(initpath,
+ FileDialog::Result result = fileDlg.open(initpath,
extension);
if (result.first == FileDialog::Later)
return;
break;
case 2:
- owner->view()->buffer(bufferlist.getBuffer(lyxfile));
+ view()->buffer(bufferlist.getBuffer(lyxfile));
return;
case 3:
owner->message(_("Canceled."));
}
}
- // if the file exists already, and we didn't do
+ // if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
if (!Alert::askQuestion(_("A document by the name"),
MakeDisplayPath(lyxfile), _("already exists. Overwrite?"))) {
- owner->message(_("Canceled"));
+ owner->message(_("Canceled."));
return;
}
}
{
string const fn = owner->buffer()->fileName();
if (bufferlist.close(owner->buffer()))
- owner->view()->buffer(bufferlist.loadLyXFile(fn));
+ view()->buffer(bufferlist.loadLyXFile(fn));
}
// need this otherwise SEGV may occur while trying to
// set variables that don't exist
// since there's no current buffer
- owner->getDialogs()->hideBufferDependent();
+ owner->getDialogs().hideBufferDependent();
} else {
- owner->view()->buffer(bufferlist.first());
+ view()->buffer(bufferlist.first());
}
}
}
}
-void LyXFunc::initMiniBuffer()
+string const LyXFunc::view_status_message()
{
- string text = _("Welcome to LyX!");
-
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey()) {
- text = keyseq.print();
- text += "M-";
+ return keyseq.print() + "M-";
}
// Else, when a non-complete key sequence is pressed,
// show the available options.
if (keyseq.length() > 0 && !keyseq.deleted()) {
- text = keyseq.printOptions();
- }
-
- // Else, show the buffer state.
- else if (owner->view()->available()) {
- Buffer * tmpbuf = owner->buffer();
-
- string const nicename =
- MakeDisplayPath(tmpbuf->fileName());
- // Should we do this instead? (kindo like emacs)
- // leaves more room for other information
- text = "LyX: ";
- text += nicename;
- if (tmpbuf->lyxvc.inUse()) {
- text += " [";
- text += tmpbuf->lyxvc.versionString();
- text += ' ';
- text += tmpbuf->lyxvc.locker();
- if (tmpbuf->isReadonly())
- text += " (RO)";
- text += ']';
- } else if (tmpbuf->isReadonly())
- text += " [RO]";
- if (!tmpbuf->isLyxClean())
- text += _(" (Changed)");
- } else {
- if (text != _("Welcome to LyX!")) // this is a hack
- text = _("* No document open *");
+ return keyseq.printOptions();
}
- owner->message(text);
+ if (!view()->available())
+ return _("Welcome to LyX!");
+
+ return currentState(view());
+}
+
+
+BufferView * LyXFunc::view() const
+{
+ lyx::Assert(owner);
+ return owner->view().get();
}