#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/path.h"
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
#include <iostream>
#include <csignal>
using lyx::support::bformat;
using lyx::support::createDirectory;
using lyx::support::createLyXTmpDir;
-using lyx::support::FileInfo;
using lyx::support::FileSearch;
-using lyx::support::GetEnv;
+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;
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;
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
// we need to parse for "-dbg" and "-help"
bool const want_gui = easyParse(argc, argv);
- lyx::support::init_package(argv[0], cl_system_support, cl_user_support);
+ 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);
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)
// This shouldn't matter here, however, as we've already invoked
// emergencyCleanup.
switch (err_sig) {
+#ifdef SIGHUP
case SIGHUP:
lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
break;
+#endif
case SIGFPE:
lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
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);
+#ifdef SIGHUP
if (err_sig == SIGSEGV ||
- (err_sig != SIGHUP && !GetEnv("LYXDEBUG").empty()))
+ (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);
// SIGPIPE can be safely ignored.
-#if !defined (USE_POSIX_PACKAGING)
- // Add the directory containing the LyX executable to the path
- // so that LyX can find things like reLyX.
- if (package.build_support().empty()) {
- vector<string> path = getEnvPath("PATH");
- path.insert(path.begin(), package.binary_dir());
- setEnvPath("PATH", path);
- }
-#endif
-#if defined (USE_MACOSX_PACKAGING)
- // This hard-coded nastiness should be moved into a LyXRC variable.
- vector<string> path = getEnvPath("PATH");
- path.insert(path.begin(), "/usr/local/teTeX/bin/powerpc-apple-darwin-current");
- path.insert(path.begin(), "/usr/local/bin");
- path.insert(path.begin(), "/sw/bin");
- lyxerr[Debug::INIT] << "Running from LyX/Mac bundle. "
- "Setting PATH to: " << GetEnv("PATH") << endl;
-#endif
-
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
+ bool reconfigure = false;
if (gui) {
- queryUserLyXDir(package().explicit_user_support());
+ reconfigure =
+ queryUserLyXDir(package().explicit_user_support());
} else {
first_start = false;
}
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- package().document_dir() = lyxrc.document_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()) {
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("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::queryUserLyXDir(bool explicit_userdir)
+bool LyX::queryUserLyXDir(bool explicit_userdir)
{
- string const configure_script = AddName(package().system_support(), "configure");
- string const configure_command = "sh " + QuoteName(configure_script);
+ bool reconfigure = false;
// Does user directory exist?
- FileInfo fileInfo(package().user_support());
- 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(package().user_support(), "lyxrc.defaults"));
- if (defaults.isOK() && script.isOK()
- && defaults.getModificationTime() < script.getModificationTime()) {
- lyxerr << _("LyX: reconfiguring user directory")
- << endl;
- Path p(package().user_support());
- ::system(configure_command.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;
// 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 LyX support directory"),
+ 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."),
exit(1);
}
- lyxerr << bformat(_("LyX: Creating directory %1$s"
- " and running configure..."), package().user_support()) << endl;
+ lyxerr << bformat(_("LyX: Creating directory %1$s"),
+ package().user_support())
+ << endl;
+ reconfigure = true;
if (!createDirectory(package().user_support(), 0755)) {
// Failed, so let's exit.
exit(1);
}
- // Run configure in user lyx directory
- Path p(package().user_support());
- ::system(configure_command.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ return reconfigure;
}
exit(1);
}
batch = arg;
- // Argh. Setting gui to false segfaults..
- // FIXME: when ? how ?
- // is_gui = false;
return 1;
}
projects / lyx.git / blobdiff