#include "LyXFunc.h"
#include "BranchList.h"
-#include "Buffer.h"
#include "buffer_funcs.h"
+#include "Buffer.h"
#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
+#include "CmdDef.h"
+#include "Color.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h"
-#include "Exporter.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Intl.h"
#include "KeyMap.h"
#include "Language.h"
-#include "Color.h"
-#include "Session.h"
-#include "LyX.h"
-#include "callback.h"
+#include "Lexer.h"
#include "LyXAction.h"
#include "lyxfind.h"
-#include "Lexer.h"
+#include "LyX.h"
#include "LyXRC.h"
-#include "Row.h"
-#include "Server.h"
-#include "TextClassList.h"
#include "LyXVC.h"
#include "Paragraph.h"
-#include "ParIterator.h"
#include "ParagraphParameters.h"
-#include "Undo.h"
+#include "ParIterator.h"
+#include "Row.h"
+#include "Server.h"
+#include "Session.h"
+#include "TextClassList.h"
+#include "ToolbarBackend.h"
#include "insets/InsetBox.h"
#include "insets/InsetBranch.h"
#include "support/environment.h"
#include "support/FileFilterList.h"
#include "support/filetools.h"
-#include "support/ForkedcallsController.h"
#include "support/fs_extras.h"
#include "support/lstrings.h"
#include "support/Path.h"
namespace lyx {
-using bv_funcs::freefont2string;
-
using frontend::LyXView;
using support::absolutePath;
using support::FileFilterList;
using support::FileName;
using support::fileSearch;
-using support::ForkedcallsController;
using support::i18nLibFileSearch;
-using support::isDirWriteable;
-using support::isFileReadable;
-using support::isStrInt;
-using support::makeAbsPath;
using support::makeDisplayPath;
+using support::makeAbsPath;
using support::package;
using support::quoteName;
using support::rtrim;
namespace Alert = frontend::Alert;
+extern bool quitting;
namespace {
-bool getLocalStatus(Cursor cursor,
- FuncRequest const & cmd, FuncStatus & status)
+// This function runs "configure" and then rereads lyx.defaults to
+// reconfigure the automatic settings.
+void reconfigure(LyXView & lv, string const & option)
+{
+ // emit message signal.
+ lv.message(_("Running configure..."));
+
+ // Run configure in user lyx directory
+ support::Path p(package().user_support());
+ string configure_command = package().configure_command();
+ configure_command += option;
+ Systemcall one;
+ int ret = one.startscript(Systemcall::Wait, configure_command);
+ p.pop();
+ // emit message signal.
+ lv.message(_("Reloading configuration..."));
+ lyxrc.read(support::libFileSearch(string(), "lyxrc.defaults"));
+ // Re-read packages.lst
+ LaTeXFeatures::getAvailable();
+
+ if (ret)
+ Alert::information(_("System reconfiguration failed"),
+ _("The system reconfiguration has failed.\n"
+ "Default textclass is used but LyX may "
+ "not be able to work properly.\n"
+ "Please reconfigure again if needed."));
+ else
+
+ Alert::information(_("System reconfigured"),
+ _("The system has been reconfigured.\n"
+ "You need to restart LyX to make use of any\n"
+ "updated document class specifications."));
+}
+
+
+bool getLocalStatus(Cursor cursor, FuncRequest const & cmd, FuncStatus & status)
{
// Try to fix cursor in case it is broken.
cursor.fixIfBroken();
}
+
LyXFunc::LyXFunc()
- : lyx_view_(0),
- encoded_last_key(0),
- meta_fake_bit(key_modifier::none)
+ : lyx_view_(0), encoded_last_key(0), meta_fake_bit(NoModifier)
{
}
void LyXFunc::initKeySequences(KeyMap * kb)
{
- keyseq.reset(new KeySequence(kb, kb));
- cancel_meta_seq.reset(new KeySequence(kb, kb));
+ keyseq = KeySequence(kb, kb);
+ cancel_meta_seq = KeySequence(kb, kb);
}
{
char_type c = encoded_last_key;
- if (keyseq->length())
+ if (keyseq.length())
c = 0;
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
c, get_accent(action).accent, view()->cursor().innerText(), view()->cursor());
// Need to clear, in case the minibuffer calls these
// actions
- keyseq->clear();
+ keyseq.clear();
// copied verbatim from do_accent_char
view()->cursor().resetAnchor();
- view()->update();
+ view()->processUpdateFlags(Update::FitCursor);
}
return;
// if the current buffer is not that one, switch to it.
- if (lyx_view_->buffer()->fileName() != file) {
+ if (lyx_view_->buffer()->absFileName() != file) {
if (!switchToBuffer)
return;
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
}
-void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
+namespace {
+void restartCursor(LyXView * lv)
+{
+ /* When we move around, or type, it's nice to be able to see
+ * the cursor immediately after the keypress.
+ */
+ if (lv && lv->currentWorkArea())
+ lv->currentWorkArea()->startBlinkingCursor();
+}
+}
+
+void LyXFunc::processKeySym(KeySymbol const & keysym, KeyModifier state)
{
- LYXERR(Debug::KEY) << "KeySym is " << keysym->getSymbolName() << endl;
+ LYXERR(Debug::KEY) << "KeySym is " << 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;
+ restartCursor(lyx_view_);
return;
}
- if (keysym->isModifier()) {
+ if (keysym.isModifier()) {
LYXERR(Debug::KEY) << "isModifier true" << endl;
+ restartCursor(lyx_view_);
return;
}
//Encoding const * encoding = view()->cursor().getEncoding();
- //encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
+ //encoded_last_key = keysym.getISOEncoded(encoding ? encoding->name() : "");
// FIXME: encoded_last_key shadows the member variable of the same
// name. Is that intended?
- char_type encoded_last_key = keysym->getUCSEncoded();
+ char_type encoded_last_key = keysym.getUCSEncoded();
// Do a one-deep top-level lookup for
// cancel and meta-fake keys. RVDK_PATCH_5
- cancel_meta_seq->reset();
+ cancel_meta_seq.reset();
- FuncRequest func = cancel_meta_seq->addkey(keysym, state);
+ FuncRequest func = cancel_meta_seq.addkey(keysym, state);
LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
<< " action first set to [" << func.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.
- // Mostly, meta_fake_bit = key_modifier::none. RVDK_PATCH_5.
+ // Mostly, meta_fake_bit = NoModifier. RVDK_PATCH_5.
if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
// remove Caps Lock and Mod2 as a modifiers
- func = keyseq->addkey(keysym, (state | meta_fake_bit));
+ func = keyseq.addkey(keysym, (state | meta_fake_bit));
LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
<< "action now set to ["
<< func.action << ']' << endl;
}
// Dont remove this unless you know what you are doing.
- meta_fake_bit = key_modifier::none;
+ meta_fake_bit = NoModifier;
// Can this happen now ?
- if (func.action == LFUN_NOACTION) {
+ if (func.action == LFUN_NOACTION)
func = FuncRequest(LFUN_COMMAND_PREFIX);
- }
LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
<< " Key [action="
<< func.action << "]["
- << to_utf8(keyseq->print(false)) << ']'
+ << to_utf8(keyseq.print(KeySequence::Portable)) << ']'
<< endl;
// already here we know if it any point in going further
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (keyseq->length() > 1) {
- lyx_view_->message(keyseq->print(true));
- }
+ if (keyseq.length() > 1)
+ lyx_view_->message(keyseq.print(KeySequence::ForGui));
// Maybe user can only reach the key via holding down shift.
// Let's see. But only if shift is the only modifier
- if (func.action == LFUN_UNKNOWN_ACTION &&
- state == key_modifier::shift) {
+ if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
LYXERR(Debug::KEY) << "Trying without shift" << endl;
- func = keyseq->addkey(keysym, key_modifier::none);
+ func = keyseq.addkey(keysym, NoModifier);
LYXERR(Debug::KEY) << "Action now " << func.action << endl;
}
// Hmm, we didn't match any of the keysequences. See
// if it's normal insertable text not already covered
// by a binding
- if (keysym->isText() && keyseq->length() == 1) {
+ if (keysym.isText() && keyseq.length() == 1) {
LYXERR(Debug::KEY) << "isText() is true, inserting." << endl;
func = FuncRequest(LFUN_SELF_INSERT,
FuncRequest::KEYBOARD);
} else {
LYXERR(Debug::KEY) << "Unknown, !isText() - giving up" << endl;
lyx_view_->message(_("Unknown function."));
+ restartCursor(lyx_view_);
return;
}
}
dispatch(func);
}
- /* When we move around, or type, it's nice to be able to see
- * the cursor immediately after the keypress.
- */
- if (lyx_view_ && lyx_view_->currentWorkArea())
- lyx_view_->currentWorkArea()->startBlinkingCursor();
+ restartCursor(lyx_view_);
}
//lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
FuncStatus flag;
- Cursor & cur = view()->cursor();
-
/* In LyX/Mac, when a dialog is open, the menus of the
application can still be accessed without giving focus to
the main window. In this case, we want to disable the menu
case LFUN_BUFFER_SWITCH:
// toggle on the current buffer, but do not toggle off
// the other ones (is that a good idea?)
- if (buf && to_utf8(cmd.argument()) == buf->fileName())
+ if (buf && to_utf8(cmd.argument()) == buf->absFileName())
flag.setOnOff(true);
break;
case LFUN_BUFFER_EXPORT:
enable = cmd.argument() == "custom"
- || Exporter::isExportable(*buf, to_utf8(cmd.argument()));
+ || buf->isExportable(to_utf8(cmd.argument()));
break;
case LFUN_BUFFER_CHKTEX:
break;
case LFUN_BUILD_PROGRAM:
- enable = Exporter::isExportable(*buf, "program");
- break;
-
- case LFUN_LAYOUT_TABULAR:
- enable = cur.innerInsetOfType(Inset::TABULAR_CODE);
- break;
-
- case LFUN_LAYOUT:
- case LFUN_LAYOUT_PARAGRAPH:
- enable = !cur.inset().forceDefaultParagraphs(cur.idx());
+ enable = buf->isExportable("program");
break;
case LFUN_VC_REGISTER:
enable = buf->lyxvc().inUse();
break;
case LFUN_BUFFER_RELOAD:
- enable = !buf->isUnnamed() && fs::exists(buf->fileName())
+ enable = !buf->isUnnamed() && fs::exists(buf->absFileName())
&& (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
break;
- case LFUN_INSET_SETTINGS: {
- enable = false;
- if (!cur)
+ case LFUN_INSET_APPLY: {
+ if (!view()) {
+ enable = false;
break;
- Inset::Code code = cur.inset().lyxCode();
- switch (code) {
- case Inset::TABULAR_CODE:
- enable = cmd.argument() == "tabular";
- break;
- case Inset::ERT_CODE:
- enable = cmd.argument() == "ert";
- break;
- case Inset::FLOAT_CODE:
- enable = cmd.argument() == "float";
- break;
- case Inset::WRAP_CODE:
- enable = cmd.argument() == "wrap";
- break;
- case Inset::NOTE_CODE:
- enable = cmd.argument() == "note";
- break;
- case Inset::BRANCH_CODE:
- enable = cmd.argument() == "branch";
- break;
- case Inset::BOX_CODE:
- enable = cmd.argument() == "box";
- break;
- case Inset::LISTINGS_CODE:
- enable = cmd.argument() == "listings";
- break;
- default:
- break;
}
- break;
- }
-
- case LFUN_INSET_APPLY: {
string const name = cmd.getArg(0);
Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
FuncStatus fs;
- if (!inset->getStatus(cur, fr, fs)) {
+ if (!inset->getStatus(view()->cursor(), fr, fs)) {
// Every inset is supposed to handle this
BOOST_ASSERT(false);
}
|| name == "prefs"
|| name == "texinfo";
else if (name == "print")
- enable = Exporter::isExportable(*buf, "dvi")
+ enable = buf->isExportable("dvi")
&& lyxrc.print_command != "none";
- else if (name == "character")
- enable = cur.inset().lyxCode() != Inset::ERT_CODE &&
- cur.inset().lyxCode() != Inset::LISTINGS_CODE;
+ else if (name == "character") {
+ if (!view())
+ enable = false;
+ else {
+ InsetCode ic = view()->cursor().inset().lyxCode();
+ enable = ic != ERT_CODE && ic != LISTINGS_CODE;
+ }
+ }
else if (name == "latexlog")
- enable = isFileReadable(FileName(buf->getLogName().second));
+ enable = FileName(buf->logName().second).isFileReadable();
else if (name == "spellchecker")
#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
enable = !buf->isReadonly();
break;
}
- case LFUN_DIALOG_SHOW_NEW_INSET:
- enable = cur.inset().lyxCode() != Inset::ERT_CODE &&
- cur.inset().lyxCode() != Inset::LISTINGS_CODE;
- if (cur.inset().lyxCode() == Inset::CAPTION_CODE) {
- FuncStatus flag;
- if (cur.inset().getStatus(cur, cmd, flag))
- return flag;
- }
- break;
-
case LFUN_DIALOG_UPDATE: {
string const name = cmd.getArg(0);
if (!buf)
FuncRequest func(lyxaction.lookupFunc(firstcmd));
func.origin = cmd.origin;
flag = getStatus(func);
+ break;
+ }
+
+ case LFUN_CALL: {
+ FuncRequest func;
+ std::string name(to_utf8(cmd.argument()));
+ if (LyX::ref().topLevelCmdDef().lock(name, func)) {
+ func.origin = cmd.origin;
+ flag = getStatus(func);
+ LyX::ref().topLevelCmdDef().release(name);
+ } else {
+ // catch recursion or unknown command definiton
+ // all operations until the recursion or unknown command
+ // definiton occures are performed, so set the state to enabled
+ enable = true;
+ }
+ break;
}
case LFUN_BUFFER_NEW:
case LFUN_BUFFER_WRITE_AS:
case LFUN_BUFFER_UPDATE:
case LFUN_BUFFER_VIEW:
+ case LFUN_MASTER_BUFFER_UPDATE:
+ case LFUN_MASTER_BUFFER_VIEW:
case LFUN_BUFFER_IMPORT:
case LFUN_BUFFER_AUTO_SAVE:
case LFUN_RECONFIGURE:
case LFUN_BUFFER_PARAMS_APPLY:
case LFUN_LAYOUT_MODULES_CLEAR:
case LFUN_LAYOUT_MODULE_ADD:
+ case LFUN_LAYOUT_RELOAD:
case LFUN_LYXRC_APPLY:
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
break;
default:
- if (!getLocalStatus(cur, cmd, flag))
+ if (!view()) {
+ enable = false;
+ break;
+ }
+ if (!getLocalStatus(view()->cursor(), cmd, flag))
flag = view()->getStatus(cmd);
}
}
// Are we in a DELETED change-tracking region?
- if (buf && lookupChangeType(cur, true) == Change::DELETED
+ if (buf && view()
+ && lookupChangeType(view()->cursor(), true) == Change::DELETED
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
flag.message(from_utf8(N_("This portion of the document is deleted.")));
if (buf.isClean())
return true;
- docstring const file = makeDisplayPath(buf.fileName(), 30);
+ docstring const file = makeDisplayPath(buf.absFileName(), 30);
docstring text = bformat(_("The document %1$s has unsaved "
"changes.\n\nDo you want to save "
"the document?"), file);
}
-void loadTextclass(string const & name)
+void loadTextClass(string const & name)
{
std::pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(name);
case LFUN_COMMAND_PREFIX:
BOOST_ASSERT(lyx_view_);
- lyx_view_->message(keyseq->printOptions(true));
+ lyx_view_->message(keyseq.printOptions(true));
break;
case LFUN_COMMAND_EXECUTE:
case LFUN_CANCEL:
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
- keyseq->reset();
- meta_fake_bit = key_modifier::none;
+ keyseq.reset();
+ meta_fake_bit = NoModifier;
if (lyx_view_->buffer())
// cancel any selection
dispatch(FuncRequest(LFUN_MARK_OFF));
break;
case LFUN_META_PREFIX:
- meta_fake_bit = key_modifier::alt;
- setMessage(keyseq->print(true));
+ meta_fake_bit = AltModifier;
+ setMessage(keyseq.print(KeySequence::ForGui));
break;
- case LFUN_BUFFER_TOGGLE_READ_ONLY:
+ case LFUN_BUFFER_TOGGLE_READ_ONLY: {
BOOST_ASSERT(lyx_view_ && lyx_view_->view() && lyx_view_->buffer());
- if (lyx_view_->buffer()->lyxvc().inUse())
- lyx_view_->buffer()->lyxvc().toggleReadOnly();
+ Buffer * buf = lyx_view_->buffer();
+ if (buf->lyxvc().inUse())
+ buf->lyxvc().toggleReadOnly();
else
- lyx_view_->buffer()->setReadonly(
- !lyx_view_->buffer()->isReadonly());
+ buf->setReadonly(!lyx_view_->buffer()->isReadonly());
break;
+ }
// --- Menus -----------------------------------------------
case LFUN_BUFFER_NEW:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (!lyx_view_->buffer()->isUnnamed()) {
docstring const str = bformat(_("Saving document %1$s..."),
- makeDisplayPath(lyx_view_->buffer()->fileName()));
+ makeDisplayPath(lyx_view_->buffer()->absFileName()));
lyx_view_->message(str);
- menuWrite(lyx_view_->buffer());
+ lyx_view_->buffer()->menuWrite();
lyx_view_->message(str + _(" done."));
} else {
- writeAs(lyx_view_->buffer());
+ lyx_view_->buffer()->writeAs();
}
updateFlags = Update::None;
break;
case LFUN_BUFFER_WRITE_AS:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- writeAs(lyx_view_->buffer(), argument);
+ lyx_view_->buffer()->writeAs(argument);
updateFlags = Update::None;
break;
do {
if (!b->isClean()) {
if (!b->isUnnamed()) {
- menuWrite(b);
- lyxerr[Debug::ACTION] << "Saved " << b->fileName() << endl;
+ b->menuWrite();
+ lyxerr[Debug::ACTION] << "Saved " << b->absFileName() << endl;
} else
- writeAs(b);
+ b->writeAs();
}
b = theBufferList().next(b);
} while (b != first);
case LFUN_BUFFER_RELOAD: {
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- docstring const file = makeDisplayPath(lyx_view_->buffer()->fileName(), 20);
+ docstring const file = makeDisplayPath(lyx_view_->buffer()->absFileName(), 20);
docstring 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?"),
case LFUN_BUFFER_UPDATE:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::Export(lyx_view_->buffer(), argument, true);
+ lyx_view_->buffer()->doExport(argument, true);
break;
case LFUN_BUFFER_VIEW:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::preview(lyx_view_->buffer(), argument);
+ lyx_view_->buffer()->preview(argument);
+ break;
+
+ case LFUN_MASTER_BUFFER_UPDATE:
+ BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->masterBuffer());
+ lyx_view_->buffer()->masterBuffer()->doExport(argument, true);
+ break;
+
+ case LFUN_MASTER_BUFFER_VIEW:
+ BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->masterBuffer());
+ lyx_view_->buffer()->masterBuffer()->preview(argument);
break;
case LFUN_BUILD_PROGRAM:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::Export(lyx_view_->buffer(), "program", true);
+ lyx_view_->buffer()->doExport("program", true);
break;
case LFUN_BUFFER_CHKTEX:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
lyx_view_->getDialogs().show("sendto");
- else {
- Exporter::Export(lyx_view_->buffer(), argument, false);
- }
+ else
+ lyx_view_->buffer()->doExport(argument, false);
break;
case LFUN_BUFFER_EXPORT_CUSTOM: {
// Output to filename
if (format->name() == "lyx") {
- string const latexname =
- buffer->getLatexName(false);
+ string const latexname = buffer->latexName(false);
filename = changeExtension(latexname,
format->extension());
filename = addName(buffer->temppath(), filename);
break;
} else {
- Exporter::Export(buffer, format_name, true, filename);
+ buffer->doExport(format_name, true, filename);
}
// Substitute $$FName for filename
Buffer * buffer = lyx_view_->buffer();
- if (!Exporter::Export(buffer, "dvi", true)) {
- showPrintError(buffer->fileName());
+ if (!buffer->doExport("dvi", true)) {
+ showPrintError(buffer->absFileName());
break;
}
// Push directory path.
- string const path(buffer->temppath());
+ string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
support::Path p(pp);
Systemcall one;
int res = 0;
string const dviname =
- changeExtension(buffer->getLatexName(true),
- "dvi");
+ changeExtension(buffer->latexName(true), "dvi");
if (target == "printer") {
if (!lyxrc.print_spool_command.empty()) {
FileName const filename(makeAbsPath(target_name,
lyx_view_->buffer()->filePath()));
FileName const dvifile(makeAbsPath(dviname, path));
- if (fs::exists(filename.toFilesystemEncoding())) {
+ if (filename.exists()) {
docstring text = bformat(
_("The file %1$s already exists.\n\n"
"Do you want to overwrite that file?"),
}
if (res != 0)
- showPrintError(buffer->fileName());
+ showPrintError(buffer->absFileName());
break;
}
break;
case LFUN_BUFFER_AUTO_SAVE:
- autoSave(view());
+ lyx_view_->buffer()->autoSave();
break;
case LFUN_RECONFIGURE:
BOOST_ASSERT(lyx_view_);
- reconfigure(*lyx_view_);
+ // argument is any additional parameter to the configure.py command
+ reconfigure(*lyx_view_, argument);
break;
case LFUN_HELP_OPEN: {
updateFlags = Update::None;
break;
- case LFUN_FILE_NEW:
+ case LFUN_FILE_NEW: {
BOOST_ASSERT(lyx_view_);
- newFile(*lyx_view_, argument);
+ string name;
+ string tmpname = split(argument, name, ':'); // Split filename
+ Buffer * const b = newFile(name, tmpname);
+ if (b)
+ lyx_view_->setBuffer(b);
updateFlags = Update::None;
break;
+ }
case LFUN_FILE_OPEN:
BOOST_ASSERT(lyx_view_);
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_NAME:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- setMessage(from_utf8(lyx_view_->buffer()->fileName()));
+ setMessage(from_utf8(lyx_view_->buffer()->absFileName()));
LYXERR(Debug::INFO) << "FNAME["
- << lyx_view_->buffer()->fileName()
+ << lyx_view_->buffer()->absFileName()
<< "] " << endl;
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = keyseq->print(false);
+ dispatch_buffer = keyseq.print(KeySequence::Portable);
theServer().notifyClient(to_utf8(dispatch_buffer));
break;
lyx_view_->getDialogs().show("character", data);
} else if (name == "latexlog") {
pair<Buffer::LogType, string> const logfile =
- lyx_view_->buffer()->getLogName();
+ lyx_view_->buffer()->logName();
switch (logfile.first) {
case Buffer::latexlog:
data = "latex ";
case LFUN_DIALOG_SHOW_NEW_INSET: {
BOOST_ASSERT(lyx_view_);
string const name = cmd.getArg(0);
+ InsetCode code = insetCode(name);
string data = trim(to_utf8(cmd.argument()).substr(name.size()));
- if (name == "bibitem" ||
- name == "bibtex" ||
- name == "index" ||
- name == "label" ||
- name == "nomenclature" ||
- name == "ref" ||
- name == "toc" ||
- name == "url") {
- InsetCommandParams p(name);
+ bool insetCodeOK = true;
+ switch (code) {
+ case BIBITEM_CODE:
+ case BIBTEX_CODE:
+ case INDEX_CODE:
+ case LABEL_CODE:
+ case NOMENCL_CODE:
+ case REF_CODE:
+ case TOC_CODE:
+ case HYPERLINK_CODE: {
+ InsetCommandParams p(code);
data = InsetCommandMailer::params2string(name, p);
- } else if (name == "include") {
+ break;
+ }
+ case INCLUDE_CODE: {
// data is the include type: one of "include",
// "input", "verbatiminput" or "verbatiminput*"
if (data.empty())
// default type is requested
data = "include";
- InsetCommandParams p(data);
+ InsetCommandParams p(INCLUDE_CODE, data);
data = InsetIncludeMailer::params2string(p);
- } else if (name == "box") {
+ break;
+ }
+ case BOX_CODE: {
// \c data == "Boxed" || "Frameless" etc
InsetBoxParams p(data);
data = InsetBoxMailer::params2string(p);
- } else if (name == "branch") {
+ break;
+ }
+ case BRANCH_CODE: {
InsetBranchParams p;
data = InsetBranchMailer::params2string(p);
- } else if (name == "citation") {
- InsetCommandParams p("cite");
+ break;
+ }
+ case CITE_CODE: {
+ InsetCommandParams p(CITE_CODE);
data = InsetCommandMailer::params2string(name, p);
- } else if (name == "ert") {
+ break;
+ }
+ case ERT_CODE: {
data = InsetERTMailer::params2string(InsetCollapsable::Open);
- } else if (name == "external") {
+ break;
+ }
+ case EXTERNAL_CODE: {
InsetExternalParams p;
Buffer const & buffer = *lyx_view_->buffer();
data = InsetExternalMailer::params2string(p, buffer);
- } else if (name == "float") {
+ break;
+ }
+ case FLOAT_CODE: {
InsetFloatParams p;
data = InsetFloatMailer::params2string(p);
- } else if (name == "listings") {
+ break;
+ }
+ case LISTINGS_CODE: {
InsetListingsParams p;
data = InsetListingsMailer::params2string(p);
- } else if (name == "graphics") {
+ break;
+ }
+ case GRAPHICS_CODE: {
InsetGraphicsParams p;
Buffer const & buffer = *lyx_view_->buffer();
data = InsetGraphicsMailer::params2string(p, buffer);
- } else if (name == "note") {
+ break;
+ }
+ case NOTE_CODE: {
InsetNoteParams p;
data = InsetNoteMailer::params2string(p);
- } else if (name == "vspace") {
+ break;
+ }
+ case VSPACE_CODE: {
VSpace space;
data = InsetVSpaceMailer::params2string(space);
- } else if (name == "wrap") {
+ break;
+ }
+ case WRAP_CODE: {
InsetWrapParams p;
data = InsetWrapMailer::params2string(p);
+ break;
}
- lyx_view_->getDialogs().show(name, data, 0);
+ default:
+ lyxerr << "Inset type '" << name <<
+ "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << std:: endl;
+ insetCodeOK = false;
+ break;
+ } // end switch(code)
+ if (insetCodeOK)
+ lyx_view_->getDialogs().show(name, data, 0);
break;
}
arg = token(argument, '|', 0);
opt1 = token(argument, '|', 1);
}
- InsetCommandParams icp("cite");
+ InsetCommandParams icp(CITE_CODE);
icp["key"] = from_utf8(arg);
if (!opt1.empty())
icp["before"] = from_utf8(opt1);
// Set the parent name of the child document.
// This makes insertion of citations and references in the child work,
// when the target is in the parent or another child document.
- child->setParentName(parent->fileName());
- updateLabels(*child->getMasterBuffer());
+ child->setParentName(parent->absFileName());
+ updateLabels(*child->masterBuffer());
lyx_view_->setBuffer(child);
if (parsed)
lyx_view_->showErrorList("Parse");
break;
}
+ case LFUN_CALL: {
+ FuncRequest func;
+ if (LyX::ref().topLevelCmdDef().lock(argument, func)) {
+ func.origin = cmd.origin;
+ dispatch(func);
+ LyX::ref().topLevelCmdDef().release(argument);
+ } else {
+ if (func.action == LFUN_UNKNOWN_ACTION) {
+ // unknown command definition
+ lyxerr << "Warning: unknown command definition `"
+ << argument << "'"
+ << endl;
+ } else {
+ // recursion detected
+ lyxerr << "Warning: Recursion in the command definition `"
+ << argument << "' detected"
+ << endl;
+ }
+ }
+ break;
+ }
+
case LFUN_PREFERENCES_SAVE: {
lyxrc.write(makeAbsPath("preferences",
package().user_support().absFilename()),
BOOST_ASSERT(lyx_view_);
string action;
string const name = split(argument, action, ' ');
- Inset::Code const inset_code =
- Inset::translate(name);
+ InsetCode const inset_code = insetCode(name);
Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_TOGGLE, action);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it) {
if (!it->asInsetMath()
- && (inset_code == Inset::NO_CODE
+ && (inset_code == NO_CODE
|| inset_code == it->lyxCode())) {
Cursor tmpcur = cur;
tmpcur.pushLeft(*it);
<< endl;
}
- if (defaults.writeFile(FileName(defaults.fileName())))
+ if (defaults.writeFile(FileName(defaults.absFileName())))
setMessage(bformat(_("Document defaults saved in %1$s"),
makeDisplayPath(fname)));
else
Buffer * buffer = lyx_view_->buffer();
- TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
- recordUndoFullDocument(view());
+ TextClassPtr oldClass = buffer->params().getTextClassPtr();
+
+ Cursor & cur = view()->cursor();
+ cur.recordUndoFullDocument();
istringstream ss(argument);
Lexer lex(0,0);
lyx_view_->buffer()->params().getEngine();
if (oldEngine != newEngine) {
- Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_REFRESH);
Inset & inset = lyx_view_->buffer()->inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it)
- if (it->lyxCode() == Inset::CITE_CODE)
+ if (it->lyxCode() == CITE_CODE)
it->dispatch(cur, fr);
}
case LFUN_LAYOUT_MODULES_CLEAR: {
BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer();
- TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
- recordUndoFullDocument(view());
+ TextClassPtr oldClass = buffer->params().getTextClassPtr();
+ view()->cursor().recordUndoFullDocument();
buffer->params().clearLayoutModules();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
case LFUN_LAYOUT_MODULE_ADD: {
BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer();
- TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
- recordUndoFullDocument(view());
+ TextClassPtr oldClass = buffer->params().getTextClassPtr();
+ view()->cursor().recordUndoFullDocument();
buffer->params().addLayoutModule(argument);
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer();
- loadTextclass(argument);
+ loadTextClass(argument);
std::pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(argument);
break;
//Save the old, possibly modular, layout for use in conversion.
- TextClass_ptr oldClass = buffer->params().getTextClass_ptr();
- recordUndoFullDocument(view());
+ TextClassPtr oldClass = buffer->params().getTextClassPtr();
+ view()->cursor().recordUndoFullDocument();
buffer->params().setBaseClass(new_class);
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
}
+
+ case LFUN_LAYOUT_RELOAD: {
+ BOOST_ASSERT(lyx_view_);
+ Buffer * buffer = lyx_view_->buffer();
+ TextClassPtr oldClass = buffer->params().getTextClassPtr();
+ textclass_type const tc = buffer->params().getBaseClass();
+ textclasslist.reset(tc);
+ buffer->params().setBaseClass(tc);
+ updateLayout(oldClass, buffer);
+ updateFlags = Update::Force | Update::FitCursor;
+ break;
+ }
case LFUN_TEXTCLASS_LOAD:
- loadTextclass(argument);
+ loadTextClass(argument);
break;
case LFUN_LYXRC_APPLY: {
// also initializes the position cache for all insets in
// (at least partially) visible top-level paragraphs.
// We will redraw the screen only if needed.
- if (view()->update(updateFlags)) {
- // Buffer::changed() signals that a repaint is needed.
- // The frontend (WorkArea) knows which area to repaint
- // thanks to the ViewMetricsInfo updated above.
- lyx_view_->buffer()->changed();
- }
-
+ view()->processUpdateFlags(updateFlags);
lyx_view_->updateStatusBar();
// if we executed a mutating lfun, mark the buffer as dirty
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
filename = addName(lyxrc.document_path,
"newfile" + convert<string>(++newfile_number) + ".lyx");
while (theBufferList().exists(filename) ||
- fs::is_readable(FileName(filename).toFilesystemEncoding())) {
+ FileName(filename).isReadable()) {
++newfile_number;
filename = addName(lyxrc.document_path,
"newfile" + convert<string>(newfile_number) +
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
filename = fullname.absFilename();
// if the file doesn't exist, let the user create one
- if (!fs::exists(fullname.toFilesystemEncoding())) {
+ if (!fullname.exists()) {
// the user specifically chose this name. Believe him.
Buffer * const b = newFile(filename, string(), true);
if (b)
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
// if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
- if (fs::exists(lyxfile.toFilesystemEncoding()) && fullname != lyxfile) {
+ if (lyxfile.exists() && fullname != lyxfile) {
docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
void LyXFunc::reloadBuffer()
{
- FileName filename(lyx_view_->buffer()->fileName());
+ FileName filename(lyx_view_->buffer()->absFileName());
docstring const disp_fn = makeDisplayPath(filename.absFilename());
docstring str;
closeBuffer();
{
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey())
- return keyseq->print(true) + "M-";
+ return keyseq.print(KeySequence::ForGui) + "M-";
// Else, when a non-complete key sequence is pressed,
// show the available options.
- if (keyseq->length() > 0 && !keyseq->deleted())
- return keyseq->printOptions(true);
+ if (keyseq.length() > 0 && !keyseq.deleted())
+ return keyseq.printOptions(true);
BOOST_ASSERT(lyx_view_);
if (!lyx_view_->buffer())
bool LyXFunc::wasMetaKey() const
{
- return (meta_fake_bit != key_modifier::none);
+ return (meta_fake_bit != NoModifier);
}
-void LyXFunc::updateLayout(TextClass_ptr const & oldlayout,
+void LyXFunc::updateLayout(TextClassPtr const & oldlayout,
Buffer * buffer)
{
lyx_view_->message(_("Converting document to new document class..."));
StableDocIterator backcur(view()->cursor());
ErrorList & el = buffer->errorList("Class Switch");
cap::switchBetweenClasses(
- oldlayout, buffer->params().getTextClass_ptr(),
+ oldlayout, buffer->params().getTextClassPtr(),
static_cast<InsetText &>(buffer->inset()), el);
view()->setCursor(backcur.asDocIterator(&(buffer->inset())));
case LyXRC::RC_DISPLAY_GRAPHICS:
case LyXRC::RC_DOCUMENTPATH:
if (lyxrc_orig.document_path != lyxrc_new.document_path) {
- string const encoded = FileName(
- lyxrc_new.document_path).toFilesystemEncoding();
- if (fs::exists(encoded) && fs::is_directory(encoded))
+ FileName path(lyxrc_new.document_path);
+ if (path.exists() && path.isDirectory())
support::package().document_dir() = FileName(lyxrc.document_path);
}
case LyXRC::RC_ESC_CHARS: