#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/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/insetcommand.h"
#include "insets/insettabular.h"
-#include "insets/insetcaption.h"
#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
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();
-/* === globals =========================================================== */
-
-
LyXFunc::LyXFunc(LyXView * o)
: owner(o),
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
LyXText * LyXFunc::TEXT(bool flag = true) const
{
if (flag)
- return owner->view()->text;
- return owner->view()->getLyXText();
+ return view()->text;
+ return view()->getLyXText();
}
void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
{
if (selecting || TEXT(flag)->selection.mark()) {
- TEXT(flag)->setSelection(owner->view().get());
+ TEXT(flag)->setSelection(view());
if (TEXT(flag)->bv_owner)
- owner->view()->toggleToggle();
+ view()->toggleToggle();
}
- owner->view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
- owner->view()->showCursor();
+ view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
+ view()->showCursor();
- owner->view()->switchKeyMap();
+ view()->switchKeyMap();
}
c = 0;
}
- owner->getIntl()->getTransManager()
+ 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;
}
<< keysym->getSymbolName()
<< endl;
}
+
// Do nothing if we have nothing (JMarc)
- if ( ! keysym->isOK() ) {
+ if (!keysym->isOK()) {
lyxerr[Debug::KEY] << "Empty kbd action (probably composing)"
<< endl;
return;
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.
if ((action != LFUN_CANCEL) && (action != LFUN_META_FAKE)) {
// 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;
// the modifiers? (Lgb)
action = keyseq.addkey(keysym, key_modifier::none);
- if (lyxerr.debugging(Debug::KEY)) {
- lyxerr << "Removing modifiers...\n"
- << "Action now set to ["
- << action << "]" << endl;
- }
+ lyxerr[Debug::KEY] << "Removing modifiers...\n"
+ << "Action now set to ["
+ << action << "]" << endl;
+
if (action == LFUN_UNKNOWN_ACTION) {
owner->message(_("Unknown function."));
return;
}
if (action == LFUN_SELFINSERT) {
- // This is very X dependent.
char c = keysym->getISOEncoded();
string argument;
if (c != 0)
argument = c;
- dispatch(LFUN_SELFINSERT, argument);
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, argument));
lyxerr[Debug::KEY] << "SelfInsert arg[`"
<< argument << "']" << endl;
} else {
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) {
+ if (ev.action == LFUN_UNKNOWN_ACTION) {
setStatusMessage(N_("Unknown action"));
return flag.unknown(true);
}
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 == "fax" &&
+ !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";
+ case LFUN_CUT:
+ case LFUN_COPY:
+ disable = !mathcursor && !view()->getLyXText()->selection.set();
break;
#ifndef HAVE_LIBAIKSAURUS
case LFUN_THESAURUS_ENTRY:
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);
}
disable = !buf->lyxvc.inUse();
break;
case LFUN_BOOKMARK_GOTO:
- disable = !owner->view()->
- isSavedPosition(strToUnsignedInt(argument));
+ disable = !view()->
+ isSavedPosition(strToUnsignedInt(ev.argument));
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()
case LFUN_LATEX_LOG:
disable = !IsFileReadable(buf->getLogName().second);
break;
- case LFUN_MATH_VALIGN:
- if (mathcursor && mathcursor->formula()->hullType() != "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()->hullType() != "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;
- break;
case LFUN_MATH_MUTATE:
- if (tli && (tli->lyxCode() == Inset::MATH_CODE))
- flag.setOnOff(mathcursor->formula()->hullType() == argument);
+ 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()->hullType() == "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:
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;
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);
// 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;
default:
// 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;
}
} else {
string tc = mathcursor->getLastCode();
- switch (action) {
+ switch (ev.action) {
case LFUN_BOLD:
flag.setOnOff(tc == "mathbf");
break;
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence
- if (action == LFUN_SEQUENCE) {
+ if (ev.action == LFUN_SEQUENCE) {
// argument contains ';'-terminated commands
- const int ac = lyxaction.LookupFunc(token(argument, ';', 0));
- flag = getStatus(ac);
+ flag = getStatus(lyxaction.LookupFunc(token(ev.argument, ';', 0)));
}
return flag;
void LyXFunc::dispatch(int ac, bool verbose)
{
- string argument;
- kb_action const action = lyxaction.retrieveActionArg(ac, argument);
- dispatch(action, argument, verbose);
+ dispatch(lyxaction.retrieveActionArg(ac), verbose);
}
-void LyXFunc::dispatch(kb_action action, string argument, bool verbose)
+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()) {
+ if (getStatus(ev).disabled()) {
lyxerr[Debug::ACTION] << "LyXFunc::dispatch: "
<< lyxaction.getActionName(action)
<< " [" << action << "] is disabled at this location"
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().get(), inset_x, dummy_y);
+ inset->getCursorPos(view(), inset_x, dummy_y);
#endif
if ((action == LFUN_UNKNOWN_ACTION)
&& argument.empty()) {
}
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
- owner->view()->menuUndo();
+ view()->menuUndo();
goto exit_with_message;
} else if (action == LFUN_REDO) {
- owner->view()->menuRedo();
+ view()->menuRedo();
goto exit_with_message;
} else if (((result=inset->
// Hand-over to inset's own dispatch:
- localDispatch(owner->view().get(), action, argument)) ==
+ localDispatch(FuncRequest(view(), action, argument))) ==
UpdatableInset::DISPATCHED) ||
(result == UpdatableInset::DISPATCHED_NOUPDATE))
goto exit_with_message;
// FINISHED means that the cursor should be
// one position after the inset.
} else if (result == UpdatableInset::FINISHED_RIGHT) {
- TEXT()->cursorRight(owner->view().get());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
owner->view_state_changed();
goto exit_with_message;
if (TEXT()->cursor.irow()->previous()) {
#if 1
TEXT()->setCursorFromCoordinates(
- owner->view().get(), 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().get());
+ TEXT()->cursorUp(view());
#endif
moveCursorUpdate(true, false);
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) {
if (TEXT()->cursor.irow()->next()) {
#if 1
TEXT()->setCursorFromCoordinates(
- owner->view().get(), 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().get());
+ TEXT()->cursorDown(view());
#endif
} else {
- TEXT()->cursorRight(owner->view().get());
+ TEXT()->cursorRight(view());
}
moveCursorUpdate(true, false);
owner->view_state_changed();
case LFUN_UNKNOWN_ACTION:
case LFUN_BREAKPARAGRAPH:
case LFUN_BREAKLINE:
- TEXT()->cursorRight(owner->view().get());
- owner->view()->switchKeyMap();
+ 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().get());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_LEFT:
if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(owner->view().get());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_DOWN:
if (TEXT()->cursor.row()->next())
- TEXT()->cursorDown(owner->view().get());
+ TEXT()->cursorDown(view());
else
- TEXT()->cursorRight(owner->view().get());
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
owner->view_state_changed();
goto exit_with_message;
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().get());
+ view()->unlockInset(tli);
+ TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
owner->view_state_changed();
} else {
- tli->unlockInsetInInset(owner->view().get(),
+ tli->unlockInsetInInset(view(),
lock,
true);
}
finishUndo();
// Tell the paragraph dialog that we changed paragraph
- owner->getDialogs()->updateParagraph();
+ owner->getDialogs().updateParagraph();
}
}
break;
}
bool fw = (action == LFUN_WORDFINDBACKWARD);
if (!searched_string.empty()) {
- lyxfind::LyXFind(owner->view().get(), 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());
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 -----------------------------------------------
s1 << _("Saving document") << ' '
<< MakeDisplayPath(owner->buffer()->fileName() + "...");
owner->message(s1.str().c_str());
- MenuWrite(owner->view().get(), owner->buffer());
+ MenuWrite(view(), owner->buffer());
s1 << _(" done.");
owner->message(s1.str().c_str());
} else
- WriteAs(owner->view().get(), owner->buffer());
+ WriteAs(view(), owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(owner->view().get(), 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;
else
p.setCmdName("listoftables");
#endif
- owner->getDialogs()->createTOC(p.getAsString());
+ owner->getDialogs().createTOC(p.getAsString());
break;
}
- case LFUN_DIALOG_TABULAR_INSERT:
- owner->getDialogs()->showTabularCreate();
- break;
-
case LFUN_AUTOSAVE:
- AutoSave(owner->view().get());
+ AutoSave(view());
break;
case LFUN_UNDO:
- owner->view()->menuUndo();
+ view()->menuUndo();
break;
case LFUN_REDO:
- owner->view()->menuRedo();
+ view()->menuRedo();
break;
case LFUN_MENUSEARCH:
- owner->getDialogs()->showSearch();
+ owner->getDialogs().showSearch();
break;
case LFUN_REMOVEERRORS:
- if (owner->view()->removeAutoInsets()) {
+ if (view()->removeAutoInsets()) {
#warning repaint() or update() or nothing ?
- owner->view()->repaint();
- owner->view()->fitCursor();
+ view()->repaint();
+ view()->fitCursor();
}
break;
case LFUN_DEPTH_MIN:
- changeDepth(owner->view().get(), TEXT(false), -1);
+ changeDepth(view(), TEXT(false), -1);
break;
case LFUN_DEPTH_PLUS:
- changeDepth(owner->view().get(), 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().get());
+ 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:
str << _("Opening help file") << ' '
<< MakeDisplayPath(fname) << "...";
owner->message(str.str().c_str());
- owner->view()->buffer(bufferlist.loadLyXFile(fname, false));
+ view()->buffer(bufferlist.loadLyXFile(fname, false));
owner->allowInput();
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().get());
- } 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().get());
+ 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));
}
- owner->view()->setCursorFromRow(row);
+ view()->setCursorFromRow(row);
- owner->view()->center();
+ view()->center();
// see BufferView_pimpl::center()
- owner->view()->updateScrollbar();
+ view()->updateScrollbar();
}
break;
<< " 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().get());
+ par->inInset()->edit(view());
}
// Set the cursor
- owner->view()->getLyXText()->setCursor(owner->view().get(), par, 0);
- owner->view()->switchKeyMap();
+ view()->getLyXText()->setCursor(view(), par, 0);
+ view()->switchKeyMap();
owner->view_state_changed();
- owner->view()->center();
+ view()->center();
// see BufferView_pimpl::center()
- owner->view()->updateScrollbar();
+ view()->updateScrollbar();
}
break;
// passthrough hat and underscore outside mathed:
case LFUN_SUBSCRIPT:
- dispatch(LFUN_SELFINSERT, "_", false);
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, "_"));
break;
case LFUN_SUPERSCRIPT:
- dispatch(LFUN_SELFINSERT, "^", false);
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
break;
case LFUN_MATH_PANEL:
- owner->getDialogs()->showMathPanel();
+ owner->getDialogs().showMathPanel();
break;
case LFUN_CITATION_CREATE:
// changed. Suspect so. Leave as-is therefore.
if (contains(argument, "|")) {
p.setContents(token(argument, '|', 0));
- p.setOptions( token(argument, '|', 1));
+ p.setOptions(token(argument, '|', 1));
} else {
p.setContents(argument);
}
- dispatch(LFUN_CITATION_INSERT, p.getAsString());
+ dispatch(FuncRequest(view(), LFUN_CITATION_INSERT, p.getAsString()));
} else
- owner->getDialogs()->createCitation(p.getAsString());
+ owner->getDialogs().createCitation(p.getAsString());
}
break;
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:
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();
lyx_gui::update_fonts();
- // 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->view()->resize();
- owner->view()->repaint();
// 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;
#endif
}
- owner->view()->repaint();
+ view()->repaint();
break;
}
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:
- string const & msg = getMessage();
- sendDispatchMessage(msg, action, argument, verbose);
+ sendDispatchMessage(getMessage(), ev, verbose);
}
-void LyXFunc::sendDispatchMessage(string const & msg, kb_action action, string const & arg, bool verbose)
+void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & ev, bool verbose)
{
owner->updateMenubar();
owner->updateToolbar();
- if (action == LFUN_SELFINSERT || !verbose) {
+ 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);
+ string dispatch_msg = msg;
if (!dispatch_msg.empty())
dispatch_msg += " ";
- string comname = lyxaction.getActionName(action);
+ string comname = lyxaction.getActionName(ev.action);
- int pseudoaction = action;
+ int pseudoaction = ev.action;
bool argsadded = false;
- if (!arg.empty()) {
+ if (!ev.argument.empty()) {
// the pseudoaction is useful for the bindings
- pseudoaction = lyxaction.searchActionArg(action, arg);
+ pseudoaction = lyxaction.searchActionArg(ev.action, ev.argument);
if (pseudoaction == LFUN_UNKNOWN_ACTION) {
- pseudoaction = action;
+ pseudoaction = ev.action;
} else {
- comname += " " + arg;
+ comname += " " + ev.argument;
argsadded = true;
}
}
if (!shortcuts.empty()) {
comname += ": " + shortcuts;
- } else if (!argsadded && !arg.empty()) {
- comname += " " + arg;
+ } else if (!argsadded && !ev.argument.empty()) {
+ comname += " " + ev.argument;
}
if (!comname.empty()) {
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))
templname = fname;
}
- owner->view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
+ 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))
// 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,
+ 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);
- owner->view()->buffer(buffer);
+ view()->buffer(buffer);
return;
}
Buffer * openbuf = bufferlist.loadLyXFile(filename);
if (openbuf) {
- owner->view()->buffer(openbuf);
+ view()->buffer(openbuf);
ostringstream str;
str << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
owner->message(str.str().c_str());
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))
return;
break;
case 2:
- owner->view()->buffer(bufferlist.getBuffer(lyxfile));
+ view()->buffer(bufferlist.getBuffer(lyxfile));
return;
case 3:
owner->message(_("Canceled."));
{
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());
}
}
}
return keyseq.printOptions();
}
- if (!owner->view()->available())
+ if (!view()->available())
return _("Welcome to LyX!");
- return currentState(owner->view().get());
+ return currentState(view());
+}
+
+
+BufferView * LyXFunc::view() const
+{
+ lyx::Assert(owner);
+ return owner->view().get();
}
projects / lyx.git / blobdiff