#include "Buffer.h"
#include "BufferList.h"
#include "BufferParams.h"
-#include "bufferview_funcs.h"
#include "BufferView.h"
-#include "callback.h"
#include "Color.h"
#include "Cursor.h"
#include "CutAndPaste.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;
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)
{
}
keyseq.clear();
// copied verbatim from do_accent_char
view()->cursor().resetAnchor();
- view()->update();
+ view()->processUpdateFlags(Update::FitCursor);
}
}
-void LyXFunc::processKeySym(KeySymbol const & 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;
if (!keysym.isOK()) {
LYXERR(Debug::KEY) << "Empty kbd action (probably composing)"
<< endl;
+ restartCursor(lyx_view_);
return;
}
if (keysym.isModifier()) {
LYXERR(Debug::KEY) << "isModifier true" << endl;
+ restartCursor(lyx_view_);
return;
}
// 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));
}
// 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="
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (keyseq.length() > 1) {
+ if (keyseq.length() > 1)
lyx_view_->message(keyseq.print(true));
- }
// 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;
}
} 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
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());
- break;
-
case LFUN_VC_REGISTER:
enable = !buf->lyxvc().inUse();
break;
&& (!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);
}
else if (name == "print")
enable = Exporter::isExportable(*buf, "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));
else if (name == "spellchecker")
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)
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.")));
case LFUN_CANCEL:
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
keyseq.reset();
- meta_fake_bit = key_modifier::none;
+ 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;
+ meta_fake_bit = AltModifier;
setMessage(keyseq.print(true));
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:
docstring const str = bformat(_("Saving document %1$s..."),
makeDisplayPath(lyx_view_->buffer()->fileName()));
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);
+ b->menuWrite();
lyxerr[Debug::ACTION] << "Saved " << b->fileName() << endl;
} else
- writeAs(b);
+ b->writeAs();
}
b = theBufferList().next(b);
} while (b != first);
}
// 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);
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_);
name == "nomenclature" ||
name == "ref" ||
name == "toc" ||
- name == "url") {
+ name == "href") {
InsetCommandParams p(name);
data = InsetCommandMailer::params2string(name, p);
} else if (name == "include") {
InsetBranchParams p;
data = InsetBranchMailer::params2string(p);
} else if (name == "citation") {
- InsetCommandParams p("cite");
+ InsetCommandParams p("citation");
data = InsetCommandMailer::params2string(name, p);
} else if (name == "ert") {
data = InsetERTMailer::params2string(InsetCollapsable::Open);
arg = token(argument, '|', 0);
opt1 = token(argument, '|', 1);
}
- InsetCommandParams icp("cite");
+ InsetCommandParams icp("citation");
icp["key"] = from_utf8(arg);
if (!opt1.empty())
icp["before"] = from_utf8(opt1);
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);
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);
}
// 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
bool LyXFunc::wasMetaKey() const
{
- return (meta_fake_bit != key_modifier::none);
+ return (meta_fake_bit != NoModifier);
}
projects / lyx.git / blobdiff