#include "kbmap.h"
#include "lyxrow.h"
#include "bufferlist.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
#include "BufferView.h"
#include "lyxserver.h"
#include "intl.h"
#include "ParagraphParameters.h"
#include "insets/insetcommand.h"
-#include "insets/inseterror.h"
-#include "insets/insetert.h"
+#include "insets/insetexternal.h"
#include "insets/insettabular.h"
#include "mathed/formulamacro.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 "BoostFormat.h"
-
#include <ctime>
#include <clocale>
#include <cstdlib>
using std::vector;
using std::transform;
using std::back_inserter;
+using namespace bv_funcs;
extern BufferList bufferlist;
extern LyXServer * lyxserver;
if (!TEXT(flag)->isInInset())
view()->toggleToggle();
}
- view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
- view()->showCursor();
+ view()->update(TEXT(flag), BufferView::SELECT);
view()->switchKeyMap();
}
// actions
keyseq.clear();
// copied verbatim from do_accent_char
- view()->update(TEXT(false),
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ view()->update(TEXT(false), BufferView::SELECT);
TEXT(false)->selection.cursor = TEXT(false)->cursor;
}
// encode this in the function itself.
bool disable = false;
switch (ev.action) {
- case LFUN_MENUPRINT:
- disable = !Exporter::IsExportable(buf, "dvi")
- || lyxrc.print_command == "none";
- break;
case LFUN_EXPORT:
disable = ev.argument != "custom"
&& !Exporter::IsExportable(buf, ev.argument);
disable = !mathcursor && !view()->getLyXText()->selection.set();
break;
case LFUN_RUNCHKTEX:
- disable = lyxrc.chktex_command == "none";
+ disable = !buf->isLatex() || lyxrc.chktex_command == "none";
break;
case LFUN_BUILDPROG:
disable = !Exporter::IsExportable(buf, "program");
break;
- case LFUN_LAYOUT_CHARACTER:
- disable = tli && tli->lyxCode() == Inset::ERT_CODE;
- break;
-
case LFUN_LAYOUT_TABULAR:
disable = !tli
|| (tli->lyxCode() != Inset::TABULAR_CODE
&& !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
break;
+ case LFUN_DEPTH_MIN:
+ disable = !changeDepth(view(), TEXT(false), DEC_DEPTH, true);
+ break;
+
+ case LFUN_DEPTH_PLUS:
+ disable = !changeDepth(view(), TEXT(false), INC_DEPTH, true);
+ break;
+
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH: {
Inset * inset = TEXT(false)->cursor.par()->inInset();
if (tli->lyxCode() == Inset::TABULAR_CODE) {
ret = static_cast<InsetTabular *>(tli)
->getStatus(ev.argument);
+ flag |= ret;
+ disable = false;
} else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
(tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
->getStatus(ev.argument);
+ flag |= ret;
+ disable = false;
+ } else {
+ disable = true;
}
- flag |= ret;
- disable = false;
} else {
static InsetTabular inset(*owner->buffer(), 1, 1);
FuncStatus ret;
break;
case LFUN_VC_REVERT:
case LFUN_VC_UNDO:
- case LFUN_VC_HISTORY:
disable = !buf->lyxvc.inUse();
break;
case LFUN_MENURELOAD:
&& lt->inset_owner->owner()->isOpen()));
break;
}
- case LFUN_LATEX_LOG:
- disable = !IsFileReadable(buf->getLogName().second);
+
+ case LFUN_INSET_SETTINGS: {
+ disable = true;
+ UpdatableInset * inset = view()->theLockingInset();
+
+ if (!inset)
+ break;
+
+ // get the innermost inset
+ inset = inset->getLockingInset();
+
+ // jump back to owner if an InsetText, so
+ // we get back to the InsetTabular or whatever
+ if (inset->lyxCode() == Inset::TEXT_CODE)
+ inset = inset->owner();
+
+ Inset::Code code = inset->lyxCode();
+ switch (code) {
+ case Inset::TABULAR_CODE:
+ disable = ev.argument != "tabular";
+ break;
+ case Inset::ERT_CODE:
+ disable = ev.argument != "ert";
+ break;
+ case Inset::FLOAT_CODE:
+ disable = ev.argument != "float";
+ break;
+ case Inset::MINIPAGE_CODE:
+ disable = ev.argument != "minipage";
+ break;
+ case Inset::WRAP_CODE:
+ disable = ev.argument != "wrap";
+ break;
+ default:
+ break;
+ }
break;
+ }
case LFUN_MATH_MUTATE:
if (mathcursor)
disable = !mathcursor;
break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = ev.getArg(0);
+ if (!buf) {
+ disable = !(name == "aboutlyx" ||
+ name == "file" ||
+ name == "forks" ||
+ name == "preferences" ||
+ name == "texinfo");
+ break;
+ }
+
+ if (name == "print") {
+ disable = !Exporter::IsExportable(buf, "dvi") ||
+ lyxrc.print_command == "none";
+ } else if (name == "character") {
+ UpdatableInset * tli = view()->theLockingInset();
+ disable = tli && tli->lyxCode() == Inset::ERT_CODE;
+ } else if (name == "vclog") {
+ disable = !buf->lyxvc.inUse();
+ } else if (name == "latexlog") {
+ disable = !IsFileReadable(buf->getLogName().second);
+ }
+ break;
+ }
+
default:
break;
}
case LFUN_TOC_INSERT:
code = Inset::TOC_CODE;
break;
- case LFUN_PARENTINSERT:
- code = Inset::PARENT_CODE;
- break;
case LFUN_HTMLURL:
case LFUN_URL:
code = Inset::URL_CODE;
case LFUN_END_OF_SENTENCE:
code = Inset::SPECIALCHAR_CODE;
break;
- case LFUN_PROTECTEDSPACE:
+ case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (!mathcursor)
- code = Inset::SPECIALCHAR_CODE;
+ code = Inset::SPACE_CODE;
break;
default:
break;
int const action = lyxaction.LookupFunc(s);
if (action == LFUN_UNKNOWN_ACTION) {
-#if USE_BOOST_FORMAT
-boost::format fmt(_("Unknown function (%1$s)"));
-fmt % s;
-owner->message(fmt.str());
-#else
- string const msg = string(_("Unknown function ("))
- + s + ')';
- owner->message(msg);
-#endif
+ owner->message(bformat(_("Unknown function (%1$s)"), s));
return;
}
selection_possible = false;
- if (view()->available())
- view()->hideCursor();
-
string argument = ev.argument;
kb_action action = ev.action;
goto exit_with_message;
}
+ if (view()->available())
+ view()->hideCursor();
+
if (view()->available() && view()->theLockingInset()) {
Inset::RESULT result;
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
&& argument.empty()) {
argument = encoded_last_key;
}
+
+ // the insets can't try to handle this,
+ // a table cell in the dummy position will
+ // lock its insettext, the insettext will
+ // pass it the bufferview, and succeed,
+ // so it will stay not locked. Not good
+ // if we've just done LFUN_ESCAPE (which
+ // injects an LFUN_PARAGRAPH_UPDATE)
+ if (action == LFUN_PARAGRAPH_UPDATE) {
+ view()->dispatch(ev);
+ goto exit_with_message;
+ }
+
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
view()->undo();
goto exit_with_message;
// If UNDISPATCHED, just soldier on
else if (result == FINISHED) {
+ owner->clearMessage();
goto exit_with_message;
// We do not need special RTL handling here:
// FINISHED means that the cursor should be
} else if (result == FINISHED_RIGHT) {
TEXT()->cursorRight(view());
moveCursorUpdate(true, false);
- owner->view_state_changed();
+ owner->clearMessage();
goto exit_with_message;
} else if (result == FINISHED_UP) {
- if (TEXT()->cursor.irow()->previous()) {
+ if (TEXT()->cursor.irow() != TEXT()->rows().begin()) {
#if 1
TEXT()->setCursorFromCoordinates(
TEXT()->cursor.ix() + inset_x,
TEXT()->cursorUp(view());
#endif
moveCursorUpdate(true, false);
- owner->view_state_changed();
} else {
- view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
+ view()->update(TEXT(), BufferView::SELECT);
}
+ owner->clearMessage();
goto exit_with_message;
} else if (result == FINISHED_DOWN) {
- if (TEXT()->cursor.irow()->next()) {
+ if (boost::next(TEXT()->cursor.irow()) != TEXT()->rows().end()) {
#if 1
TEXT()->setCursorFromCoordinates(
TEXT()->cursor.ix() + inset_x,
TEXT()->cursorRight(view());
}
moveCursorUpdate(true, false);
- owner->view_state_changed();
+ owner->clearMessage();
goto exit_with_message;
}
#warning I am not sure this is still right, please have a look! (Jug 20020417)
}
goto exit_with_message;
case LFUN_DOWN:
- if (TEXT()->cursor.row()->next())
+ if (boost::next(TEXT()->cursor.row()) != TEXT()->rows().end())
TEXT()->cursorDown(view());
else
TEXT()->cursorRight(view());
if (!searched_string.empty()) {
lyxfind::LyXFind(view(), searched_string, fw);
}
-// view()->showCursor();
}
break;
case LFUN_PREFIX:
{
if (view()->available() && !view()->theLockingInset()) {
- view()->update(TEXT(),
- BufferView::SELECT|BufferView::FITCUR);
+ view()->update(TEXT(), BufferView::SELECT);
}
owner->message(keyseq.printOptions());
}
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
- ostringstream s1;
-#if USE_BOOST_FORMAT
- s1 << boost::format(_("Saving document %1$s..."))
- % MakeDisplayPath(owner->buffer()->fileName());
-#else
- s1 << _("Saving document ")
- << MakeDisplayPath(owner->buffer()->fileName())
- << _("...");
-#endif
- owner->message(STRCONV(s1.str()));
- MenuWrite(view(), owner->buffer());
- s1 << _(" done.");
- owner->message(STRCONV(s1.str()));
+ string const str = bformat(_("Saving document %1$s..."),
+ MakeDisplayPath(owner->buffer()->fileName()));
+ owner->message(str);
+ MenuWrite(owner->buffer());
+ owner->message(str + _(" done."));
} else
- WriteAs(view(), owner->buffer());
+ WriteAs(owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(view(), owner->buffer(), argument);
+ WriteAs(owner->buffer(), argument);
break;
- case LFUN_MENURELOAD:
- view()->reload();
+ case LFUN_MENURELOAD: {
+ string const file = MakeDisplayPath(view()->buffer()->fileName(), 20);
+ string text = bformat(_("Any changes will be lost. Are you sure "
+ "you want to revert to the saved version of the document %1$s?"), file);
+ int const ret = Alert::prompt(_("Revert to saved document?"),
+ text, 0, 1, _("&Revert"), _("&Cancel"));
+
+ if (ret == 0)
+ view()->reload();
break;
+ }
case LFUN_UPDATE:
Exporter::Export(owner->buffer(), argument, true);
break;
case LFUN_RUNCHKTEX:
- MenuRunChktex(owner->buffer());
- break;
-
- case LFUN_MENUPRINT:
- owner->getDialogs().showPrint();
+ owner->buffer()->runChktex();
break;
case LFUN_EXPORT:
view()->redo();
break;
- case LFUN_MENUSEARCH:
- owner->getDialogs().showSearch();
- break;
-
- case LFUN_REMOVEERRORS:
- if (view()->removeAutoInsets()) {
-#warning repaint() or update() or nothing ?
- view()->repaint();
- view()->fitCursor();
- }
- break;
-
case LFUN_DEPTH_MIN:
- changeDepth(view(), TEXT(false), -1);
+ changeDepth(view(), TEXT(false), DEC_DEPTH, false);
+ owner->view_state_changed();
break;
case LFUN_DEPTH_PLUS:
- changeDepth(view(), TEXT(false), 1);
+ changeDepth(view(), TEXT(false), INC_DEPTH, false);
+ owner->view_state_changed();
break;
case LFUN_FREEFONT_APPLY:
//#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
- case LFUN_HELP_ABOUTLYX:
- owner->getDialogs().show("about");
- break;
-
- case LFUN_HELP_TEXINFO:
- owner->getDialogs().showTexinfo();
- break;
-
case LFUN_HELP_OPEN:
{
string const arg = argument;
<< arg << "'. Bad installation?" << endl;
break;
}
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Opening help file %1$s..."))
- % MakeDisplayPath(fname);
-#else
- str << _("Opening help file ")
- << MakeDisplayPath(fname) << _("...");
-#endif
- owner->message(STRCONV(str.str()));
- view()->buffer(bufferlist.loadLyXFile(fname, false));
+ owner->message(bformat(_("Opening help file %1$s..."),
+ MakeDisplayPath(fname)));
+ view()->loadLyXFile(fname, false);
break;
}
}
break;
- case LFUN_VC_HISTORY:
- {
- owner->getDialogs().showVCLogFile();
- break;
- }
-
// --- buffers ----------------------------------------
case LFUN_SWITCHBUFFER:
open(argument);
break;
- case LFUN_LATEX_LOG:
- owner->getDialogs().showLogFile();
- break;
-
- case LFUN_LAYOUT_DOCUMENT:
- owner->getDialogs().showDocument();
- break;
-
- case LFUN_LAYOUT_CHARACTER: {
- string data = freefont2string();
- if (!data.empty())
- owner->getDialogs().show("character", data);
- break;
- }
-
case LFUN_LAYOUT_TABULAR:
if (view()->theLockingInset()) {
if (view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
}
break;
- case LFUN_LAYOUT_PREAMBLE:
- owner->getDialogs().showPreamble();
- break;
-
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar().openLayoutList();
break;
owner->getMenubar().openByName(argument);
break; // RVDK_PATCH_5
- case LFUN_SPELLCHECK:
- owner->getDialogs().showSpellchecker();
- break;
-
// --- lyxserver commands ----------------------------
if (bufferlist.exists(s)) {
view()->buffer(bufferlist.getBuffer(s));
} else {
- view()->buffer(bufferlist.loadLyXFile(s));
+ view()->loadLyXFile(s);
}
view()->setCursorFromRow(row);
int id;
istr >> id;
- Paragraph * par = owner->buffer()->getParFromID(id);
- if (par == 0) {
+ ParIterator par = owner->buffer()->getParFromID(id);
+ if (par == owner->buffer()->par_iterator_end()) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
<< id << ']' << endl;
break;
if (view()->theLockingInset())
view()->unlockInset(view()->theLockingInset());
if (par->inInset()) {
- par->inInset()->edit(view());
+ FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
+ par->inInset()->localDispatch(cmd);
}
// Set the cursor
- view()->getLyXText()->setCursor(par, 0);
+ view()->getLyXText()->setCursor(par.pit(), 0);
view()->switchKeyMap();
owner->view_state_changed();
}
break;
- case LFUN_APROPOS:
- case LFUN_GETTIP:
- {
- int const qa = lyxaction.LookupFunc(argument);
- setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
- }
- break;
-
// --- insert characters ----------------------------------------
// --- Mathed stuff. If we are here, there is no locked inset yet.
dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
break;
- case LFUN_MATH_PANEL:
- owner->getDialogs().showMathPanel();
+ case LFUN_DIALOG_SHOW: {
+ string const name = ev.getArg(0);
+ string data = trim(ev.argument.substr(name.size()));
+
+ if (name == "character") {
+ data = freefont2string();
+ if (!data.empty())
+ owner->getDialogs().show("character", data);
+ } else if (name == "document")
+ owner->getDialogs().showDocument();
+ else if (name == "findreplace")
+ owner->getDialogs().showSearch();
+ else if (name == "forks")
+ owner->getDialogs().showForks();
+ else if (name == "preamble")
+ owner->getDialogs().showPreamble();
+ else if (name == "preferences")
+ owner->getDialogs().showPreferences();
+ else if (name == "print")
+ owner->getDialogs().showPrint();
+ else if (name == "spellchecker")
+ owner->getDialogs().showSpellchecker();
+ else
+ owner->getDialogs().show(name, data);
break;
+ }
case LFUN_DIALOG_SHOW_NEW_INSET: {
string const & name = argument;
if (bufferlist.exists(filename))
view()->buffer(bufferlist.getBuffer(filename));
else
- view()->buffer(bufferlist.loadLyXFile(filename));
+ view()->loadLyXFile(filename);
}
break;
}
break;
- case LFUN_DIALOG_PREFERENCES:
- owner->getDialogs().showPreferences();
- break;
-
case LFUN_SAVEPREFERENCES:
{
Path p(user_lyxdir);
x11_name != lcolor.getX11Name(LColor::graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
-#if USE_BOOST_FORMAT
setErrorMessage(
- boost::io::str(
- boost::format(
- _("Set-color \"%1$s\" failed "
+ bformat(_("Set-color \"%1$s\" failed "
"- color is undefined or "
- "may not be redefined"))
- % lyx_name));
-#else
- setErrorMessage(_("Set-color ") + lyx_name
- + _(" failed - color is undefined"
- " or may not be redefined"));
-#endif
-
+ "may not be redefined"), lyx_name));
break;
}
owner->message(argument);
break;
- case LFUN_FORKS_SHOW:
- owner->getDialogs().showForks();
- break;
-
case LFUN_FORKS_KILL:
{
if (!isStrInt(argument))
owner->getDialogs().toggleTooltips();
break;
+ case LFUN_EXTERNAL_EDIT: {
+ InsetExternal()
+ .localDispatch(FuncRequest(view(), action, argument));
+ break;
+ }
+
default:
// Then if it was none of the above
// Trying the BufferView::pimpl dispatch:
} // end of switch
exit_with_message:
+
+ view()->owner()->updateLayoutChoice();
+
+ if (view()->available()) {
+ view()->fitCursor();
+
+ // If we executed a mutating lfun, mark the buffer as dirty
+ if (!lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
+ && !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
+ view()->buffer()->markDirty();
+ }
+
sendDispatchMessage(getMessage(), ev, verbose);
}
templname = fname;
}
- view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
+ view()->buffer(newFile(filename, templname, !name.empty()));
}
// if the file doesn't exist, let the user create one
FileInfo const f(filename, true);
if (!f.exist()) {
- if (!Alert::askQuestion(_("No such file"), disp_fn,
- _("Start a new document with this filename ?"))) {
- owner->message(_("Canceled."));
- return;
- }
// the user specifically chose this name. Believe them.
- Buffer * buffer = bufferlist.newFile(filename, "", true);
+ Buffer * buffer = newFile(filename, "", true);
view()->buffer(buffer);
return;
}
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Opening document %1$s...")) % disp_fn;
-#else
- str << _("Opening document ") << disp_fn << _("...");
-#endif
+ owner->message(bformat(_("Opening document %1$s..."), disp_fn));
- owner->message(STRCONV(str.str()));
-
- Buffer * openbuf = bufferlist.loadLyXFile(filename);
- ostringstream str2;
- if (openbuf) {
- view()->buffer(openbuf);
-#if USE_BOOST_FORMAT
- str2 << boost::format(_("Document %1$s opened.")) % disp_fn;
-#else
- str2 << _("Document ") << disp_fn << _(" opened.");
-#endif
+ string str2;
+ if (view()->loadLyXFile(filename)) {
+ str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
-#if USE_BOOST_FORMAT
- str2 << boost::format(_("Could not open document %1$s"))
- % disp_fn;
-#else
- str2 << _("Could not open document ") << disp_fn;
-#endif
+ str2 = bformat(_("Could not open document %1$s"), disp_fn);
}
- owner->message(STRCONV(str2.str()));
+ owner->message(str2);
}
initpath = trypath;
}
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Select %1$s file to import"));
- fmt % formats.prettyName(format);
- string const text = fmt.str();
-#else
- string const text = _("Select ") + formats.prettyName(format)
- + _(" file to import");;
-#endif
+ string const text = bformat(_("Select %1$s file to import"),
+ formats.prettyName(format));
FileDialog fileDlg(text,
LFUN_IMPORT,
string const lyxfile = ChangeExtension(filename, ".lyx");
// Check if the document already is 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:
- // If close is canceled, we cancel here too.
- if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
- return;
- break;
- case 2:
- view()->buffer(bufferlist.getBuffer(lyxfile));
- return;
- case 3:
- owner->message(_("Canceled."));
- return;
- }
+ if (lyx_gui::use_gui && bufferlist.exists(lyxfile)) {
+ if (!bufferlist.close(bufferlist.getBuffer(lyxfile), true)) {
+ 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?"))) {
+ string const file = MakeDisplayPath(lyxfile, 30);
+
+ string text = bformat(_("The document %1$s already exists.\n\n"
+ "Do you want to over-write that document?"), file);
+ int const ret = Alert::prompt(_("Over-write document?"),
+ text, 0, 1, _("&Over-write"), _("&Cancel"));
+
+ if (ret == 1) {
owner->message(_("Canceled."));
return;
}
void LyXFunc::closeBuffer()
{
- if (bufferlist.close(owner->buffer()) && !quitting) {
+ 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