/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-
-#include <cstdlib>
-#include <csignal>
+#include <version.h>
#ifdef __GNUG__
#pragma implementation
#endif
-#include "version.h"
#include "lyx_main.h"
#include "lyx_gui.h"
#include "LyXView.h"
#include "lyxfunc.h"
-#include "lyx_gui_misc.h"
#include "lyxrc.h"
-#include "support/path.h"
-#include "support/filetools.h"
+#include "buffer.h"
#include "bufferlist.h"
#include "debug.h"
-#include "support/FileInfo.h"
#include "lastfiles.h"
#include "intl.h"
#include "lyxserver.h"
-#include "layout.h"
+//#include "layout.h"
+#include "lyxtextclasslist.h"
#include "gettext.h"
#include "kbmap.h"
#include "MenuBackend.h"
#include "lyxlex.h"
#include "encoding.h"
#include "converter.h"
+#include "language.h"
+
+#include "frontends/Alert.h"
+#include "frontends/GUIRunTime.h"
+
+#include "support/path.h"
+#include "support/filetools.h"
+#include "support/FileInfo.h"
+#include "support/os.h"
+
+#include <cstdlib>
+#include <csignal>
using std::endl;
+#ifndef CXX_GLOBAL_CSTD
+using std::signal;
+#endif
+
extern void LoadLyXFile(string const &);
extern void QuitLyX();
// Should this be kept global? Asger says Yes.
DebugStream lyxerr;
-LastFiles * lastfiles;
+boost::scoped_ptr<LastFiles> lastfiles;
// This is the global bufferlist object
BufferList bufferlist;
LyX::LyX(int * argc, char * argv[])
{
- // Prevent crash with --help
- lyxGUI = 0;
- lastfiles = 0;
-
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
bool gui = easyParse(argc, argv);
// Global bindings (this must be done as early as possible.) (Lgb)
toplevel_keymap.reset(new kb_keymap);
defaultKeyBindings(toplevel_keymap.get());
-
+
// Make the GUI object, and let it take care of the
// command line arguments that concerns it.
lyxerr[Debug::INIT] << "Initializing LyXGUI..." << endl;
- lyxGUI = new LyXGUI(this, argc, argv, gui);
+ lyxGUI.reset(new LyXGUI(this, argc, argv, gui));
lyxerr[Debug::INIT] << "Initializing LyXGUI...done" << endl;
// Now the GUI and LyX have taken care of their arguments, so
exit(0);
}
}
-
+
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- init(argc, argv, gui);
+ init(gui);
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
lyxGUI->init();
// Load the files specified in the command line.
- if ((*argc) == 2)
+ if ((*argc) == 2)
lyxerr[Debug::INFO] << "Opening document..." << endl;
else if ((*argc) > 2)
lyxerr[Debug::INFO] << "Opening documents..." << endl;
}
if (first_start) {
- string splash = i18nLibFileSearch("examples", "splash.lyx");
+ string const splash =
+ i18nLibFileSearch("examples", "splash.lyx");
lyxerr[Debug::INIT] << "Opening splash document "
<< splash << "..." << endl;
Buffer * loadb = bufferlist.loadLyXFile(splash);
last_loaded = bufferlist.newFile("tmpfile", string());
// try to dispatch to last loaded buffer first
- bool dispatched = last_loaded->Dispatch(batch_command);
+ bool dispatched = last_loaded->dispatch(batch_command);
- // if this was successful, return.
+ // if this was successful, return.
// Maybe we could do something more clever than aborting...
if (dispatched) {
lyxerr << "We are done!" << endl;
// otherwise, let the GUI handle the batch command
lyxGUI->regBuf(last_loaded);
- lyxGUI->getLyXView()->getLyXFunc()->Dispatch(batch_command);
+ lyxGUI->getLyXView()->getLyXFunc()->verboseDispatch(batch_command, false);
// fall through...
}
-
+
// Let the ball begin...
lyxGUI->runTime();
}
// A destructor is always necessary (asierra-970604)
LyX::~LyX()
{
- delete lastfiles;
- delete lyxGUI;
}
-extern "C" void error_handler(int err_sig);
+extern "C" {
+
+static
+void error_handler(int err_sig)
+{
+ switch (err_sig) {
+ case SIGHUP:
+ lyxerr << "\nlyx: SIGHUP signal caught" << endl;
+ break;
+ case SIGINT:
+ // no comments
+ break;
+ case SIGFPE:
+ lyxerr << "\nlyx: SIGFPE signal caught" << 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;
+ break;
+ case SIGTERM:
+ // no comments
+ break;
+ }
+
+ // Deinstall the signal handlers
+ signal(SIGHUP, SIG_DFL);
+ 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))
+ lyx::abort();
+ exit(0);
+}
+
+}
+
-void LyX::init(int */*argc*/, char **argv, bool gui)
+void LyX::init(bool gui)
{
// Install the signal handlers
signal(SIGHUP, error_handler);
// Determine path of binary
//
- string fullbinpath;
- string binpath = subst(argv[0], '\\', '/');
- string binname = OnlyFilename(argv[0]);
- // Sorry for system specific code. (SMiyata)
- if (suffixIs(binname, ".exe"))
- binname.erase(binname.length()-4, string::npos);
-
- binpath = ExpandPath(binpath); // This expands ./ and ~/
-
- if (!AbsolutePath(binpath)) {
- string binsearchpath = GetEnvPath("PATH");
- // This will make "src/lyx" work always :-)
- binsearchpath += ";.";
- binpath = FileOpenSearch(binsearchpath, argv[0]);
- }
-
- fullbinpath = binpath;
- binpath = MakeAbsPath(OnlyPath(binpath));
-
- // In case we are running in place and compiled with shared libraries
- if (suffixIs(binpath, "/.libs/"))
- binpath.erase(binpath.length()-6, string::npos);
+ string binpath = os::binpath();
+ string binname = os::binname();
+ string fullbinname = MakeAbsPath(binname, binpath);
if (binpath.empty()) {
lyxerr << _("Warning: could not determine path of binary.")
<< _("If you have problems, try starting LyX with an absolute path.")
<< endl;
}
+ lyxerr[Debug::INIT] << "Name of binary: " << binname << endl;
lyxerr[Debug::INIT] << "Path of binary: " << binpath << endl;
//
searchpath= MakeAbsPath(system_lyxdir) + ';';
// LYX_DIR_11x environment variable
- string lyxdir = GetEnvPath("LYX_DIR_11x");
-
+ string const lyxdir = GetEnvPath("LYX_DIR_11x");
+
if (!lyxdir.empty()) {
lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
searchpath += lyxdir + ';';
}
+ string fullbinpath = binpath;
+ FileInfo file(fullbinname, true);
+ if (file.isLink()) {
+ lyxerr[Debug::INIT] << "binary is a link" << endl;
+ string link;
+ if (LyXReadLink(fullbinname, link)) {
+ // Path of binary/../share/name of binary/
+ searchpath += NormalizePath(AddPath(binpath,
+ "../share/")
+ + OnlyFilename(binname));
+ searchpath += ';';
+ fullbinpath = link;
+ binpath = MakeAbsPath(OnlyPath(fullbinpath));
+ }
+ }
+
+ bool followlink;
+ do {
+ // Path of binary/../share/name of binary/
+ searchpath += NormalizePath(AddPath(binpath, "../share/") +
+ OnlyFilename(binname)) + ';';
+
+ // Follow Symlinks
+ FileInfo file(fullbinpath, true);
+ followlink = file.isLink();
+ if (followlink) {
+ lyxerr << " directory " << fullbinpath
+ << " is a link" << endl;
+ string link;
+ if (LyXReadLink(fullbinpath, link)) {
+ fullbinpath = link;
+ binpath = MakeAbsPath(OnlyPath(fullbinpath));
+ }
+ else {
+ followlink = false;
+ }
+ }
+ } while (followlink);
+
// <path of binary>/TOP_SRCDIR/lib
build_lyxdir = MakeAbsPath("../lib", binpath);
if (!FileSearch(build_lyxdir, "lyxrc.defaults").empty()) {
build_lyxdir.erase();
}
- bool FollowLink;
- do {
- // Path of binary/../share/name of binary/
- searchpath += NormalizePath(AddPath(binpath, "../share/") +
- OnlyFilename(binname)) + ';';
-
- // Follow Symlinks
- FileInfo file(fullbinpath, true);
- FollowLink = file.isLink();
- if (FollowLink) {
- string Link;
- if (LyXReadLink(fullbinpath, Link)) {
- fullbinpath = Link;
- binpath = MakeAbsPath(OnlyPath(fullbinpath));
- }
- else {
- FollowLink = false;
- }
- }
- } while (FollowLink);
-
// Hardcoded dir
searchpath += LYX_DIR;
<< searchpath << endl;
string const filename = "chkconfig.ltx";
- string temp = FileOpenSearch(searchpath, filename, string());
+ string const temp = FileOpenSearch(searchpath, filename, string());
system_lyxdir = OnlyPath(temp);
// Reduce "path/../path" stuff out of system directory
if (system_lyxdir != NormalizePath(lyxdir)) {
lyxerr <<_("LYX_DIR_11x environment variable no good.")
<< '\n'
- << _("System directory set to: ")
+ << _("System directory set to: ")
<< system_lyxdir << endl;
path_shown = true;
}
<<_("set the environment variable LYX_DIR_11x to the "
"LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl;
- if (!path_shown)
- lyxerr << _("Using built-in default ")
+ if (!path_shown) {
+ FileInfo fi(LYX_DIR);
+ if (!fi.exist()) {
+ lyxerr << "Couldn't even find the default LYX_DIR." << endl
+ << "Giving up." << endl;
+ exit(1);
+ }
+ lyxerr << _("Using built-in default ")
<< LYX_DIR << _(" but expect problems.")
<< endl;
- else
+ } else {
lyxerr << _("Expect problems.") << endl;
+ }
system_lyxdir = LYX_DIR;
path_shown = true;
}
-
// Report the system directory if debugging is on
if (!path_shown)
lyxerr[Debug::INIT] << "System directory: '"
- << system_lyxdir << '\'' << endl;
+ << system_lyxdir << '\'' << endl;
//
// Determine user lyx-dir
//
-
+
// Directories are searched in this order:
// 1) -userdir command line parameter
// 2) LYX_USERDIR_11x environment variable
explicit_userdir = false;
}
- lyxerr[Debug::INIT] << "User LyX directory: '"
+ lyxerr[Debug::INIT] << "User LyX directory: '"
<< user_lyxdir << '\'' << endl;
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
- if (gui)
+ if (gui) {
queryUserLyXDir(explicit_userdir);
- else
+ } else {
first_start = false;
+ }
//
// Shine up lyxrc defaults
//
// Default template path: system_dir/templates
- if (lyxrc.template_path.empty()){
+ if (lyxrc.template_path.empty()) {
lyxrc.template_path = AddPath(system_lyxdir, "templates");
}
-
+
// Default lastfiles file: $HOME/.lyx/lastfiles
- if (lyxrc.lastfiles.empty()){
+ if (lyxrc.lastfiles.empty()) {
lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
}
// Disable gui when either lyxrc or easyparse says so
if (!gui)
lyxrc.use_gui = false;
-
- // Calculate screen dpi as average of x-DPI and y-DPI:
+
+ // Calculate screen dpi as average of x-DPI and y-DPI:
if (lyxrc.use_gui) {
- lyxrc.dpi = getScreenDPI();
+ lyxrc.dpi = GUIRunTime::getScreenDPI();
lyxerr[Debug::INIT] << "DPI setting detected to be "
- << lyxrc.dpi + 0.5 << endl;
+ << lyxrc.dpi + 0.5 << endl;
} else {
lyxrc.dpi = 1; // I hope this is safe
}
// Read configuration files
//
- ReadRcFile("lyxrc.defaults");
+ readRcFile("lyxrc.defaults");
system_lyxrc = lyxrc;
system_formats = formats;
system_converters = converters;
// If there is a preferences file we read that instead
// of the old lyxrc file.
- if (!ReadRcFile("preferences"))
- ReadRcFile("lyxrc");
+ if (!readRcFile("preferences"))
+ readRcFile("lyxrc");
// Read encodings
- ReadEncodingsFile("encodings");
+ readEncodingsFile("encodings");
// Read languages
- ReadLangugesFile("languages");
+ readLanguagesFile("languages");
// Load the layouts
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
lyxrc.readBindFileIfNeeded();
// Read menus
- ReadUIFile(lyxrc.ui_file);
+ readUIFile(lyxrc.ui_file);
// Bind the X dead keys to the corresponding LyX functions if
- // necessary.
+ // necessary.
if (lyxrc.override_x_deadkeys)
deadKeyBindings(toplevel_keymap.get());
lyxrc.print();
}
- // Create temp directory
- system_tempdir = CreateLyXTmpDir(lyxrc.tempdir_path);
+ // Create temp directory
+ os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
+ system_tempdir = os::getTmpDir();
if (lyxerr.debugging(Debug::INIT)) {
lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
}
// load the lastfiles mini-database
lyxerr[Debug::INIT] << "Reading lastfiles `"
- << lyxrc.lastfiles << "'..." << endl;
- lastfiles = new LastFiles(lyxrc.lastfiles,
- lyxrc.check_lastfiles,
- lyxrc.num_lastfiles);
+ << lyxrc.lastfiles << "'..." << endl;
+ lastfiles.reset(new LastFiles(lyxrc.lastfiles,
+ lyxrc.check_lastfiles,
+ lyxrc.num_lastfiles));
// start up the lyxserver. (is this a bit early?) (Lgb)
// 0.12 this will be way to early, we need the GUI to be initialized
kbmap->bind("Left", LFUN_LEFT);
kbmap->bind("Up", LFUN_UP);
kbmap->bind("Down", LFUN_DOWN);
-
+
kbmap->bind("Tab", LFUN_TAB);
kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
-
+
kbmap->bind("Home", LFUN_HOME);
kbmap->bind("End", LFUN_END);
kbmap->bind("Prior", LFUN_PRIOR);
kbmap->bind("Next", LFUN_NEXT);
-
+
kbmap->bind("Return", LFUN_BREAKPARAGRAPH);
- kbmap->bind("~C-~S-~M-nobreakspace", LFUN_PROTECTEDSPACE);
-
+ //kbmap->bind("~C-~S-~M-nobreakspace", LFUN_PROTECTEDSPACE);
+
kbmap->bind("Delete", LFUN_DELETE);
kbmap->bind("BackSpace", LFUN_BACKSPACE);
-
+
+ // sub- and superscript -MV
+ kbmap->bind("~S-underscore", LFUN_SUBSCRIPT);
+ kbmap->bind("~S-asciicircum", LFUN_SUPERSCRIPT);
+
// kbmap->bindings to enable the use of the numeric keypad
// e.g. Num Lock set
- kbmap->bind("KP_0", LFUN_SELFINSERT);
- kbmap->bind("KP_Decimal", LFUN_SELFINSERT);
- kbmap->bind("KP_Enter", LFUN_SELFINSERT);
- kbmap->bind("KP_1", LFUN_SELFINSERT);
- kbmap->bind("KP_2", LFUN_SELFINSERT);
- kbmap->bind("KP_3", LFUN_SELFINSERT);
- kbmap->bind("KP_4", LFUN_SELFINSERT);
- kbmap->bind("KP_5", LFUN_SELFINSERT);
- kbmap->bind("KP_6", LFUN_SELFINSERT);
- kbmap->bind("KP_Add", LFUN_SELFINSERT);
- kbmap->bind("KP_7", LFUN_SELFINSERT);
- kbmap->bind("KP_8", LFUN_SELFINSERT);
- kbmap->bind("KP_9", LFUN_SELFINSERT);
- kbmap->bind("KP_Divide", LFUN_SELFINSERT);
- kbmap->bind("KP_Multiply", LFUN_SELFINSERT);
- kbmap->bind("KP_Subtract", LFUN_SELFINSERT);
-
- /* Most self-insert keys are handled in the 'default:' section of
- * WorkAreaKeyPress - so we don't have to define them all.
- * However keys explicit decleared as self-insert are
- * handled seperatly (LFUN_SELFINSERT.) Lgb. */
-
- kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515
+ //kbmap->bind("KP_0", LFUN_SELFINSERT);
+ //kbmap->bind("KP_Decimal", LFUN_SELFINSERT);
+ kbmap->bind("KP_Enter", LFUN_BREAKPARAGRAPH);
+ //kbmap->bind("KP_1", LFUN_SELFINSERT);
+ //kbmap->bind("KP_2", LFUN_SELFINSERT);
+ //kbmap->bind("KP_3", LFUN_SELFINSERT);
+ //kbmap->bind("KP_4", LFUN_SELFINSERT);
+ //kbmap->bind("KP_5", LFUN_SELFINSERT);
+ //kbmap->bind("KP_6", LFUN_SELFINSERT);
+ //kbmap->bind("KP_Add", LFUN_SELFINSERT);
+ //kbmap->bind("KP_7", LFUN_SELFINSERT);
+ //kbmap->bind("KP_8", LFUN_SELFINSERT);
+ //kbmap->bind("KP_9", LFUN_SELFINSERT);
+ //kbmap->bind("KP_Divide", LFUN_SELFINSERT);
+ //kbmap->bind("KP_Multiply", LFUN_SELFINSERT);
+ //kbmap->bind("KP_Subtract", LFUN_SELFINSERT);
+ kbmap->bind("KP_Right", LFUN_RIGHT);
+ kbmap->bind("KP_Left", LFUN_LEFT);
+ kbmap->bind("KP_Up", LFUN_UP);
+ kbmap->bind("KP_Down", LFUN_DOWN);
+ kbmap->bind("KP_Home", LFUN_HOME);
+ kbmap->bind("KP_End", LFUN_END);
+ kbmap->bind("KP_Prior", LFUN_PRIOR);
+ kbmap->bind("KP_Next", LFUN_NEXT);
+
+ kbmap->bind("C-Tab", LFUN_TABINSERT); // ale970515
kbmap->bind("S-Tab", LFUN_SHIFT_TAB); // jug20000522
kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02
}
+void LyX::emergencyCleanup()
+{
+ // what to do about tmpfiles is non-obvious. we would
+ // like to delete any we find, but our lyxdir might
+ // contain documents etc. which might be helpful on
+ // a crash
+
+ bufferlist.emergencyWriteAll();
+ if (lyxserver)
+ lyxserver->emergencyCleanup();
+}
+
+
// LyX can optionally take over the handling of deadkeys
void LyX::deadKeyBindings(kb_keymap * kbmap)
{
first_start = false;
return;
} else {
- first_start = true;
+ first_start = !explicit_userdir;
}
-
- // Nope
- // Different wording if the user specifically requested a directory
- if (!AskQuestion( explicit_userdir
- ? _("You have specified an invalid LyX directory.")
- : _("You don't have a personal LyX directory.") ,
+ // If the user specified explicitely a directory, ask whether
+ // to create it (otherwise, always create it)
+ if (explicit_userdir &&
+ !Alert::askQuestion(_("You have specified an invalid LyX directory."),
_("It is needed to keep your own configuration."),
_("Should I try to set it up for you (recommended)?"))) {
lyxerr << _("Running without personal LyX directory.") << endl;
// Read the rc file `name'
-bool LyX::ReadRcFile(string const & name)
+bool LyX::readRcFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
-
- string lyxrc_path = LibFileSearch(string(), name);
- if (!lyxrc_path.empty()){
- lyxerr[Debug::INIT] << "Found " << name
+
+ string const lyxrc_path = LibFileSearch(string(), name);
+ if (!lyxrc_path.empty()) {
+ lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
- if (lyxrc.read(lyxrc_path) < 0) {
- WriteAlert(_("LyX Warning!"),
- _("Error while reading ")+lyxrc_path+".",
+ if (lyxrc.read(lyxrc_path) < 0) {
+ Alert::alert(_("LyX Warning!"),
+ _("Error while reading ") + lyxrc_path + ".",
_("Using built-in defaults."));
return false;
}
return true;
- } else
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ } else {
+ lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ }
+
return false;
}
// Read the ui file `name'
-void LyX::ReadUIFile(string const & name)
+void LyX::readUIFile(string const & name)
{
enum Uitags {
ui_menuset = 1,
};
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
-
- string ui_path = LibFileSearch("ui", name, "ui");
+
+ string const ui_path = LibFileSearch("ui", name, "ui");
if (ui_path.empty()) {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ lyxerr[Debug::INIT] << "Could not find " << name << endl;
menubackend.defaults();
return;
}
-
+
lyxerr[Debug::INIT] << "Found " << name
<< " in " << ui_path << endl;
LyXLex lex(uitags, ui_last - 1);
lex.setFile(ui_path);
- if (!lex.IsOK()) {
+ if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
-
+
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- while (lex.IsOK()) {
+ while (lex.isOK()) {
switch (lex.lex()) {
- case ui_menuset:
+ case ui_menuset:
menubackend.read(lex);
break;
break;
default:
- lex.printError("LyX::ReadUFile: "
- "Unknown menu tag: `$$Token'");
+ if (!strip(lex.getString()).empty())
+ lex.printError("LyX::ReadUIFile: "
+ "Unknown menu tag: `$$Token'");
break;
}
}
// Read the languages file `name'
-void LyX::ReadLangugesFile(string const & name)
+void LyX::readLanguagesFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string lang_path = LibFileSearch(string(), name);
+ string const lang_path = LibFileSearch(string(), name);
if (lang_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
languages.setDefaults();
// Read the encodings file `name'
-void LyX::ReadEncodingsFile(string const & name)
+void LyX::readEncodingsFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string enc_path = LibFileSearch(string(), name);
+ string const enc_path = LibFileSearch(string(), name);
if (enc_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
return;
}
+namespace {
+
// Set debugging level and report result to user
-static
void setDebuggingLevel(string const & dbgLevel)
{
lyxerr << _("Setting debug level to ") << dbgLevel << endl;
// Give command line help
-static
void commandLineHelp()
{
- lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
lyxerr <<
_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
"Command line switches (case sensitive):\n"
"\t-userdir dir try to set user directory to dir\n"
"\t-sysdir dir try to set system directory to dir\n"
"\t-geometry WxH+X+Y set geometry of the main window\n"
- "\t-dbg feature[,feature]...\n"
- " select the features to debug.\n"
- " Type `lyx -dbg' to see the list of features\n"
+ "\t-dbg feature[,feature]...\n"
+ " select the features to debug.\n"
+ " Type `lyx -dbg' to see the list of features\n"
"\t-x [--execute] command\n"
" where command is a lyx command.\n"
"\t-e [--export] fmt\n"
"\t-i [--import] fmt file.xxx\n"
" where fmt is the import format of choice\n"
" and file.xxx is the file to be imported.\n"
+ "\t-version summarize version and build info\n"
"Check the LyX man page for more details.") << endl;
}
+// Give command line version information
+void commandLineVersionInfo()
+{
+ lyxerr << "LyX " << lyx_version
+ << " of " << lyx_release_date << endl;
+ lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
+
+ lyxerr << lyx_version_info << endl;
+}
+
+
+} // namespace anon
+
bool LyX::easyParse(int * argc, char * argv[])
{
Debug::showTags(lyxerr);
exit(0);
}
- }
+ }
// Check for "-sysdir"
else if (arg == "-sysdir") {
if (i + 1 < *argc) {
system_lyxdir = argv[i + 1];
removeargs = 2;
} else {
- lyxerr << _("Missing directory for -sysdir switch!")
+ lyxerr << _("Missing directory for -sysdir switch!")
<< endl;
exit(0);
}
else if (arg == "--help" || arg == "-help") {
commandLineHelp();
exit(0);
- }
+ }
+ // Check for --version or -version
+ else if (arg == "--version" || arg == "-version") {
+ commandLineVersionInfo();
+ exit(0);
+ }
// Check for "-nw": No XWindows as for emacs this should
// give a LyX that could be used in a terminal window.
//else if (arg == "-nw") {
}
else if (arg == "-i" || arg == "--import") {
if (i + 1 < *argc) {
- string type(argv[i+1]);
- string file(argv[i+2]);
+ string const type(argv[i+1]);
+ string const file(argv[i+2]);
removeargs = 3;
-
+
batch_command = "buffer-import " + type + " " + file;
lyxerr << "batch_command: "
<< batch_command << endl;
return gui;
}
-
-
-extern "C"
-void error_handler(int err_sig)
-{
- switch (err_sig) {
- case SIGHUP:
- lyxerr << "\nlyx: SIGHUP signal caught" << endl;
- break;
- case SIGINT:
- // no comments
- break;
- case SIGFPE:
- lyxerr << "\nlyx: SIGFPE signal caught" << endl;
- break;
- case SIGSEGV:
- lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
- lyxerr <<
- "Sorry, you have found a bug in LyX."
- " If possible, please read 'Known bugs'\n"
- "under the Help menu and then send us "
- "a full bug report. Thanks!" << endl;
- break;
- case SIGTERM:
- // no comments
- break;
- }
-
- // Deinstall the signal handlers
- signal(SIGHUP, SIG_DFL);
- signal(SIGINT, SIG_DFL);
- signal(SIGFPE, SIG_DFL);
- signal(SIGSEGV, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
-
- bufferlist.emergencyWriteAll();
-
- lyxerr << "Bye." << endl;
- if (err_sig!= SIGHUP &&
- (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
- lyx::abort();
- exit(0);
-}
projects / lyx.git / blobdiff