#include "lyxtextclasslist.h"
#include "lyxserver.h"
#include "MenuBackend.h"
+#include "mover.h"
#include "ToolbarBackend.h"
+#include "mathed/math_inset.h"
+
#include "frontends/Alert.h"
#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
-#include "support/FileInfo.h"
+#include "support/environment.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/os.h"
+#include "support/package.h"
#include "support/path.h"
-#include "support/path_defines.h"
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
#include <iostream>
#include <csignal>
using lyx::support::AddPath;
using lyx::support::bformat;
using lyx::support::createDirectory;
-using lyx::support::CreateLyXTmpDir;
-using lyx::support::FileInfo;
+using lyx::support::createLyXTmpDir;
using lyx::support::FileSearch;
-using lyx::support::GetEnv;
-using lyx::support::GetEnvPath;
+using lyx::support::getEnv;
using lyx::support::i18nLibFileSearch;
using lyx::support::LibFileSearch;
+using lyx::support::package;
using lyx::support::Path;
+using lyx::support::prependEnvPath;
+using lyx::support::QuoteName;
using lyx::support::rtrim;
-using lyx::support::setLyxPaths;
-using lyx::support::system_lyxdir;
-using lyx::support::user_lyxdir;
namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
using std::endl;
using std::string;
#endif
-extern void QuitLyX();
+extern void QuitLyX(bool);
extern LyXServer * lyxserver;
-boost::scoped_ptr<LastFiles> lastfiles;
-
// This is the global bufferlist object
BufferList bufferlist;
namespace {
+// Filled with the command line arguments "foo" of "-sysdir foo" or
+// "-userdir foo".
+string cl_system_support;
+string cl_user_support;
+
+
void showFileError(string const & error)
{
Alert::warning(_("Could not read configuration file"),
exit(EXIT_FAILURE);
}
+
+void reconfigureUserLyXDir()
+{
+ string const configure_script =
+ AddName(package().system_support(), "configure");
+ string const configure_command =
+ "sh " + QuoteName(configure_script);
+
+ lyxerr << _("LyX: reconfiguring user directory") << endl;
+ Path p(package().user_support());
+ ::system(configure_command.c_str());
+ lyxerr << "LyX: " << _("Done!") << endl;
+}
+
+} // namespace anon
+
+
+boost::scoped_ptr<LyX> LyX::singleton_;
+
+void LyX::exec(int & argc, char * argv[])
+{
+ BOOST_ASSERT(!singleton_.get());
+ // We must return from this before launching the gui so that
+ // other parts of the code can access singleton_ through
+ // LyX::ref and LyX::cref.
+ singleton_.reset(new LyX);
+ // Start the real execution loop.
+ singleton_->priv_exec(argc, argv);
+}
+
+
+LyX & LyX::ref()
+{
+ BOOST_ASSERT(singleton_.get());
+ return *singleton_.get();
}
-LyX::LyX(int & argc, char * argv[])
+
+LyX const & LyX::cref()
+{
+ BOOST_ASSERT(singleton_.get());
+ return *singleton_.get();
+}
+
+
+LyX::LyX()
+ : first_start(false)
+{}
+
+
+LastFiles & LyX::lastfiles()
+{
+ BOOST_ASSERT(lastfiles_.get());
+ return *lastfiles_.get();
+}
+
+
+LastFiles const & LyX::lastfiles() const
+{
+ BOOST_ASSERT(lastfiles_.get());
+ return *lastfiles_.get();
+}
+
+
+void LyX::addLyXView(boost::shared_ptr<LyXView> const & lyxview)
+{
+ views_.push_back(lyxview);
+}
+
+
+Buffer const * const LyX::updateInset(InsetBase const * inset) const
+{
+ if (!inset)
+ return 0;
+
+ Buffer const * buffer_ptr = 0;
+ ViewList::const_iterator it = views_.begin();
+ ViewList::const_iterator const end = views_.end();
+ for (; it != end; ++it) {
+ Buffer const * ptr = (*it)->updateInset(inset);
+ if (ptr)
+ buffer_ptr = ptr;
+ }
+ return buffer_ptr;
+}
+
+
+void LyX::priv_exec(int & argc, char * argv[])
{
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
bool const want_gui = easyParse(argc, argv);
- // set the DisplayTranslator only once; should that be done here??
- // if this should not be in this file, please also remove
- // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye.
- lyx::graphics::setDisplayTranslator();
+ lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
+ lyx::support::top_build_dir_is_one_level_up);
if (want_gui)
lyx_gui::parse_init(argc, argv);
if (want_gui)
lyx_gui::parse_lyxrc();
+ initMath();
+
vector<string> files;
for (int argi = argc - 1; argi >= 1; --argi)
- files.push_back(argv[argi]);
+ files.push_back(os::internal_path(argv[argi]));
if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
if (last_loaded) {
bool success = false;
if (last_loaded->dispatch(batch_command, &success)) {
- QuitLyX();
+ QuitLyX(false);
exit(!success);
}
}
files.clear(); // the files are already loaded
}
- lyx_gui::start(batch_command, files);
+ if (want_gui)
+ lyx_gui::start(batch_command, files);
+ else {
+ // Something went wrong above
+ QuitLyX(false);
+ exit(EXIT_FAILURE);
+ }
}
+/*
+Signals and Windows
+===================
+The SIGHUP signal does not exist on Windows and does not need to be handled.
+
+Windows handles SIGFPE and SIGSEGV signals as expected.
+
+Cntl+C interrupts (mapped to SIGINT by Windows' POSIX compatability layer)
+cause a new thread to be spawned. This may well result in unexpected
+behaviour by the single-threaded LyX.
+
+SIGTERM signals will come only from another process actually sending
+that signal using 'raise' in Windows' POSIX compatability layer. It will
+not come from the general "terminate process" methods that everyone
+actually uses (and which can't be trapped). Killing an app 'politely' on
+Windows involves first sending a WM_CLOSE message, something that is
+caught already by the Qt frontend.
+
+For more information see:
+
+http://aspn.activestate.com/ASPN/Mail/Message/ActiveTcl/2034055
+...signals are mostly useless on Windows for a variety of reasons that are
+Windows specific...
+
+'UNIX Application Migration Guide, Chapter 9'
+http://msdn.microsoft.com/library/en-us/dnucmg/html/UCMGch09.asp
+
+'How To Terminate an Application "Cleanly" in Win32'
+http://support.microsoft.com/default.aspx?scid=kb;en-us;178893
+*/
extern "C" {
static void error_handler(int err_sig)
{
+ // Throw away any signals other than the first one received.
+ static sig_atomic_t handling_error = false;
+ if (handling_error)
+ return;
+ handling_error = true;
+
+ // We have received a signal indicating a fatal error, so
+ // try and save the data ASAP.
+ LyX::cref().emergencyCleanup();
+
+ // These lyxerr calls may or may not work:
+
+ // Signals are asynchronous, so the main program may be in a very
+ // fragile state when a signal is processed and thus while a signal
+ // handler function executes.
+ // In general, therefore, we should avoid performing any
+ // I/O operations or calling most library and system functions from
+ // signal handlers.
+
+ // This shouldn't matter here, however, as we've already invoked
+ // emergencyCleanup.
switch (err_sig) {
+#ifdef SIGHUP
case SIGHUP:
- lyxerr << "\nlyx: SIGHUP signal caught" << endl;
- break;
- case SIGINT:
- // no comments
+ lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
break;
+#endif
case SIGFPE:
- lyxerr << "\nlyx: SIGFPE signal caught" << endl;
+ lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
break;
case SIGSEGV:
- lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
- lyxerr <<
- "Sorry, you have found a bug in LyX. "
- "Please read the bug-reporting instructions "
- "in Help->Introduction and send us a bug report, "
- "if necessary. Thanks !" << endl;
+ lyxerr << "\nlyx: SIGSEGV signal caught\n"
+ "Sorry, you have found a bug in LyX. "
+ "Please read the bug-reporting instructions "
+ "in Help->Introduction and send us a bug report, "
+ "if necessary. Thanks !\nBye." << endl;
break;
+ case SIGINT:
case SIGTERM:
// no comments
break;
}
// Deinstall the signal handlers
+#ifdef SIGHUP
signal(SIGHUP, SIG_DFL);
+#endif
signal(SIGINT, SIG_DFL);
signal(SIGFPE, SIG_DFL);
signal(SIGSEGV, SIG_DFL);
signal(SIGTERM, SIG_DFL);
- LyX::emergencyCleanup();
-
- lyxerr << "Bye." << endl;
- if (err_sig!= SIGHUP &&
- (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
+#ifdef SIGHUP
+ if (err_sig == SIGSEGV ||
+ (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty()))
+#else
+ if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
+#endif
lyx::support::abort();
exit(0);
}
void LyX::init(bool gui)
{
+#ifdef SIGHUP
signal(SIGHUP, error_handler);
+#endif
signal(SIGFPE, error_handler);
signal(SIGSEGV, error_handler);
signal(SIGINT, error_handler);
signal(SIGTERM, error_handler);
-
- bool const explicit_userdir = setLyxPaths();
+ // SIGPIPE can be safely ignored.
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
+ bool reconfigure = false;
if (gui) {
- queryUserLyXDir(explicit_userdir);
+ reconfigure =
+ queryUserLyXDir(package().explicit_user_support());
} else {
first_start = false;
}
// Disable gui when easyparse says so
lyx_gui::use_gui = gui;
+ lyxrc.tempdir_path = package().temp_dir();
+ lyxrc.document_path = package().document_dir();
+
if (lyxrc.template_path.empty()) {
- lyxrc.template_path = AddPath(system_lyxdir(), "templates");
+ lyxrc.template_path = AddPath(package().system_support(),
+ "templates");
}
if (lyxrc.lastfiles.empty()) {
- lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
+ lyxrc.lastfiles = AddName(package().user_support(), "lastfiles");
}
if (lyxrc.roman_font_name.empty())
system_lyxrc = lyxrc;
system_formats = formats;
system_converters = converters;
+ system_movers = movers;
system_lcolor = lcolor;
string prefsfile = "preferences";
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
+ os::cygwin_path_fix(lyxrc.cygwin_path_fix);
+ if (!lyxrc.path_prefix.empty())
+ prependEnvPath("PATH", lyxrc.path_prefix);
+
+#if !defined (USE_POSIX_PACKAGING)
+ // Add the directory containing the LyX executable to the path
+ // so that LyX can find things like tex2lyx.
+ if (package().build_support().empty())
+ prependEnvPath("PATH", package().binary_dir());
+#endif
+
+ // Having reset the PATH we're now in a position to run configure
+ // if necessary.
+ if (reconfigure)
+ reconfigureUserLyXDir();
+
+ if (fs::exists(lyxrc.document_path) &&
+ fs::is_directory(lyxrc.document_path))
+ package().document_dir() = lyxrc.document_path;
+
+ package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
+ if (package().temp_dir().empty()) {
+ Alert::error(_("Could not create temporary directory"),
+ bformat(_("Could not create a temporary directory in\n"
+ "%1$s. Make sure that this\n"
+ "path exists and is writable and try again."),
+ lyxrc.tempdir_path));
+ // createLyXTmpDir() tries sufficiently hard to create a
+ // usable temp dir, so the probability to come here is
+ // close to zero. We therefore don't try to overcome this
+ // problem with e.g. asking the user for a new path and
+ // trying again but simply exit.
+ exit(EXIT_FAILURE);
+ }
+
if (lyxerr.debugging(Debug::INIT)) {
- lyxerr << "LyX tmp dir: `" << os::getTmpDir() << '\'' << endl;
+ lyxerr << "LyX tmp dir: `" << package().temp_dir() << '\'' << endl;
}
lyxerr[Debug::INIT] << "Reading lastfiles `"
<< lyxrc.lastfiles << "'..." << endl;
- lastfiles.reset(new LastFiles(lyxrc.lastfiles,
- lyxrc.check_lastfiles,
- lyxrc.num_lastfiles));
+ lastfiles_.reset(new LastFiles(lyxrc.lastfiles,
+ lyxrc.check_lastfiles,
+ lyxrc.num_lastfiles));
}
kbmap->bind("Down", FuncRequest(LFUN_DOWN));
kbmap->bind("Tab", FuncRequest(LFUN_CELL_FORWARD));
- kbmap->bind("ISO_Left_Tab", FuncRequest(LFUN_CELL_FORWARD));
+ kbmap->bind("C-Tab", FuncRequest(LFUN_CELL_SPLIT));
+ kbmap->bind("~S-ISO_Left_Tab", FuncRequest(LFUN_CELL_BACKWARD));
+ kbmap->bind("~S-BackTab", FuncRequest(LFUN_CELL_BACKWARD));
kbmap->bind("Home", FuncRequest(LFUN_HOME));
kbmap->bind("End", FuncRequest(LFUN_END));
kbmap->bind("Delete", FuncRequest(LFUN_DELETE));
kbmap->bind("BackSpace", FuncRequest(LFUN_BACKSPACE));
- // sub- and superscript -MV
- kbmap->bind("~S-underscore", FuncRequest(LFUN_SUBSCRIPT));
- kbmap->bind("~S-asciicircum", FuncRequest(LFUN_SUPERSCRIPT));
-
// kbmap->bindings to enable the use of the numeric keypad
// e.g. Num Lock set
//kbmap->bind("KP_0", FuncRequest(LFUN_SELFINSERT));
kbmap->bind("KP_End", FuncRequest(LFUN_END));
kbmap->bind("KP_Prior", FuncRequest(LFUN_PRIOR));
kbmap->bind("KP_Next", FuncRequest(LFUN_NEXT));
-
- kbmap->bind("C-Tab", FuncRequest(LFUN_CELL_SPLIT));
- kbmap->bind("S-Tab", FuncRequest(LFUN_CELL_BACKWARD));
- kbmap->bind("S-ISO_Left_Tab", FuncRequest(LFUN_CELL_BACKWARD));
}
-void LyX::emergencyCleanup()
+void LyX::emergencyCleanup() const
{
// what to do about tmpfiles is non-obvious. we would
// like to delete any we find, but our lyxdir might
}
-void LyX::queryUserLyXDir(bool explicit_userdir)
+bool LyX::queryUserLyXDir(bool explicit_userdir)
{
- string const configure_script = AddName(system_lyxdir(), "configure");
+ bool reconfigure = false;
// Does user directory exist?
- FileInfo fileInfo(user_lyxdir());
- if (fileInfo.isOK() && fileInfo.isDir()) {
+ if (fs::exists(package().user_support()) &&
+ fs::is_directory(package().user_support())) {
first_start = false;
- FileInfo script(configure_script);
- FileInfo defaults(AddName(user_lyxdir(), "lyxrc.defaults"));
- if (defaults.isOK() && script.isOK()
- && defaults.getModificationTime() < script.getModificationTime()) {
- lyxerr << _("LyX: reconfiguring user directory")
- << endl;
- Path p(user_lyxdir());
- ::system(configure_script.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ string const configure_script =
+ AddName(package().system_support(), "configure");
+ string const userDefaults =
+ AddName(package().user_support(), "lyxrc.defaults");
+ if (fs::exists(configure_script) &&
+ fs::exists(userDefaults) &&
+ fs::last_write_time(configure_script)
+ > fs::last_write_time(userDefaults)) {
+ reconfigure = true;
}
- return;
+ return reconfigure;
}
first_start = !explicit_userdir;
- lyxerr << bformat(_("LyX: Creating directory %1$s"
- " and running configure..."), user_lyxdir()) << endl;
+ // If the user specified explicitly a directory, ask whether
+ // to create it. If the user says "no", then exit.
+ if (explicit_userdir &&
+ Alert::prompt(
+ _("Missing user LyX directory"),
+ bformat(_("You have specified a non-existent user "
+ "LyX directory, %1$s.\n"
+ "It is needed to keep your own configuration."),
+ package().user_support()),
+ 1, 0,
+ _("&Create directory."),
+ _("&Exit LyX."))) {
+ lyxerr << _("No user LyX directory. Exiting.") << endl;
+ exit(1);
+ }
+
+ lyxerr << bformat(_("LyX: Creating directory %1$s"),
+ package().user_support())
+ << endl;
+ reconfigure = true;
- if (!createDirectory(user_lyxdir(), 0755)) {
- // Failed, let's use $HOME instead.
- user_lyxdir(GetEnvPath("HOME"));
- lyxerr << bformat(_("Failed. Will use %1$s instead."),
- user_lyxdir()) << endl;
- return;
+ if (!createDirectory(package().user_support(), 0755)) {
+ // Failed, so let's exit.
+ lyxerr << _("Failed to create directory. Exiting.")
+ << endl;
+ exit(1);
}
- // Run configure in user lyx directory
- Path p(user_lyxdir());
- ::system(configure_script.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ return reconfigure;
}
lyxerr << _("Missing directory for -sysdir switch") << endl;
exit(1);
}
- system_lyxdir(arg);
+ cl_system_support = arg;
return 1;
}
lyxerr << _("Missing directory for -userdir switch") << endl;
exit(1);
}
- user_lyxdir(arg);
+ cl_user_support = arg;
return 1;
}
exit(1);
}
batch = arg;
- // Argh. Setting gui to false segfaults..
- // FIXME: when ? how ?
- // is_gui = false;
return 1;
}
projects / lyx.git / blobdiff