/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
#include "lyxrow.h"
#include "bufferlist.h"
#include "BufferView.h"
-#include "ColorHandler.h"
+#include "frontends/xforms/ColorHandler.h"
#include "lyxserver.h"
#include "intl.h"
#include "lyx_main.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 "frontends/LyXView.h"
#include "FloatList.h"
#include "converter.h"
#include "exporter.h"
#include "importer.h"
-#include "FontLoader.h"
+#include "frontends/font_loader.h"
#include "TextCache.h"
#include "lyxfind.h"
#include "undo_funcs.h"
#include "ParagraphParameters.h"
-#include "figureForm.h"
#include "insets/inseturl.h"
#include "insets/insetlatexaccent.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 <cstdlib>
#include <cctype>
-#include <utility>
-#include <algorithm>
+#include <utility>
+#include <algorithm>
using std::pair;
-using std::make_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;
extern bool selection_possible;
-extern void MenuSendto();
extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
void receiveCmd(string const & cmd) {}
///
void receiveArg(string const & arg) {}
-
-
+
+
private:
};
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get())
{
- meta_fake_bit = 0;
+ meta_fake_bit = key_modifier::none;
lyx_dead_action = LFUN_NOACTION;
lyx_calling_dead_action = LFUN_NOACTION;
}
}
owner->view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
owner->view()->showCursor();
-
+
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
owner->view()->setState();
if (keyseq.length() > 1) {
c = 0;
}
-
+
owner->getIntl()->getTrans()
.deadkey(c, get_accent(action).accent, TEXT(false));
// Need to clear, in case the minibuffer calls these
}
-void LyXFunc::processKeySym(KeySym keysym, unsigned int state)
+void LyXFunc::processKeySym(KeySym 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 << "] State is ["
- << state << "]"
+ << keysym
<< endl;
}
// Do nothing if we have nothing (JMarc)
|| keysym == XK_Mode_switch || keysym == 0x0) {
return;
}
-
+
// 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
- &(ShiftMask|ControlMask
- |Mod1Mask));
+ int action = cancel_meta_seq.addkey(keysym, state);
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "action first set to [" << action << "]" << endl;
}
-
- // When not cancel or meta-fake, do the normal lookup.
+
+ // 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 = 0. RVDK_PATCH_5.
+ // 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)
- &(ShiftMask|ControlMask
- |Mod1Mask));
+ action = keyseq.addkey(keysym, (state | meta_fake_bit));
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "action now set to ["
<< action << "]" << endl;
}
}
// Dont remove this unless you know what you are doing.
- meta_fake_bit = 0;
-
- // can this happen now ?
+ meta_fake_bit = key_modifier::none;
+
+ // can this happen now ?
if (action == LFUN_NOACTION) {
action = LFUN_PREFIX;
}
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (keyseq.length() > 1 && !keyseq.deleted()) {
+ if (keyseq.length() > 1) {
owner->message(keyseq.print());
}
if (action == LFUN_UNKNOWN_ACTION) {
// It is unknown, but what if we remove all
// the modifiers? (Lgb)
- action = keyseq.addkey(keysym, 0);
+ action = keyseq.addkey(keysym, key_modifier::none);
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Removing modifiers...\n"
// This is very X dependent.
unsigned int c = keysym;
string argument;
-
+
c = kb_keymap::getiso(c);
if (c > 0)
argument = static_cast<char>(c);
-
+
dispatch(LFUN_SELFINSERT, argument);
lyxerr[Debug::KEY] << "SelfInsert arg[`"
<< argument << "']" << endl;
}
else
verboseDispatch(action, false);
-}
+}
FuncStatus LyXFunc::getStatus(int ac) const
{
FuncStatus flag;
Buffer * buf = owner->buffer();
-
+
+ if (action == LFUN_NOACTION) {
+ setStatusMessage(N_("Nothing to do"));
+ return flag.disabled(true);
+ }
+
if (action == LFUN_UNKNOWN_ACTION) {
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)) {
// Yes we need a buffer, do we have one?
if (buf) {
// yes
// Can we use a readonly buffer?
- if (buf->isReadonly() &&
+ if (buf->isReadonly() &&
!lyxaction.funcHasFlag(action,
LyXAction::ReadOnly)) {
// no
}
}
+ 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;
- switch (action) {
+ bool disable = false;
+ switch (action) {
case LFUN_MENUPRINT:
disable = !Exporter::IsExportable(buf, "dvi")
|| lyxrc.print_command == "none";
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()) {
+ if (tli) {
FuncStatus ret;
//ret.disabled(true);
- 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->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;
disable = true;
ret = inset.getStatus(argument);
- if (ret.onoff(true) || ret.onoff(false)) flag.setOnOff(false);
+ 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)) {
- //
- if (mathcursor) {
+ }
+ case LFUN_MATH_VALIGN:
+ if (mathcursor && mathcursor->formula()->getType() != LM_OT_SIMPLE) {
char align = mathcursor->valign();
if (align == '\0') {
disable = true;
} 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)) {
- if (mathcursor) {
+
+ case LFUN_MATH_HALIGN:
+ if (mathcursor && mathcursor->formula()->getType() != LM_OT_SIMPLE) {
char align = mathcursor->halign();
if (align == '\0') {
disable = true;
} 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();
if (argument == "inline") {
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
disable = true;
break;
- }
// we just need to be in math mode to enable that
- case LFUN_MATH_SIZE:
+ case LFUN_MATH_SIZE:
case LFUN_MATH_SPACE:
- case LFUN_MATH_LIMITS:
- case LFUN_MATH_NONUMBER:
+ case LFUN_MATH_LIMITS:
+ case LFUN_MATH_NONUMBER:
case LFUN_MATH_NUMBER:
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();
+ 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:
// the functions which insert insets
Inset::Code code = Inset::NO_CODE;
switch (action) {
- case LFUN_INSET_TEXT:
- code = Inset::TEXT_CODE;
- break;
case LFUN_INSET_ERT:
- code = Inset::ERT_CODE;
+ code = Inset::ERT_CODE;
break;
- case LFUN_FIGURE:
case LFUN_INSET_GRAPHICS:
code = Inset::GRAPHICS_CODE;
break;
case LFUN_MENU_SEPARATOR:
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
- case LFUN_PROTECTEDSPACE:
code = Inset::SPECIALCHAR_CODE;
break;
+ case LFUN_PROTECTEDSPACE:
+ // slight hack: we know this is allowed in math mode
+ if (!mathcursor)
+ code = Inset::SPECIALCHAR_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.disabled(true);
-
+
// A few general toggles
switch (action) {
+ case LFUN_TOOLTIPS_TOGGLE:
+ flag.setOnOff(owner->getDialogs()->tooltipsEnabled());
+ break;
+
case LFUN_READ_ONLY_TOGGLE:
flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
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:
break;
}
}
}
else {
- MathTextCodes tc = mathcursor->getLastCode();
+ string tc = mathcursor->getLastCode();
switch (action) {
case LFUN_BOLD:
- flag.setOnOff(tc == LM_TC_BF);
+ flag.setOnOff(tc == "mathbf");
break;
case LFUN_SANS:
- flag.setOnOff(tc == LM_TC_SF);
+ flag.setOnOff(tc == "mathsf");
break;
case LFUN_EMPH:
- flag.setOnOff(tc == LM_TC_CAL);
+ flag.setOnOff(tc == "mathcal");
break;
case LFUN_ROMAN:
- flag.setOnOff(tc == LM_TC_RM);
+ flag.setOnOff(tc == "mathrm");
break;
case LFUN_CODE:
- flag.setOnOff(tc == LM_TC_TT);
+ flag.setOnOff(tc == "mathtt");
break;
case LFUN_NOUN:
- flag.setOnOff(tc == LM_TC_BB);
+ flag.setOnOff(tc == "mathbb");
break;
case LFUN_DEFAULT:
- flag.setOnOff(tc == LM_TC_VAR);
+ flag.setOnOff(tc == "mathnormal");
break;
default:
break;
}
}
-
+
return flag;
}
// temporary dispatch method
-void LyXFunc::miniDispatch(string const & s)
+void LyXFunc::miniDispatch(string const & s)
{
- string s2(frontStrip(strip(s)));
-
+ string s2(frontStrip(strip(s)));
+
if (!s2.empty()) {
verboseDispatch(s2, true);
}
}
-void LyXFunc::verboseDispatch(string const & s, bool show_sc)
+void LyXFunc::verboseDispatch(string const & s, bool show_sc)
{
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);
- }
+ }
}
-void LyXFunc::verboseDispatch(int ac, bool show_sc)
+void LyXFunc::verboseDispatch(int ac, bool show_sc)
{
string argument;
kb_action action;
-
+
// get the real action and argument
action = lyxaction.retrieveActionArg(ac, argument);
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 =
+ pseudoaction =
lyxaction.searchActionArg(action,
- argument);
+ argument);
if (pseudoaction == LFUN_UNKNOWN_ACTION) {
pseudoaction = action;
commandshortcut = "(" + comname + ')';
}
}
- }
+ }
if (res.empty()) {
if (!commandshortcut.empty()) {
lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: action[" << action
<<"] arg[" << argument << "]" << endl;
- // we have not done anything wrong yet.
- errorstat = false;
+ // we have not done anything wrong yet.
+ errorstat = false;
dispatch_buffer.erase();
#ifdef NEW_DISPATCHER
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
(!keyseq.deleted())))
{
+ UpdatableInset * inset = owner->view()->theLockingInset();
+#if 1
+ int inset_x;
+ int dummy_y;
+ inset->getCursorPos(owner->view(), inset_x, dummy_y);
+#endif
if ((action == LFUN_UNKNOWN_ACTION)
- && argument.empty()){
+ && argument.empty()) {
argument = keyseq.getiso();
}
// Undo/Redo is a bit tricky for insets.
} else if (action == LFUN_REDO) {
owner->view()->menuRedo();
goto exit_with_message;
- } else if (((result=owner->view()->theLockingInset()->
- localDispatch(owner->view(), action, argument)) ==
- UpdatableInset::DISPATCHED) ||
- (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ } else if (((result=inset->
+ // Hand-over to inset's own dispatch:
+ localDispatch(owner->view(), action, argument)) ==
+ UpdatableInset::DISPATCHED) ||
+ (result == UpdatableInset::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());
}
goto exit_with_message;
} else if (result == UpdatableInset::FINISHED_UP) {
- if (TEXT()->cursor.row()->previous()) {
+ if (TEXT()->cursor.irow()->previous()) {
+#if 1
+ TEXT()->setCursorFromCoordinates(
+ owner->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());
+#endif
moveCursorUpdate(true, false);
owner->showState();
+ } else {
+ owner->view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
}
goto exit_with_message;
} else if (result == UpdatableInset::FINISHED_DOWN) {
- if (TEXT()->cursor.row()->next())
+ if (TEXT()->cursor.irow()->next()) {
+#if 1
+ TEXT()->setCursorFromCoordinates(
+ owner->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());
- else
+#endif
+ } else {
TEXT()->cursorRight(owner->view());
+ }
moveCursorUpdate(true, false);
owner->showState();
goto exit_with_message;
- } else {
+ }
+#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:
owner->showState();
}
goto exit_with_message;
- case LFUN_LEFT:
+ case LFUN_LEFT:
if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
TEXT()->cursorRight(owner->view());
moveCursorUpdate(true, false);
}
switch (action) {
-
+
case LFUN_ESCAPE:
{
if (!owner->view()->available()) break;
owner->view()->theLockingInset();
if (tli) {
UpdatableInset * lock = tli->getLockingInset();
-
+
if (tli == lock) {
owner->view()->unlockInset(tli);
TEXT()->cursorRight(owner->view());
true);
}
finishUndo();
+ // Tell the paragraph dialog that we changed paragraph
+ owner->getDialogs()->updateParagraph();
}
}
break;
-
+
// --- Misc -------------------------------------------
- case LFUN_WORDFINDFORWARD :
+ case LFUN_WORDFINDFORWARD :
case LFUN_WORDFINDBACKWARD : {
static string last_search;
string searched_string;
-
+
if (!argument.empty()) {
last_search = argument;
searched_string = argument;
// owner->view()->showCursor();
}
break;
-
+
case LFUN_PREFIX:
{
if (owner->view()->available() && !owner->view()->theLockingInset()) {
owner->view()->update(TEXT(),
BufferView::SELECT|BufferView::FITCUR);
}
- owner->message(keyseq.print());
+ owner->message(keyseq.printOptions());
}
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);
}
break;
-
+
case LFUN_CANCEL: // RVDK_PATCH_5
keyseq.reset();
- meta_fake_bit = 0;
+ meta_fake_bit = key_modifier::none;
if (owner->view()->available())
// cancel any selection
dispatch(LFUN_MARK_OFF);
case LFUN_META_FAKE: // RVDK_PATCH_5
{
- meta_fake_bit = Mod1Mask;
+ meta_fake_bit = key_modifier::alt;
setMessage(keyseq.print());
}
- break;
+ break;
case LFUN_READ_ONLY_TOGGLE:
if (owner->buffer()->lyxvc.inUse()) {
!owner->buffer()->isReadonly());
}
break;
-
+
case LFUN_CENTER: // this is center and redraw.
owner->view()->center();
break;
-
+
// --- Menus -----------------------------------------------
case LFUN_MENUNEW:
menuNew(false);
break;
-
+
case LFUN_MENUNEWTMPLT:
menuNew(true);
break;
-
+
case LFUN_CLOSEBUFFER:
closeBuffer();
break;
-
+
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
ostringstream s1;
} else
WriteAs(owner->view(), owner->buffer());
break;
-
+
case LFUN_WRITEAS:
WriteAs(owner->view(), owner->buffer(), argument);
break;
-
+
case LFUN_MENURELOAD:
reloadBuffer();
break;
-
+
case LFUN_UPDATE:
Exporter::Export(owner->buffer(), argument, true);
break;
case LFUN_PREVIEW:
Exporter::Preview(owner->buffer(), argument);
break;
-
- case LFUN_BUILDPROG:
+
+ case LFUN_BUILDPROG:
Exporter::Export(owner->buffer(), "program", true);
- break;
-
- case LFUN_RUNCHKTEX:
+ break;
+
+ case LFUN_RUNCHKTEX:
MenuRunChktex(owner->buffer());
break;
-
+
case LFUN_MENUPRINT:
owner->getDialogs()->showPrint();
break;
case LFUN_EXPORT:
if (argument == "custom")
- MenuSendto();
+ owner->getDialogs()->showSendto();
else
Exporter::Export(owner->buffer(), argument, false);
break;
case LFUN_IMPORT:
doImport(argument);
break;
-
+
case LFUN_QUIT:
QuitLyX();
break;
-
+
case LFUN_TOCVIEW:
#if 0
case LFUN_LOFVIEW:
#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");
#endif
owner->getDialogs()->createTOC(p.getAsString());
break;
- }
+ }
case LFUN_DIALOG_TABULAR_INSERT:
owner->getDialogs()->showTabularCreate();
break;
-
- case LFUN_FIGURE:
- Figure();
- break;
case LFUN_AUTOSAVE:
AutoSave(owner->view());
break;
-
+
case LFUN_UNDO:
owner->view()->menuUndo();
break;
-
+
case LFUN_REDO:
owner->view()->menuRedo();
break;
-
+
case LFUN_MENUSEARCH:
owner->getDialogs()->showSearch();
break;
-
+
case LFUN_REMOVEERRORS:
if (owner->view()->removeAutoInsets()) {
owner->view()->redraw();
}
break;
- case LFUN_DEPTH:
- changeDepth(owner->view(), TEXT(false), 0);
- break;
-
case LFUN_DEPTH_MIN:
changeDepth(owner->view(), TEXT(false), -1);
break;
-
+
case LFUN_DEPTH_PLUS:
changeDepth(owner->view(), TEXT(false), 1);
break;
-
+
case LFUN_FREE:
owner->getDialogs()->setUserFreeFont();
break;
owner->getDialogs()->showTexinfo();
break;
- case LFUN_HELP_OPEN:
+ case LFUN_HELP_OPEN:
{
string const arg = argument;
if (arg.empty()) {
owner->view()->buffer(bufferlist.loadLyXFile(fname, false));
owner->allowInput();
break;
- }
+ }
// --- version control -------------------------------
case LFUN_VC_REGISTER:
owner->buffer()->lyxvc.registrer();
}
break;
-
+
case LFUN_VC_CHECKIN:
{
if (owner->buffer()->lyxvc.inUse()
owner->buffer()->lyxvc.checkIn();
}
break;
-
+
case LFUN_VC_CHECKOUT:
{
if (owner->buffer()->lyxvc.inUse()
owner->buffer()->lyxvc.checkOut();
}
break;
-
+
case LFUN_VC_REVERT:
{
owner->buffer()->lyxvc.revert();
}
break;
-
+
case LFUN_VC_UNDO:
{
owner->buffer()->lyxvc.undoLast();
}
break;
-
+
case LFUN_VC_HISTORY:
{
owner->getDialogs()->showVCLogFile();
break;
}
-
+
// --- buffers ----------------------------------------
- case LFUN_SWITCHBUFFER:
- owner->view()->buffer(bufferlist.getBuffer(argument));
+ case LFUN_SWITCHBUFFER:
+ owner->view()->buffer(bufferlist.getBuffer(argument));
break;
case LFUN_FILE_NEW:
owner->view()->buffer(tmpbuf);
}
break;
-
+
case LFUN_FILE_OPEN:
open(argument);
break;
case LFUN_LATEX_LOG:
owner->getDialogs()->showLogFile();
break;
-
+
case LFUN_LAYOUT_DOCUMENT:
owner->getDialogs()->showDocument();
break;
-
+
case LFUN_LAYOUT_PARAGRAPH:
owner->getDialogs()->showParagraph();
break;
-
+
case LFUN_LAYOUT_CHARACTER:
owner->getDialogs()->showCharacter();
break;
case LFUN_LAYOUT_PREAMBLE:
owner->getDialogs()->showPreamble();
break;
-
+
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar()->openLayoutList();
break;
case LFUN_MENU_OPEN_BY_NAME:
owner->getMenubar()->openByName(argument);
break; // RVDK_PATCH_5
-
+
case LFUN_SPELLCHECK:
if (lyxrc.isp_command != "none")
owner->getDialogs()->showSpellchecker();
break;
-
+
// --- lyxserver commands ----------------------------
<< owner->buffer()->fileName()
<< "] " << endl;
break;
-
+
case LFUN_NOTIFY:
{
dispatch_buffer = keyseq.print();
// Either change buffer or load the file
if (bufferlist.exists(s)) {
- owner->view()->buffer(bufferlist.getBuffer(s));
+ owner->view()->buffer(bufferlist.getBuffer(s));
} else {
- owner->view()->buffer(bufferlist.loadLyXFile(s));
+ owner->view()->buffer(bufferlist.loadLyXFile(s));
}
-
- // Set the cursor
+
+ // Set the cursor
owner->view()->setCursorFromRow(row);
// Recenter screen
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;
+ lyxerr[Debug::INFO] << "Paragraph " << par->id()
+ << " found." << endl;
}
if (owner->view()->theLockingInset())
}
}
break;
-
+
case LFUN_ADD_TO_TOOLBAR:
{
if (lyxerr.debugging(Debug::GUI)) {
}
}
break;
-
+
// --- insert characters ----------------------------------------
// --- Mathed stuff. If we are here, there is no locked inset yet.
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
// "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) );
+ 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;
-
+
case LFUN_CHILDOPEN:
{
string const filename =
- MakeAbsPath(argument,
+ MakeAbsPath(argument,
owner->buffer()->filePath());
setMessage(N_("Opening child document ") +
MakeDisplayPath(filename) + "...");
case LFUN_TOGGLECURSORFOLLOW:
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
break;
-
+
case LFUN_KMAP_OFF: // keymap off
owner->getIntl()->KeyMapOn(false);
break;
-
+
case LFUN_KMAP_PRIM: // primary keymap
owner->getIntl()->KeyMapPrim();
break;
-
+
case LFUN_KMAP_SEC: // secondary keymap
owner->getIntl()->KeyMapSec();
break;
-
+
case LFUN_KMAP_TOGGLE: // toggle keymap
owner->getIntl()->ToggleKeyMap();
break;
- case LFUN_SEQUENCE:
+ case LFUN_SEQUENCE:
{
// argument contains ';'-terminated commands
while (argument.find(';') != string::npos) {
case LFUN_DIALOG_PREFERENCES:
owner->getDialogs()->showPreferences();
break;
-
+
case LFUN_SAVEPREFERENCES:
{
Path p(user_lyxdir);
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();
+ owner->view()->resize();
// We also need to empty the textcache so that
// the buffer will be formatted correctly after
// a zoom change.
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;
+ }
+
+ case LFUN_TOOLTIPS_TOGGLE:
+ owner->getDialogs()->toggleTooltips();
+ 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) << "]!"
owner->message(_(res));
owner->updateMenubar();
owner->updateToolbar();
-
+
return res;
}
static int newfile_number;
string s;
-
+
if (lyxrc.new_ask_filename) {
FileDialog fileDlg(owner, _("Enter filename for new document"),
LFUN_SELECT_FILE_SYNC,
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);
// Check whether the file already exists
FileInfo fi(s);
if (fi.readable() &&
- Alert::askQuestion(_("File already exists:"),
+ 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 {
FileDialog::Result result =
fileDlg.Select(lyxrc.template_path,
_("*.lyx|LyX Documents (*.lyx)"));
-
+
if (result.first == FileDialog::Later)
return;
string const fname = result.second;
- if (fname.empty())
+ if (fname.empty())
return;
- templname = fname;
+ templname = fname;
}
-
+
// find a free buffer
lyxerr[Debug::INFO] << "Find a free buffer." << endl;
owner->view()->buffer(bufferlist.newFile(s, templname));
void LyXFunc::open(string const & fname)
{
string initpath = lyxrc.document_path;
-
+
if (owner->view()->available()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
}
string filename;
-
+
if (fname.empty()) {
FileDialog fileDlg(owner, _("Select document to open"),
LFUN_FILE_OPEN,
FileDialog::Result result =
fileDlg.Select(initpath,
"*.lyx|LyX Documents (*.lyx)");
-
+
if (result.first == FileDialog::Later)
return;
filename = result.second;
-
+
// check selected filename
if (filename.empty()) {
owner->message(_("Canceled."));
}
filename = fullpath;
-
+
// loads document
string const disp_fn(MakeDisplayPath(filename));
ostringstream str;
str << _("Opening document") << ' ' << disp_fn << "...";
-
+
owner->message(str.str().c_str());
Buffer * openbuf = bufferlist.loadLyXFile(filename);
}
-// checks for running without gui are missing.
void LyXFunc::doImport(string const & argument)
{
string format;
string filename = split(argument, format, ' ');
- lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format
- << " file: " << filename << endl;
- if (filename.empty()) { // need user interaction
+ lyxerr[Debug::INFO] << "LyXFunc::doImport: " << format
+ << " file: " << filename << endl;
+
+ // need user interaction
+ if (filename.empty()) {
string initpath = lyxrc.document_path;
-
+
if (owner->view()->available()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
string const text = _("Select ") + formats.prettyName(format)
+ _(" file to import");
- FileDialog fileDlg(owner, text,
+ FileDialog fileDlg(owner, text,
LFUN_IMPORT,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
string(AddPath(system_lyxdir, "examples"))));
-
+
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
+ " (*." + formats.extension(format) + ")";
return;
filename = result.second;
-
+
// check selected filename
if (filename.empty())
owner->message(_("Canceled."));
}
- // still no filename? abort
- if (filename.empty())
+ if (filename.empty())
return;
// get absolute path of file
string const lyxfile = ChangeExtension(filename, ".lyx");
// Check if the document already is open
- if (bufferlist.exists(lyxfile)) {
- switch (Alert::askConfirmation(_("Document is already open:"),
+ if (lyxrc.use_gui && bufferlist.exists(lyxfile)) {
+ 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)")))
{
- case 1: // Yes: close the document
- if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
+ case 1:
// If close is canceled, we cancel here too.
+ if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
return;
break;
- case 2: // No: switch to the open document
+ case 2:
owner->view()->buffer(bufferlist.getBuffer(lyxfile));
return;
- case 3: // Cancel: Do nothing
+ case 3:
owner->message(_("Canceled."));
return;
}
}
- // Check if a LyX document by the same root exists in filesystem
- FileInfo const f(lyxfile, true);
- if (f.exist() && !Alert::askQuestion(_("A document by the name"),
- MakeDisplayPath(lyxfile),
- _("already exists. Overwrite?"))) {
- owner->message(_("Canceled"));
- return;
+ // 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"));
+ return;
+ }
}
- // filename should be valid now
-
+
Importer::Import(owner, filename, format);
}
}
-void LyXFunc::setMessage(string const & m) const
+void LyXFunc::setMessage(string const & m) const
{
dispatch_buffer = m;
}
}
-void LyXFunc::initMiniBuffer()
+void LyXFunc::initMiniBuffer()
{
string text = _("Welcome to LyX!");
-
+
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey()) {
text = keyseq.print();
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 =
+
+ string const nicename =
MakeDisplayPath(tmpbuf->fileName());
// Should we do this instead? (kindo like emacs)
// leaves more room for other information
if (text != _("Welcome to LyX!")) // this is a hack
text = _("* No document open *");
}
-
+
owner->message(text);
}
-