#pragma implementation
#endif
-#include "version.h"
+#include <version.h>
#include "lyx_main.h"
#include "lyx_gui.h"
#include "LyXView.h"
#include "lyxfunc.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
+#include "frontends/GUIRunTime.h"
#include "lyxrc.h"
#include "support/path.h"
#include "support/filetools.h"
// 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);
// 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
// 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(bool gui)
{
system_lyxdir = LYX_DIR;
path_shown = true;
}
-
// Report the system directory if debugging is on
if (!path_shown)
lyxerr[Debug::INIT] << "System directory: '"
// 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;
} else {
// load the lastfiles mini-database
lyxerr[Debug::INIT] << "Reading lastfiles `"
<< lyxrc.lastfiles << "'..." << endl;
- lastfiles = new LastFiles(lyxrc.lastfiles,
- lyxrc.check_lastfiles,
- lyxrc.num_lastfiles);
+ 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("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
}
+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)
{
// If the user specified explicitely a directory, ask whether
// to create it (otherwise, always create it)
if (explicit_userdir &&
- !AskQuestion(_("You have specified an invalid LyX directory."),
+ !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;
lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
if (lyxrc.read(lyxrc_path) < 0) {
- WriteAlert(_("LyX Warning!"),
+ Alert::alert(_("LyX Warning!"),
_("Error while reading ") + lyxrc_path + ".",
_("Using built-in defaults."));
return false;
// Give command line help
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-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
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;
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);
-}