#include <config.h>
-#include "Lsstream.h"
-
-#include <ctime>
-#include <clocale>
-
-#include <utility>
-#include <algorithm>
-
-#include <cstdlib>
-#include <cctype>
-
#ifdef __GNUG__
#pragma implementation
#endif
-#include "support/lyxalgo.h"
-#include "support/LAssert.h"
+#include "lyxfunc.h"
#include "version.h"
#include "kbmap.h"
-#include "lyxfunc.h"
+#include "lyxrow.h"
#include "bufferlist.h"
#include "BufferView.h"
#include "ColorHandler.h"
#include "lyx_main.h"
#include "lyx_cb.h"
#include "LyXAction.h"
+#include "debug.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "gettext.h"
+#include "Lsstream.h"
+#include "trans_mgr.h"
+#include "layout.h"
+#include "WorkArea.h"
+#include "bufferview_funcs.h"
+#include "minibuffer.h"
+#include "vspace.h"
+#include "LyXView.h"
+#include "lyx_gui_misc.h"
+#include "FloatList.h"
+#include "converter.h"
+#include "exporter.h"
+#include "importer.h"
+#include "FontLoader.h"
+#include "TextCache.h"
+#include "lyxfind.h"
+#include "undo_funcs.h"
+#include "ParagraphParameters.h"
+
#include "insets/inseturl.h"
#include "insets/insetlatexaccent.h"
#include "insets/insettoc.h"
#endif
#include "insets/insettabular.h"
#include "insets/insetcaption.h"
+
#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
#include "mathed/math_inset.h"
-#include "minibuffer.h"
-#include "vspace.h"
-#include "LyXView.h"
-#include "lyx_gui_misc.h"
+
+#include "frontends/FileDialog.h"
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+#include "frontends/Alert.h"
+
+#include "graphics/GraphicsCache.h"
+
+#include "support/lyxalgo.h"
+#include "support/LAssert.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
-#include "support/syscall.h"
+#include "support/forkedcontr.h"
#include "support/lstrings.h"
#include "support/path.h"
#include "support/lyxfunctional.h"
-#include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "trans_mgr.h"
-#include "layout.h"
-#include "WorkArea.h"
-#include "bufferview_funcs.h"
-#include "frontends/FileDialog.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
-#include "FloatList.h"
-#include "converter.h"
-#include "exporter.h"
-#include "importer.h"
-#include "FontLoader.h"
-#include "TextCache.h"
-#include "lyxfind.h"
-#include "undo_funcs.h"
-#include "ParagraphParameters.h"
-#include "figureForm.h"
+
+#include <ctime>
+#include <clocale>
+#include <cstdlib>
+#include <cctype>
+
+#include <utility>
+#include <algorithm>
+
using std::pair;
using std::make_pair;
using std::endl;
using std::find_if;
+using std::vector;
+using std::transform;
+using std::back_inserter;
extern BufferList bufferlist;
extern LyXServer * lyxserver;
// (alkis)
extern tex_accent_struct get_accent(kb_action action);
-extern LyXTextClass::size_type current_layout;
-
extern void ShowLatexLog();
/* === globals =========================================================== */
-// Initialization of static member var
-bool LyXFunc::show_sc = true;
-
LyXFunc::LyXFunc(LyXView * o)
- : owner(o)
+ : owner(o),
+ keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
+ cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get())
{
meta_fake_bit = 0;
lyx_dead_action = LFUN_NOACTION;
lyx_calling_dead_action = LFUN_NOACTION;
- setupLocalKeymap();
}
{
char c = keyseq.getiso();
- if (keyseq.length != -1) c = 0;
+ if (keyseq.length() > 1) {
+ c = 0;
+ }
owner->getIntl()->getTrans()
.deadkey(c, get_accent(action).accent, TEXT(false));
- // Need to reset, in case the minibuffer calls these
+ // Need to clear, in case the minibuffer calls these
// actions
- keyseq.reset();
- keyseq.length = 0;
+ keyseq.clear();
// copied verbatim from do_accent_char
owner->view()->update(TEXT(false),
BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
// Dont remove this unless you know what you are doing.
meta_fake_bit = 0;
- if (action == 0) action = LFUN_PREFIX;
+ // can this happen now ?
+ if (action == LFUN_NOACTION) {
+ action = LFUN_PREFIX;
+ }
if (lyxerr.debugging(Debug::KEY)) {
- string buf;
- keyseq.print(buf);
lyxerr << "Key [action="
<< action << "]["
- << buf << "]"
+ << keyseq.print() << "]"
<< endl;
}
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (keyseq.length > 1 || keyseq.length < -1) {
- string buf;
- keyseq.print(buf);
- owner->message(buf);
+ if (keyseq.length() > 1 && !keyseq.deleted()) {
+ owner->message(keyseq.print());
}
- if (action == -1) {
+ if (action == LFUN_UNKNOWN_ACTION) {
// It is unknown, but what if we remove all
// the modifiers? (Lgb)
action = keyseq.addkey(keysym, 0);
<< "Action now set to ["
<< action << "]" << endl;
}
- if (action == -1) {
+ if (action == LFUN_UNKNOWN_ACTION) {
owner->message(_("Unknown function."));
return;
}
}
if (action == LFUN_SELFINSERT) {
- // This is very X dependant.
+ // This is very X dependent.
unsigned int c = keysym;
+ string argument;
- switch (c & 0x0000FF00) {
- // latin 1 byte 3 = 0
- case 0x00000000: break;
- // latin 2 byte 3 = 1
- case 0x00000100:
- // latin 3 byte 3 = 2
- case 0x00000200:
- // latin 4 byte 3 = 3
- case 0x00000300:
- // latin 8 byte 3 = 18 (0x12)
- case 0x00001200:
- // latin 9 byte 3 = 19 (0x13)
- case 0x00001300:
- c &= 0x000000FF;
- break;
- default:
- c = 0;
- break;
- }
+ c = kb_keymap::getiso(c);
+
if (c > 0)
argument = static_cast<char>(c);
+
+ dispatch(LFUN_SELFINSERT, argument);
lyxerr[Debug::KEY] << "SelfInsert arg[`"
<< argument << "']" << endl;
}
-
- bool tmp_sc = show_sc;
- show_sc = false;
- dispatch(action, argument);
- show_sc = tmp_sc;
-
- //return 0;
+ else
+ verboseDispatch(action, false);
}
-func_status::value_type LyXFunc::getStatus(int ac) const
+FuncStatus LyXFunc::getStatus(int ac) const
{
- return getStatus(ac, string());
+ kb_action action;
+ string argument;
+ action = lyxaction.retrieveActionArg(ac, argument);
+ return getStatus(action, argument);
}
-func_status::value_type LyXFunc::getStatus(int ac,
- string const & not_to_use_arg) const
+FuncStatus LyXFunc::getStatus(kb_action action,
+ string const & argument) const
{
- kb_action action;
- func_status::value_type flag = func_status::OK;
- string argument;
+ FuncStatus flag;
Buffer * buf = owner->buffer();
- if (lyxaction.isPseudoAction(ac))
- action = lyxaction.retrieveActionArg(ac, argument);
- else {
- action = static_cast<kb_action>(ac);
- if (!not_to_use_arg.empty())
- argument = not_to_use_arg; // exept here
- }
-
if (action == LFUN_UNKNOWN_ACTION) {
- setErrorMessage(N_("Unknown action"));
- return func_status::Unknown;
+ setStatusMessage(N_("Unknown action"));
+ return flag.unknown(true);
}
+
+ // 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)) {
!lyxaction.funcHasFlag(action,
LyXAction::ReadOnly)) {
// no
- setErrorMessage(N_("Document is read-only"));
- flag |= func_status::Disabled;
+ setStatusMessage(N_("Document is read-only"));
+ flag.disabled(true);
}
} else {
// no
- setErrorMessage(N_("Command not allowed with"
+ setStatusMessage(N_("Command not allowed with"
"out any document open"));
- flag |= func_status::Disabled;
- return flag;
+ return flag.disabled(true);
}
}
+ UpdatableInset * tli = owner->view()->theLockingInset();
+
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
bool disable = false;
case LFUN_SPELLCHECK:
disable = lyxrc.isp_command == "none";
break;
+#ifndef HAVE_LIBAIKSAURUS
+ case LFUN_THESAURUS_ENTRY:
+ disable = true;
+ break;
+#endif
case LFUN_RUNCHKTEX:
disable = lyxrc.chktex_command == "none";
break;
break;
case LFUN_LAYOUT_TABULAR:
- disable = true;
- if (owner->view()->theLockingInset()) {
- disable = (owner->view()->theLockingInset()->lyxCode() != Inset::TABULAR_CODE) &&
- !owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE);
- }
+ disable = !tli
+ || (tli->lyxCode() != Inset::TABULAR_CODE
+ && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
break;
+ case LFUN_LAYOUT:
+ case LFUN_LAYOUT_PARAGRAPH: {
+ Inset * inset = TEXT(false)->cursor.par()->inInset();
+ disable = inset && inset->forceDefaultParagraphs(inset);
+ break;
+ }
+
case LFUN_TABULAR_FEATURE:
disable = true;
- if (owner->view()->theLockingInset()) {
- func_status::value_type ret = func_status::Disabled;
- if (owner->view()->theLockingInset()->lyxCode() == Inset::TABULAR_CODE) {
- ret = static_cast<InsetTabular *>
- (owner->view()->theLockingInset())->
- getStatus(argument);
- } else if (owner->view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+ if (tli) {
+ FuncStatus ret;
+ //ret.disabled(true);
+ if (tli->lyxCode() == Inset::TABULAR_CODE) {
+ ret = static_cast<InsetTabular *>(tli)
+ ->getStatus(argument);
+ } else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
- (owner->view()->theLockingInset()->
- getFirstLockingInsetOfType(Inset::TABULAR_CODE))->
- getStatus(argument);
+ (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
+ ->getStatus(argument);
}
flag |= ret;
disable = false;
} else {
static InsetTabular inset(*owner->buffer(), 1, 1);
- func_status::value_type ret;
+ FuncStatus ret;
disable = true;
ret = inset.getStatus(argument);
- if ((ret & func_status::ToggleOn) ||
- (ret & func_status::ToggleOff))
- flag |= func_status::ToggleOff;
+ if (ret.onoff(true) || ret.onoff(false))
+ flag.setOnOff(false);
}
break;
break;
- case LFUN_INSET_TOGGLE:
- disable = (TEXT(false)->getInset() == 0);
+ case LFUN_INSET_TOGGLE: {
+ LyXText * lt = owner->view()->getLyXText();
+ disable = !(isEditableInset(lt->getInset())
+ || (lt->inset_owner
+ && lt->inset_owner->owner()
+ && lt->inset_owner->owner()->isOpen()));
break;
-
- case LFUN_MATH_VALIGN: {
- // I think this test can be simplified (Andre')
- // mathcursor is != 0 iff we are in math mode
- //Inset * tli = owner->view()->theLockingInset();
- //if (tli && (tli->lyxCode() == Inset::MATH_CODE
- // || tli->lyxCode() == Inset::MATHMACRO_CODE)) {
- //
+ }
+ case LFUN_MATH_VALIGN:
if (mathcursor) {
char align = mathcursor->valign();
if (align == '\0') {
break;
}
if (argument.empty()) {
- flag = func_status::OK;
+ flag.clear();
break;
}
if (!contains("tcb", argument[0])) {
disable = true;
break;
}
- if (argument[0] == align)
- flag |= func_status::ToggleOn;
- else
- flag |= func_status::ToggleOff;
+ flag.setOnOff(argument[0] == align);
} else
disable = true;
break;
- }
- case LFUN_MATH_HALIGN: {
- //Inset * tli = owner->view()->theLockingInset();
- //if (tli && (tli->lyxCode() == Inset::MATH_CODE
- // || tli->lyxCode() == Inset::MATHMACRO_CODE)) {
+
+ case LFUN_MATH_HALIGN:
if (mathcursor) {
char align = mathcursor->halign();
if (align == '\0') {
break;
}
if (argument.empty()) {
- flag = func_status::OK;
+ flag.clear();
break;
}
if (!contains("lcr", argument[0])) {
disable = true;
break;
}
- if (argument[0] == align)
- flag |= func_status::ToggleOn;
- else
- flag |= func_status::ToggleOff;
+ flag.setOnOff(argument[0] == align);
} else
disable = true;
break;
- }
- case LFUN_MATH_MUTATE: {
- Inset * tli = owner->view()->theLockingInset();
+
+ case LFUN_MATH_MUTATE:
if (tli && (tli->lyxCode() == Inset::MATH_CODE)) {
MathInsetTypes type = mathcursor->formula()->getType();
- func_status::value_type box = func_status::ToggleOff;
if (argument == "inline") {
- if (type == LM_OT_SIMPLE)
- box = func_status::ToggleOn;
+ flag.setOnOff(type == LM_OT_SIMPLE);
} else if (argument == "display") {
- if (type == LM_OT_EQUATION)
- box = func_status::ToggleOn;
+ flag.setOnOff(type == LM_OT_EQUATION);
} else if (argument == "eqnarray") {
- if (type == LM_OT_EQNARRAY)
- box = func_status::ToggleOn;
+ flag.setOnOff(type == LM_OT_EQNARRAY);
} else if (argument == "align") {
- if (type == LM_OT_ALIGN)
- box = func_status::ToggleOn;
+ flag.setOnOff(type == LM_OT_ALIGN);
} else {
- box = func_status::OK;
disable = true;
}
- flag |= box;
} else
disable = true;
break;
- }
// we just need to be in math mode to enable that
case LFUN_MATH_SIZE:
case LFUN_INSET_ERT:
code = Inset::ERT_CODE;
break;
- case LFUN_FIGURE:
case LFUN_INSET_GRAPHICS:
code = Inset::GRAPHICS_CODE;
break;
default:
break;
}
- if (code != Inset::NO_CODE
- && owner->view()->theLockingInset()
- && !owner->view()->theLockingInset()->insetAllowed(code)) {
+ if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code)) {
disable = true;
}
if (disable)
- flag |= func_status::Disabled;
+ flag.disabled(true);
- // the font related functions (and a few others)
- func_status::value_type box = func_status::ToggleOff;
- LyXFont const & font =
- TEXT(false)->real_current_font;
+ // A few general toggles
switch (action) {
- case LFUN_EMPH:
- if (font.emph() == LyXFont::ON)
- box = func_status::ToggleOn;
- break;
- case LFUN_NOUN:
- if (font.noun() == LyXFont::ON)
- box = func_status::ToggleOn;
- break;
- case LFUN_BOLD:
- if (font.series() == LyXFont::BOLD_SERIES)
- box = func_status::ToggleOn;
- break;
case LFUN_READ_ONLY_TOGGLE:
- if (buf->isReadonly())
- box = func_status::ToggleOn;
+ flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
- if (TEXT(false)->cursor.par()->params().startOfAppendix())
- box = func_status::ToggleOn;
+ flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+ break;
+ 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())
+ flag.setOnOff(true);
break;
default:
- box = func_status::OK;
break;
}
- flag |= box;
+ // the font related toggles
+ if (!mathcursor) {
+ LyXFont const & font = TEXT(false)->real_current_font;
+ switch (action) {
+ case LFUN_EMPH:
+ flag.setOnOff(font.emph() == LyXFont::ON);
+ break;
+ case LFUN_NOUN:
+ flag.setOnOff(font.noun() == LyXFont::ON);
+ break;
+ case LFUN_BOLD:
+ flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
+ break;
+ case LFUN_SANS:
+ flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
+ break;
+ case LFUN_ROMAN:
+ flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
+ break;
+ case LFUN_CODE:
+ flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
+ break;
+ default:
+ break;
+ }
+ }
+ else {
+ MathTextCodes tc = mathcursor->getLastCode();
+ switch (action) {
+ case LFUN_BOLD:
+ flag.setOnOff(tc == LM_TC_BF);
+ break;
+ case LFUN_SANS:
+ flag.setOnOff(tc == LM_TC_SF);
+ break;
+ case LFUN_EMPH:
+ flag.setOnOff(tc == LM_TC_CAL);
+ break;
+ case LFUN_ROMAN:
+ flag.setOnOff(tc == LM_TC_RM);
+ break;
+ case LFUN_CODE:
+ flag.setOnOff(tc == LM_TC_TT);
+ break;
+ case LFUN_NOUN:
+ flag.setOnOff(tc == LM_TC_BB);
+ break;
+ case LFUN_DEFAULT:
+ flag.setOnOff(tc == LM_TC_VAR);
+ break;
+ default:
+ break;
+ }
+ }
+
return flag;
}
// temporary dispatch method
void LyXFunc::miniDispatch(string const & s)
{
- if (!s.empty()) {
- dispatch(s);
+ string s2(frontStrip(strip(s)));
+
+ if (!s2.empty()) {
+ verboseDispatch(s2, true);
}
}
-string const LyXFunc::dispatch(string const & s)
+void LyXFunc::verboseDispatch(string const & s, bool show_sc)
{
- // Split command string into command and argument
- string cmd;
- string line = frontStrip(s);
- string const arg = strip(frontStrip(split(line, cmd, ' ')));
-
- return dispatch(lyxaction.LookupFunc(cmd), arg);
+ int action = lyxaction.LookupFunc(frontStrip(s));
+
+ if (action == LFUN_UNKNOWN_ACTION) {
+ string const msg = string(_("Unknown function ("))
+ + s + ")";
+ owner->message(msg);
+ } else {
+ verboseDispatch(action, show_sc);
+ }
}
-string const LyXFunc::dispatch(int ac,
- string const & do_not_use_this_arg)
+void LyXFunc::verboseDispatch(int ac, bool show_sc)
{
- lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << ac
- <<"] arg[" << do_not_use_this_arg << "]" << endl;
-
string argument;
kb_action action;
- // we have not done anything wrong yet.
- errorstat = false;
- dispatch_buffer.erase();
+ // get the real action and argument
+ action = lyxaction.retrieveActionArg(ac, argument);
+
+ verboseDispatch(action, argument, show_sc);
+}
+
+
+
+void LyXFunc::verboseDispatch(kb_action action,
+ string const & argument, bool show_sc)
+{
+ string res = dispatch(action, argument);
+
+ commandshortcut.erase();
- // if action is a pseudo-action, we need the real action
- if (lyxaction.isPseudoAction(ac)) {
- string tmparg;
- action = static_cast<kb_action>
- (lyxaction.retrieveActionArg(ac, tmparg));
- if (!tmparg.empty())
- argument = tmparg;
+ 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 {
- action = static_cast<kb_action>(ac);
- if (!do_not_use_this_arg.empty())
- argument = do_not_use_this_arg; // except here
+ owner->getMiniBuffer()->addSet(' ' + commandshortcut);
}
+}
+
+
+string const LyXFunc::dispatch(kb_action action, string argument)
+{
+ lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << action
+ <<"] arg[" << argument << "]" << endl;
+
+ // we have not done anything wrong yet.
+ errorstat = false;
+ dispatch_buffer.erase();
#ifdef NEW_DISPATCHER
// We try do call the most specific dispatcher first:
// 2. the bufferview's dispatch
// 3. the lyxview's dispatch
#endif
-
+
selection_possible = false;
-
+
if (owner->view()->available())
owner->view()->hideCursor();
// We cannot use this function here
- if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) {
- lyxerr << "LyXFunc::Dispatch: "
- << lyxaction.getActionName(ac)
- << " [" << ac << "] is disabled at this location"
+ if (getStatus(action, argument).disabled()) {
+ lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: "
+ << lyxaction.getActionName(action)
+ << " [" << action << "] is disabled at this location"
<< endl;
+ setErrorMessage(getStatusMessage());
goto exit_with_message;
}
if (owner->view()->available() && owner->view()->theLockingInset()) {
UpdatableInset::RESULT result;
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
- (keyseq.length >= -1)))
+ (!keyseq.deleted())))
{
- if ((action==LFUN_UNKNOWN_ACTION) && argument.empty()){
+ if ((action == LFUN_UNKNOWN_ACTION)
+ && argument.empty()) {
argument = keyseq.getiso();
}
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
-#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED
- int slx;
- int sly;
- UpdatableInset * inset =
- owner->view()->theLockingInset()->getLockingInset();
- int inset_id = inset->id();
- inset->getCursorPos(owner->view(), slx, sly);
- owner->view()->unlockInset(inset);
-#else
- owner->view()->unlockInset(owner->view()->theLockingInset());
-#endif
owner->view()->menuUndo();
-#ifdef RETHINK_THIS_FOR_NOW_WE_LEAVE_ALL_UNLOCKED
-#if 0
- if (TEXT()->cursor.par()->
- isInset(TEXT()->cursor.pos())) {
- inset = static_cast<UpdatableInset*>(
- TEXT()->cursor.par()->
- getInset(TEXT()->
- cursor.pos()));
- } else {
- inset = 0;
- }
-#else
- inset = static_cast<UpdatableInset *>(owner->view()->buffer()->getInsetFromID(inset_id));
-#endif
- if (inset)
- inset->edit(owner->view(),slx,sly,0);
-#endif
- return string();
+ goto exit_with_message;
} else if (action == LFUN_REDO) {
- int slx;
- int sly;
- UpdatableInset * inset = owner->view()->
- theLockingInset();
- inset->getCursorPos(owner->view(), slx, sly);
- owner->view()->unlockInset(inset);
owner->view()->menuRedo();
- inset = static_cast<UpdatableInset*>(
- TEXT()->cursor.par()->
- getInset(TEXT()->
- cursor.pos()));
- if (inset)
- inset->edit(owner->view(),slx,sly,0);
- return string();
+ goto exit_with_message;
} else if (((result=owner->view()->theLockingInset()->
+ // Hand-over to inset's own dispatch:
localDispatch(owner->view(), action, argument)) ==
UpdatableInset::DISPATCHED) ||
(result == UpdatableInset::DISPATCHED_NOUPDATE))
- return string();
+ 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();
}
- return string();
+ 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();
}
- return string();
+ goto exit_with_message;
} else if (result == UpdatableInset::FINISHED_UP) {
if (TEXT()->cursor.row()->previous()) {
TEXT()->cursorUp(owner->view());
moveCursorUpdate(true, false);
owner->showState();
}
- return string();
+ goto exit_with_message;
} else if (result == UpdatableInset::FINISHED_DOWN) {
if (TEXT()->cursor.row()->next())
TEXT()->cursorDown(owner->view());
TEXT()->cursorRight(owner->view());
moveCursorUpdate(true, false);
owner->showState();
- return string();
+ goto exit_with_message;
} else {
//setMessage(N_("Text mode"));
switch (action) {
moveCursorUpdate(true, false);
owner->showState();
}
- return string();
+ goto exit_with_message;
case LFUN_LEFT:
if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
TEXT()->cursorRight(owner->view());
moveCursorUpdate(true, false);
owner->showState();
}
- return string();
+ goto exit_with_message;
case LFUN_DOWN:
if (TEXT()->cursor.row()->next())
TEXT()->cursorDown(owner->view());
TEXT()->cursorRight(owner->view());
moveCursorUpdate(true, false);
owner->showState();
- return string();
+ goto exit_with_message;
default:
break;
}
}
switch (action) {
-
+
case LFUN_ESCAPE:
{
if (!owner->view()->available()) break;
-
// this function should be used always [asierra060396]
UpdatableInset * tli =
owner->view()->theLockingInset();
lock,
true);
}
+ finishUndo();
}
}
break;
owner->view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR);
}
- string buf;
- keyseq.print(buf, true);
- owner->message(buf);
+ owner->message(keyseq.print());
}
break;
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
{
- std::vector<string> allCmds;
- std::transform(lyxaction.func_begin(), lyxaction.func_end(),
- std::back_inserter(allCmds), lyx::firster());
- static std::vector<string> hist;
+ 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);
}
case LFUN_META_FAKE: // RVDK_PATCH_5
{
meta_fake_bit = Mod1Mask;
- string buf;
- keyseq.print(buf, true);
- setMessage(buf); // RVDK_PATCH_5
+ setMessage(keyseq.print());
}
break;
#endif
p.setCmdName("tableofcontents");
#if 0
- else if (action == LFUN_LOAVIEW )
+ else if (action == LFUN_LOAVIEW)
p.setCmdName("listof{algorithm}{List of Algorithms}");
else if (action == LFUN_LOFVIEW)
p.setCmdName("listoffigures");
owner->getDialogs()->showTabularCreate();
break;
- case LFUN_FIGURE:
- Figure();
- break;
-
case LFUN_AUTOSAVE:
AutoSave(owner->view());
break;
owner->getDialogs()->showLogFile();
break;
- case LFUN_LAYOUTNO:
- {
- lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (arg) " << argument << endl;
- int sel = strToInt(argument);
- lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (sel) "<< sel << endl;
-
- // Should this give a setMessage instead?
- if (sel == 0)
- return string(); // illegal argument
-
- --sel; // sel 1..., but layout 0...
-
- // Pretend we got the name instead.
- dispatch(int(LFUN_LAYOUT),
- textclasslist.NameOfLayout(owner->view()
- ->buffer()->params.textclass,
- sel));
- return string();
- }
-
case LFUN_LAYOUT_DOCUMENT:
owner->getDialogs()->showDocument();
break;
owner->getDialogs()->showPreamble();
break;
- case LFUN_LAYOUT_SAVE_DEFAULT:
- MenuLayoutSave(owner->view());
- break;
-
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar()->openLayoutList();
break;
case LFUN_NOTIFY:
{
- string buf;
- keyseq.print(buf);
- dispatch_buffer = buf;
+ dispatch_buffer = keyseq.print();
lyxserver->notifyClient(dispatch_buffer);
}
break;
case LFUN_GOTO_PARAGRAPH:
{
- istringstream istr(argument.c_str());
+ istringstream istr(argument.c_str());
int id;
istr >> id;
Paragraph * par = owner->buffer()->getParFromID(id);
if (par == 0) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
- << id << "]" << std::endl;
+ << id << "]" << endl;
break;
} else {
lyxerr << "Paragraph " << par->id()
<< " found." << endl;
}
+ if (owner->view()->theLockingInset())
+ owner->view()->unlockInset(owner->view()->theLockingInset());
+ if (par->inInset()) {
+ par->inInset()->edit(owner->view());
+ }
// Set the cursor
- owner->view()->text->setCursor(owner->view(), par, 0);
+ owner->view()->getLyXText()->setCursor(owner->view(), par, 0);
owner->view()->setState();
owner->showState();
}
break;
+ // passthrough hat and underscore outside mathed:
+ case LFUN_SUBSCRIPT:
+ dispatch(LFUN_SELFINSERT, "_");
+ break;
+ case LFUN_SUPERSCRIPT:
+ dispatch(LFUN_SELFINSERT, "^");
+ break;
+
case LFUN_MATH_PANEL:
owner->getDialogs()->showMathPanel();
break;
case LFUN_CITATION_CREATE:
{
- InsetCommandParams p( "cite" );
+ InsetCommandParams p("cite");
if (!argument.empty()) {
// This should be set at source, ie when typing
// 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) );
+ p.setContents(token(argument, '|', 0));
+ p.setOptions( token(argument, '|', 1));
} else {
- p.setContents( argument );
+ p.setContents(argument);
}
dispatch(LFUN_CITATION_INSERT, p.getAsString());
} else
- owner->getDialogs()->createCitation( p.getAsString() );
+ owner->getDialogs()->createCitation(p.getAsString());
}
break;
{
string const filename =
MakeAbsPath(argument,
- OnlyPath(owner->buffer()->fileName()));
+ owner->buffer()->filePath());
setMessage(N_("Opening child document ") +
MakeDisplayPath(filename) + "...");
owner->view()->savePosition(0);
while (argument.find(';') != string::npos) {
string first;
argument = split(argument, first, ';');
- dispatch(first);
+ verboseDispatch(first, false);
}
}
break;
break;
}
+ bool const graphicsbg_changed =
+ (lyx_name == lcolor.getLyXName(LColor::graphicsbg) &&
+ x11_name != lcolor.getX11Name(LColor::graphicsbg));
+
if (!lcolor.setColor(lyx_name, x11_name)) {
static string const err1 (N_("Set-color \""));
static string const err2 (
setErrorMessage(_(err1) + lyx_name + _(err2));
break;
}
+
lyxColorHandler->updateColor(lcolor.getFromLyXName(lyx_name));
+
+ if (graphicsbg_changed) {
+ grfx::GCache & gc = grfx::GCache::get();
+ gc.changeDisplay(true);
+ }
+
owner->view()->redraw();
break;
}
owner->messagePop();
break;
+ case LFUN_FORKS_SHOW:
+ owner->getDialogs()->showForks();
+ break;
+
+ case LFUN_FORKS_KILL:
+ {
+ if (!isStrInt(argument))
+ break;
+
+ pid_t const pid = strToInt(argument);
+ ForkedcallsController & fcc = ForkedcallsController::get();
+ fcc.kill(pid);
+ break;
+ }
+
default:
// Then if it was none of the above
+ // Trying the BufferView::pimpl dispatch:
if (!owner->view()->Dispatch(action, argument))
lyxerr << "A truly unknown func ["
<< lyxaction.getActionName(action) << "]!"
exit_with_message:
- commandshortcut.erase();
-
- if (lyxrc.display_shortcuts && show_sc) {
- if (action != LFUN_SELFINSERT) {
- // Put name of command and list of shortcuts
- // for it in minibuffer
- string comname = lyxaction.getActionName(action);
-
- int pseudoaction = action;
- bool argsadded = false;
-
- if (!argument.empty()) {
- // If we have the command with argument,
- // this is better
- pseudoaction =
- lyxaction.searchActionArg(action,
- argument);
-
- if (pseudoaction == -1) {
- pseudoaction = action;
- } else {
- comname += " " + argument;
- argsadded = true;
- }
- }
-
- string const shortcuts =
- toplevel_keymap->findbinding(pseudoaction);
-
- if (!shortcuts.empty()) {
- comname += ": " + shortcuts;
- } else if (!argsadded) {
- comname += " " + argument;
- }
-
- if (!comname.empty()) {
- comname = strip(comname);
- commandshortcut = "(" + comname + ')';
-
- // Here we could even add a small pause,
- // to annoy the user and make him learn
- // the shortcuts.
- // No! That will just annoy, not teach
- // anything. The user will read the messages
- // if they are interested. (Asger)
- }
- }
- }
-
string const res = getMessage();
- if (res.empty()) {
- if (!commandshortcut.empty()) {
- owner->getMiniBuffer()->addSet(commandshortcut);
- }
- } else {
- string const msg(_(res) + ' ' + commandshortcut);
- owner->message(msg);
- }
-
+ if (!res.empty())
+ owner->message(_(res));
+ owner->updateMenubar();
+ owner->updateToolbar();
+
return res;
}
string initpath = lyxrc.document_path;
if (owner->view()->available()) {
- string const trypath = owner->buffer()->filepath;
+ string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
initpath = trypath;
if (lyxrc.new_ask_filename) {
FileDialog fileDlg(owner, _("Enter filename for new document"),
LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents")),
+ make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
- make_pair(string(_("Templates")),
+ make_pair(string(_("Templates|#T#t")),
string(lyxrc.template_path)));
FileDialog::Result result =
// Check if the document already is open
if (bufferlist.exists(s)) {
- switch (AskConfirmation(_("Document is already open:"),
+ 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)")))
// Check whether the file already exists
FileInfo fi(s);
if (fi.readable() &&
- AskQuestion(_("File already exists:"),
+ Alert::askQuestion(_("File already exists:"),
MakeDisplayPath(s, 50),
_("Do you want to open the document?"))) {
// loads document
if (fromTemplate) {
FileDialog fileDlg(owner, _("Select template file"),
LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents")),
+ make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
- make_pair(string(_("Templates")),
+ make_pair(string(_("Templates|#T#t")),
string(lyxrc.template_path)));
FileDialog::Result result =
string initpath = lyxrc.document_path;
if (owner->view()->available()) {
- string const trypath = owner->buffer()->filepath;
+ string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
initpath = trypath;
if (fname.empty()) {
FileDialog fileDlg(owner, _("Select document to open"),
LFUN_FILE_OPEN,
- make_pair(string(_("Documents")),
+ make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
- make_pair(string(_("Examples")),
+ make_pair(string(_("Examples|#E#e")),
string(AddPath(system_lyxdir, "examples"))));
FileDialog::Result result =
// necessary
string const fullpath = FileSearch(string(), filename, "lyx");
if (fullpath.empty()) {
- WriteAlert(_("Error"), _("Could not find file"), filename);
+ Alert::alert(_("Error"), _("Could not find file"), filename);
return;
}
string initpath = lyxrc.document_path;
if (owner->view()->available()) {
- string const trypath = owner->buffer()->filepath;
+ string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (IsDirWriteable(trypath))
initpath = trypath;
FileDialog fileDlg(owner, text,
LFUN_IMPORT,
- make_pair(string(_("Documents")),
+ make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
- make_pair(string(_("Examples")),
+ make_pair(string(_("Examples|#E#e")),
string(AddPath(system_lyxdir, "examples"))));
string const extension = "*." + formats.extension(format)
// Check if the document already is open
if (bufferlist.exists(lyxfile)) {
- switch (AskConfirmation(_("Document is already open:"),
+ switch (Alert::askConfirmation(_("Document is already open:"),
MakeDisplayPath(lyxfile, 50),
_("Do you want to close that document now?\n"
"('No' will just switch to the open version)")))
// Check if a LyX document by the same root exists in filesystem
FileInfo const f(lyxfile, true);
- if (f.exist() && !AskQuestion(_("A document by the name"),
+ if (f.exist() && !Alert::askQuestion(_("A document by the name"),
MakeDisplayPath(lyxfile),
_("already exists. Overwrite?"))) {
owner->message(_("Canceled"));
}
-void LyXFunc::setMessage(string const & m)
+void LyXFunc::setMessage(string const & m) const
{
dispatch_buffer = m;
}
+void LyXFunc::setStatusMessage(string const & m) const
+{
+ status_buffer = m;
+}
+
+
void LyXFunc::initMiniBuffer()
{
string text = _("Welcome to LyX!");
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey()) {
- keyseqStr();
+ text = keyseq.print();
text += "M-";
}
// Else, when a non-complete key sequence is pressed,
// show the available options.
- else if (keyseqUncomplete())
- text = keyseqOptions();
+ if (keyseq.length() > 0 && !keyseq.deleted()) {
+ text = keyseq.printOptions();
+ }
// Else, show the buffer state.
else if (owner->view()->available()) {
projects / lyx.git / blobdiff