-/* This file is part of
- * ======================================================
+/**
+ * \file lyxfunc.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ * \author Dekel Tsur
+ * \author Martin Vermeer
+ * \author Jürgen Vigna
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
#include "lyxfunc.h"
-#include "version.h"
#include "kbmap.h"
-#include "lyxrow.h"
#include "bufferlist.h"
#include "buffer.h"
#include "buffer_funcs.h"
#include "BufferView.h"
+#include "funcrequest.h"
+#include "iterators.h"
#include "lyxserver.h"
#include "intl.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 "support/std_sstream.h"
#include "encoding.h"
-#include "layout.h"
-#include "bufferview_funcs.h"
#include "frontends/LyXView.h"
#include "frontends/lyx_gui.h"
-#include "vspace.h"
-#include "FloatList.h"
#include "format.h"
#include "exporter.h"
#include "importer.h"
#include "insets/insetexternal.h"
#include "insets/insettabular.h"
-#include "mathed/formulamacro.h"
#include "mathed/math_cursor.h"
-#include "mathed/math_inset.h"
#include "frontends/FileDialog.h"
#include "frontends/Dialogs.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/forkedcontr.h"
-#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/path.h"
-#include "support/lyxfunctional.h"
+#include "support/path_defines.h"
+
-#include <ctime>
-#include <clocale>
-#include <cstdlib>
-#include <cctype>
-#include <utility>
-#include <algorithm>
+using namespace lyx::support;
using std::pair;
using std::make_pair;
}
-inline
-LyXText * LyXFunc::TEXT(bool flag = true) const
-{
- if (flag)
- return view()->text;
- return view()->getLyXText();
-}
-
-
-inline
-void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
+void LyXFunc::moveCursorUpdate()
{
- if (selecting || TEXT(flag)->selection.mark()) {
- TEXT(flag)->setSelection();
- if (!TEXT(flag)->isInInset())
- view()->toggleToggle();
- }
- view()->update(TEXT(flag), BufferView::SELECT);
-
+ LyXText * lt = view()->text;
+ if (lt->selection.mark())
+ lt->setSelection();
+ view()->update();
view()->switchKeyMap();
}
}
owner->getIntl().getTransManager()
- .deadkey(c, get_accent(action).accent, TEXT(false));
+ .deadkey(c, get_accent(action).accent, view()->getLyXText());
// Need to clear, in case the minibuffer calls these
// actions
keyseq.clear();
// copied verbatim from do_accent_char
- view()->update(TEXT(false), BufferView::SELECT);
- TEXT(false)->selection.cursor = TEXT(false)->cursor;
+ view()->update();
+ view()->getLyXText()->selection.cursor = view()->getLyXText()->cursor;
}
switch (ev.action) {
case LFUN_EXPORT:
disable = ev.argument != "custom"
- && !Exporter::IsExportable(buf, ev.argument);
+ && !Exporter::IsExportable(*buf, ev.argument);
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
case LFUN_COPY:
if (tli) {
UpdatableInset * in = tli;
- if (in->lyxCode() != Inset::TABULAR_CODE) {
- in = tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE);
+ if (in->lyxCode() != InsetOld::TABULAR_CODE) {
+ in = tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE);
}
if (in && static_cast<InsetTabular*>(in)->hasSelection()) {
disable = false;
disable = !buf->isLatex() || lyxrc.chktex_command == "none";
break;
case LFUN_BUILDPROG:
- disable = !Exporter::IsExportable(buf, "program");
+ disable = !Exporter::IsExportable(*buf, "program");
break;
case LFUN_LAYOUT_TABULAR:
disable = !tli
- || (tli->lyxCode() != Inset::TABULAR_CODE
- && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ || (tli->lyxCode() != InsetOld::TABULAR_CODE
+ && !tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
break;
case LFUN_DEPTH_MIN:
- disable = !changeDepth(view(), TEXT(false), DEC_DEPTH, true);
+ disable = !changeDepth(view(), view()->getLyXText(), DEC_DEPTH, true);
break;
case LFUN_DEPTH_PLUS:
- disable = !changeDepth(view(), TEXT(false), INC_DEPTH, true);
+ disable = !changeDepth(view(), view()->getLyXText(), INC_DEPTH, true);
break;
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH: {
- Inset * inset = TEXT(false)->cursor.par()->inInset();
+ InsetOld * inset = view()->getLyXText()->cursor.par()->inInset();
disable = inset && inset->forceDefaultParagraphs(inset);
break;
}
case LFUN_INSET_OPTARG:
- disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+ disable = (view()->getLyXText()->cursor.par()->layout()->optionalargs == 0);
break;
case LFUN_TABULAR_FEATURE:
if (tli) {
FuncStatus ret;
//ret.disabled(true);
- if (tli->lyxCode() == Inset::TABULAR_CODE) {
+ if (tli->lyxCode() == InsetOld::TABULAR_CODE) {
ret = static_cast<InsetTabular *>(tli)
->getStatus(ev.argument);
flag |= ret;
disable = false;
- } else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+ } else if (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
- (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
+ (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE))
->getStatus(ev.argument);
flag |= ret;
disable = false;
// jump back to owner if an InsetText, so
// we get back to the InsetTabular or whatever
- if (inset->lyxCode() == Inset::TEXT_CODE)
+ if (inset->lyxCode() == InsetOld::TEXT_CODE)
inset = inset->owner();
- Inset::Code code = inset->lyxCode();
+ InsetOld::Code code = inset->lyxCode();
switch (code) {
- case Inset::TABULAR_CODE:
+ case InsetOld::TABULAR_CODE:
disable = ev.argument != "tabular";
break;
- case Inset::ERT_CODE:
+ case InsetOld::ERT_CODE:
disable = ev.argument != "ert";
break;
- case Inset::FLOAT_CODE:
+ case InsetOld::FLOAT_CODE:
disable = ev.argument != "float";
break;
- case Inset::MINIPAGE_CODE:
+ case InsetOld::MINIPAGE_CODE:
disable = ev.argument != "minipage";
break;
- case Inset::WRAP_CODE:
+ case InsetOld::WRAP_CODE:
disable = ev.argument != "wrap";
break;
+ case InsetOld::NOTE_CODE:
+ disable = ev.argument != "note";
+ break;
+ case InsetOld::BRANCH_CODE:
+ disable = ev.argument != "branch";
+ break;
default:
break;
}
disable = !mathcursor;
break;
- case LFUN_DIALOG_SHOW: {
+ case LFUN_DIALOG_SHOW: {
string const name = ev.getArg(0);
if (!buf) {
disable = !(name == "aboutlyx" ||
}
if (name == "print") {
- disable = !Exporter::IsExportable(buf, "dvi") ||
+ disable = !Exporter::IsExportable(*buf, "dvi") ||
lyxrc.print_command == "none";
} else if (name == "character") {
UpdatableInset * tli = view()->theLockingInset();
- disable = tli && tli->lyxCode() == Inset::ERT_CODE;
+ disable = tli && tli->lyxCode() == InsetOld::ERT_CODE;
} else if (name == "vclog") {
disable = !buf->lyxvc.inUse();
} else if (name == "latexlog") {
}
// the functions which insert insets
- Inset::Code code = Inset::NO_CODE;
+ InsetOld::Code code = InsetOld::NO_CODE;
switch (ev.action) {
case LFUN_DIALOG_SHOW_NEW_INSET:
if (ev.argument == "bibitem")
- code = Inset::BIBITEM_CODE;
+ code = InsetOld::BIBITEM_CODE;
else if (ev.argument == "bibtex")
- code = Inset::BIBTEX_CODE;
+ code = InsetOld::BIBTEX_CODE;
else if (ev.argument == "citation")
- code = Inset::CITE_CODE;
+ code = InsetOld::CITE_CODE;
else if (ev.argument == "ert")
- code = Inset::ERT_CODE;
+ code = InsetOld::ERT_CODE;
else if (ev.argument == "external")
- code = Inset::EXTERNAL_CODE;
+ code = InsetOld::EXTERNAL_CODE;
else if (ev.argument == "float")
- code = Inset::FLOAT_CODE;
+ code = InsetOld::FLOAT_CODE;
else if (ev.argument == "graphics")
- code = Inset::GRAPHICS_CODE;
+ code = InsetOld::GRAPHICS_CODE;
else if (ev.argument == "include")
- code = Inset::INCLUDE_CODE;
+ code = InsetOld::INCLUDE_CODE;
else if (ev.argument == "index")
- code = Inset::INDEX_CODE;
+ code = InsetOld::INDEX_CODE;
else if (ev.argument == "label")
- code = Inset::LABEL_CODE;
+ code = InsetOld::LABEL_CODE;
else if (ev.argument == "minipage")
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
else if (ev.argument == "ref")
- code = Inset::REF_CODE;
+ code = InsetOld::REF_CODE;
else if (ev.argument == "toc")
- code = Inset::TOC_CODE;
+ code = InsetOld::TOC_CODE;
else if (ev.argument == "url")
- code = Inset::URL_CODE;
+ code = InsetOld::URL_CODE;
else if (ev.argument == "wrap")
- code = Inset::WRAP_CODE;
+ code = InsetOld::WRAP_CODE;
break;
case LFUN_INSET_ERT:
- code = Inset::ERT_CODE;
+ code = InsetOld::ERT_CODE;
break;
case LFUN_INSET_FOOTNOTE:
- code = Inset::FOOT_CODE;
+ code = InsetOld::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
- code = Inset::TABULAR_CODE;
+ code = InsetOld::TABULAR_CODE;
break;
case LFUN_INSET_MARGINAL:
- code = Inset::MARGIN_CODE;
+ code = InsetOld::MARGIN_CODE;
break;
case LFUN_INSET_MINIPAGE:
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INSET_FLOAT:
case LFUN_INSET_WIDE_FLOAT:
- code = Inset::FLOAT_CODE;
+ code = InsetOld::FLOAT_CODE;
break;
case LFUN_INSET_WRAP:
- code = Inset::WRAP_CODE;
+ code = InsetOld::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
- code = Inset::FLOAT_LIST_CODE;
+ code = InsetOld::FLOAT_LIST_CODE;
break;
#if 0
case LFUN_INSET_LIST:
- code = Inset::LIST_CODE;
+ code = InsetOld::LIST_CODE;
break;
case LFUN_INSET_THEOREM:
- code = Inset::THEOREM_CODE;
+ code = InsetOld::THEOREM_CODE;
break;
#endif
case LFUN_INSET_CAPTION:
- code = Inset::CAPTION_CODE;
+ code = InsetOld::CAPTION_CODE;
break;
case LFUN_INSERT_NOTE:
- code = Inset::NOTE_CODE;
+ code = InsetOld::NOTE_CODE;
+ break;
+ case LFUN_INSERT_BRANCH:
+ code = InsetOld::BRANCH_CODE;
+ if (buf->params.branchlist.empty())
+ disable = true;
break;
case LFUN_INSERT_LABEL:
- code = Inset::LABEL_CODE;
+ code = InsetOld::LABEL_CODE;
break;
case LFUN_INSET_OPTARG:
- code = Inset::OPTARG_CODE;
+ code = InsetOld::OPTARG_CODE;
break;
case LFUN_ENVIRONMENT_INSERT:
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INDEX_INSERT:
- code = Inset::INDEX_CODE;
+ code = InsetOld::INDEX_CODE;
break;
case LFUN_INDEX_PRINT:
- code = Inset::INDEX_PRINT_CODE;
+ code = InsetOld::INDEX_PRINT_CODE;
break;
case LFUN_TOC_INSERT:
- code = Inset::TOC_CODE;
+ code = InsetOld::TOC_CODE;
break;
case LFUN_HTMLURL:
case LFUN_URL:
- code = Inset::URL_CODE;
+ code = InsetOld::URL_CODE;
break;
case LFUN_QUOTE:
// always allow this, since we will inset a raw quote
case LFUN_MENU_SEPARATOR:
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
- code = Inset::SPECIALCHAR_CODE;
+ code = InsetOld::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (!mathcursor)
- code = Inset::SPACE_CODE;
+ code = InsetOld::SPACE_CODE;
+ break;
+ case LFUN_INSET_DIALOG_SHOW: {
+ LyXText * lt = view()->getLyXText();
+ InsetOld * inset = lt->getInset();
+ disable = !inset;
+ if (!disable) {
+ code = inset->lyxCode();
+ if (!(code == InsetOld::INCLUDE_CODE
+ || code == InsetOld::BIBTEX_CODE
+ || code == InsetOld::FLOAT_LIST_CODE
+ || code == InsetOld::TOC_CODE))
+ disable = true;
+ }
+ }
break;
default:
break;
}
- if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code))
+ if (code != InsetOld::NO_CODE && tli && !tli->insetAllowed(code))
disable = true;
if (disable)
flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
- flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+ flag.setOnOff(view()->getLyXText()->cursor.par()->params().startOfAppendix());
break;
case LFUN_SWITCHBUFFER:
// toggle on the current buffer, but do not toggle off
// the font related toggles
if (!mathcursor) {
- LyXFont const & font = TEXT(false)->real_current_font;
+ LyXFont const & font = view()->getLyXText()->real_current_font;
switch (ev.action) {
case LFUN_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
dispatch(lyxaction.retrieveActionArg(ac), verbose);
}
+namespace {
+ bool ensureBufferClean(BufferView * bv) {
+
+ Buffer & buf = *bv->buffer();
+ if (buf.isClean())
+ return true;
+
+ string const file = MakeDisplayPath(buf.fileName(), 30);
+ string text = bformat(_("The document %1$s has unsaved "
+ "changes.\n\nDo you want to save "
+ "the document?"), file);
+ int const ret = Alert::prompt(_("Save changed document?"),
+ text, 0, 1, _("&Save"),
+ _("&Cancel"));
+
+ if (ret == 0)
+ bv->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
+
+ return buf.isClean();
+ }
+
+} //namespace anon
void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
view()->hideCursor();
if (view()->available() && view()->theLockingInset()) {
- Inset::RESULT result;
- if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
- (!keyseq.deleted())))
+ InsetOld::RESULT result;
+ if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
+ !keyseq.deleted()))
{
UpdatableInset * inset = view()->theLockingInset();
#if 1
// FINISHED means that the cursor should be
// one position after the inset.
} else if (result == FINISHED_RIGHT) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->clearMessage();
goto exit_with_message;
} else if (result == FINISHED_UP) {
- if (TEXT()->cursor.irow() != TEXT()->rows().begin()) {
+ RowList::iterator const irow = view()->text->cursorIRow();
+ if (irow != view()->text->firstRow()) {
#if 1
- TEXT()->setCursorFromCoordinates(
- TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() - 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ view()->text->setCursorFromCoordinates(
+ view()->text->cursor.x() + inset_x,
+ view()->text->cursor.y() -
+ irow->baseline() - 1);
+ view()->text->cursor.x_fix(view()->text->cursor.x());
#else
- TEXT()->cursorUp(view());
+ view()->text->cursorUp(view());
#endif
- moveCursorUpdate(true, false);
+ moveCursorUpdate();
} else {
- view()->update(TEXT(), BufferView::SELECT);
+ view()->update();
}
owner->clearMessage();
goto exit_with_message;
} else if (result == FINISHED_DOWN) {
- if (boost::next(TEXT()->cursor.irow()) != TEXT()->rows().end()) {
+ RowList::iterator const irow = view()->text->cursorIRow();
+ if (irow != view()->text->lastRow()) {
#if 1
- TEXT()->setCursorFromCoordinates(
- TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() +
- TEXT()->cursor.irow()->height() + 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ view()->text->setCursorFromCoordinates(
+ view()->text->cursor.x() + inset_x,
+ view()->text->cursor.y() -
+ irow->baseline() +
+ irow->height() + 1);
+ view()->text->cursor.x_fix(view()->text->cursor.x());
#else
- TEXT()->cursorDown(view());
+ view()->text->cursorDown(view());
#endif
} else {
- TEXT()->cursorRight(view());
+ view()->text->cursorRight(view());
}
- moveCursorUpdate(true, false);
+ moveCursorUpdate();
owner->clearMessage();
goto exit_with_message;
}
case LFUN_UNKNOWN_ACTION:
case LFUN_BREAKPARAGRAPH:
case LFUN_BREAKLINE:
- TEXT()->cursorRight(view());
+ view()->text->cursorRight(view());
view()->switchKeyMap();
owner->view_state_changed();
break;
case LFUN_RIGHT:
- if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ if (!view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_LEFT:
- if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ if (view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_DOWN:
- if (boost::next(TEXT()->cursorRow()) != TEXT()->rows().end())
- TEXT()->cursorDown(view());
+ if (view()->text->cursorRow() != view()->text->lastRow())
+ view()->text->cursorDown(view());
else
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
goto exit_with_message;
default:
switch (action) {
- case LFUN_ESCAPE:
- {
- if (!view()->available()) break;
+ case LFUN_ESCAPE: {
+ if (!view()->available())
+ break;
// this function should be used always [asierra060396]
- UpdatableInset * tli =
- view()->theLockingInset();
+ UpdatableInset * tli = view()->theLockingInset();
if (tli) {
UpdatableInset * lock = tli->getLockingInset();
if (tli == lock) {
view()->unlockInset(tli);
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
} else {
- tli->unlockInsetInInset(view(),
- lock,
- true);
+ tli->unlockInsetInInset(view(), lock, true);
}
finishUndo();
// Tell the paragraph dialog that we changed paragraph
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
+ break;
}
- break;
- // --- Misc -------------------------------------------
- case LFUN_WORDFINDFORWARD :
- case LFUN_WORDFINDBACKWARD : {
+ case LFUN_WORDFINDFORWARD:
+ case LFUN_WORDFINDBACKWARD: {
static string last_search;
string searched_string;
searched_string = last_search;
}
bool fw = (action == LFUN_WORDFINDFORWARD);
- if (!searched_string.empty()) {
- lyxfind::LyXFind(view(), searched_string, fw);
- }
+ if (!searched_string.empty())
+ lyx::find::find(view(), searched_string, fw);
+ break;
}
- break;
case LFUN_PREFIX:
- {
- if (view()->available() && !view()->theLockingInset()) {
- view()->update(TEXT(), BufferView::SELECT);
- }
+ if (view()->available() && !view()->theLockingInset())
+ view()->update();
owner->message(keyseq.printOptions());
- }
- break;
+ break;
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
owner->focus_command_buffer();
break;
- case LFUN_CANCEL: // RVDK_PATCH_5
+ case LFUN_CANCEL:
keyseq.reset();
meta_fake_bit = key_modifier::none;
if (view()->available())
setMessage(N_("Cancel"));
break;
- case LFUN_META_FAKE: // RVDK_PATCH_5
- {
+ case LFUN_META_FAKE:
meta_fake_bit = key_modifier::alt;
setMessage(keyseq.print());
- }
- break;
+ break;
case LFUN_READ_ONLY_TOGGLE:
- if (owner->buffer()->lyxvc.inUse()) {
+ if (owner->buffer()->lyxvc.inUse())
owner->buffer()->lyxvc.toggleReadOnly();
- } else {
+ else
owner->buffer()->setReadonly(
!owner->buffer()->isReadonly());
- }
break;
case LFUN_CENTER: // this is center and redraw.
break;
case LFUN_DEPTH_MIN:
- changeDepth(view(), TEXT(false), DEC_DEPTH, false);
+ changeDepth(view(), view()->getLyXText(), DEC_DEPTH, false);
owner->view_state_changed();
break;
case LFUN_DEPTH_PLUS:
- changeDepth(view(), TEXT(false), INC_DEPTH, false);
+ changeDepth(view(), view()->getLyXText(), INC_DEPTH, false);
owner->view_state_changed();
break;
// --- version control -------------------------------
case LFUN_VC_REGISTER:
{
- if (!owner->buffer()->lyxvc.inUse())
+ if (!ensureBufferClean(view()))
+ break;
+ if (!owner->buffer()->lyxvc.inUse()) {
owner->buffer()->lyxvc.registrer();
+ view()->reload();
+ }
}
break;
case LFUN_VC_CHECKIN:
{
+ if (!ensureBufferClean(view()))
+ break;
if (owner->buffer()->lyxvc.inUse()
- && !owner->buffer()->isReadonly())
+ && !owner->buffer()->isReadonly()) {
owner->buffer()->lyxvc.checkIn();
+ view()->reload();
+ }
}
break;
case LFUN_VC_CHECKOUT:
{
+ if (!ensureBufferClean(view()))
+ break;
if (owner->buffer()->lyxvc.inUse()
- && owner->buffer()->isReadonly())
+ && owner->buffer()->isReadonly()) {
owner->buffer()->lyxvc.checkOut();
+ view()->reload();
+ }
}
break;
case LFUN_VC_REVERT:
{
owner->buffer()->lyxvc.revert();
+ view()->reload();
}
break;
case LFUN_VC_UNDO:
{
owner->buffer()->lyxvc.undoLast();
+ view()->reload();
}
break;
break;
case LFUN_FILE_NEW:
- {
- // servercmd: argument must be <file>:<template>
- Buffer * tmpbuf = NewFile(argument);
- if (tmpbuf)
- view()->buffer(tmpbuf);
- }
- break;
+ NewFile(view(), argument);
+ break;
case LFUN_FILE_OPEN:
open(argument);
case LFUN_LAYOUT_TABULAR:
if (view()->theLockingInset()) {
- if (view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
+ if (view()->theLockingInset()->lyxCode()== InsetOld::TABULAR_CODE) {
InsetTabular * inset = static_cast<InsetTabular *>
(view()->theLockingInset());
inset->openLayoutDialog(view());
} else if (view()->theLockingInset()->
- getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
+ getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)!=0) {
InsetTabular * inset = static_cast<InsetTabular *>(
- view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ view()->theLockingInset()->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
inset->openLayoutDialog(view());
}
}
}
break;
+ case LFUN_INSET_DIALOG_SHOW: {
+ LyXText * lt = view()->getLyXText();
+ InsetOld * inset = lt->getInset();
+ if (inset) {
+ FuncRequest cmd(view(), LFUN_INSET_DIALOG_SHOW);
+ inset->localDispatch(cmd);
+ }
+ }
+ break;
+
case LFUN_DIALOG_UPDATE: {
string const & name = argument;
// Can only update a dialog connected to an existing inset
case LFUN_SAVEPREFERENCES:
{
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
lyxrc.write("preferences");
}
break;
// if values really changed...but not very important right now. (Lgb)
// All visible buffers will need resize
view()->resize();
- view()->repaint();
+ view()->update();
}
break;
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
- grfx::GCache & gc = grfx::GCache::get();
+ lyx::graphics::GCache & gc =
+ lyx::graphics::GCache::get();
gc.changeDisplay(true);
#endif
}
- view()->repaint();
+ view()->update();
break;
}
view()->owner()->updateLayoutChoice();
if (view()->available()) {
- view()->fitCursor();
+ if (view()->fitCursor()) {
+ lyxerr << "LyXFunc->fitCursor->update" << endl;
+
+ view()->update();
+ }
// If we executed a mutating lfun, mark the buffer as dirty
- if (!lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
+ if (!getStatus(ev).disabled()
+ && !lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
view()->buffer()->markDirty();
}
templname = fname;
}
- view()->buffer(newFile(filename, templname, !name.empty()));
+ view()->newFile(filename, templname, !name.empty());
}
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
FileDialog::Result result =
fileDlg.open(initpath,
FileInfo const f(filename, true);
if (!f.exist()) {
// the user specifically chose this name. Believe them.
- Buffer * buffer = newFile(filename, "", true);
- view()->buffer(buffer);
+ view()->newFile(filename, "", true);
return;
}
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
{
if (bufferlist.close(owner->buffer(), true) && !quitting) {
if (bufferlist.empty()) {
- // need this otherwise SEGV may occur while trying to
- // set variables that don't exist
+ // need this otherwise SEGV may occur while
+ // trying to set variables that don't exist
// since there's no current buffer
owner->getDialogs().hideBufferDependent();
} else {
BufferView * LyXFunc::view() const
{
- lyx::Assert(owner);
+ Assert(owner);
return owner->view().get();
}
+
+
+bool LyXFunc::wasMetaKey() const
+{
+ return (meta_fake_bit != key_modifier::none);
+}