/**
* \file lyx_main.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
+ * \author Alfredo Braunstein
* \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "lyx_main.h"
-#include "support/filetools.h"
-#include "support/lyxlib.h"
-#include "support/FileInfo.h"
-#include "support/path.h"
-#include "support/path_defines.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lyxlex.h"
-
-#include "graphics/GraphicsTypes.h"
-
-#include "bufferlist.h"
#include "buffer.h"
#include "buffer_funcs.h"
-#include "lyxserver.h"
-#include "kbmap.h"
-#include "lyxfunc.h"
-#include "ToolbarBackend.h"
-#include "MenuBackend.h"
-#include "language.h"
-#include "lastfiles.h"
-#include "encoding.h"
+#include "bufferlist.h"
#include "converter.h"
+#include "debug.h"
+#include "encoding.h"
+#include "errorlist.h"
#include "format.h"
+#include "gettext.h"
+#include "kbmap.h"
+#include "language.h"
+#include "session.h"
+#include "LColor.h"
+#include "lyx_cb.h"
+#include "lyxfunc.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
#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/environment.h"
+#include "support/filetools.h"
+#include "support/lyxlib.h"
+#include "support/convert.h"
+#include "support/os.h"
+#include "support/package.h"
+#include "support/path.h"
+#include "support/systemcall.h"
-#include <boost/function.hpp>
#include <boost/bind.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/filesystem/operations.hpp>
-#include <cstdlib>
-#include <csignal>
#include <iostream>
+#include <csignal>
-using namespace lyx::support;
+using lyx::support::addName;
+using lyx::support::addPath;
+using lyx::support::bformat;
+using lyx::support::createDirectory;
+using lyx::support::createLyXTmpDir;
+using lyx::support::fileSearch;
+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::Systemcall;
+
+namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
-using std::vector;
using std::endl;
+using std::string;
+using std::vector;
#ifndef CXX_GLOBAL_CSTD
using std::exit;
using std::system;
#endif
-extern void LoadLyXFile(string const &);
-extern void QuitLyX();
extern LyXServer * lyxserver;
-DebugStream lyxerr;
-
-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 lyx_exit(int status)
+{
+ // FIXME: We should not directly call exit(), since it only
+ // guarantees a return to the system, no application cleanup.
+ // This may cause troubles with not executed destructors.
+ if (lyx_gui::use_gui)
+ // lyx_gui::exit may return and only schedule the exit
+ lyx_gui::exit(status);
+ exit(status);
+}
+
+
void showFileError(string const & error)
{
Alert::warning(_("Could not read configuration file"),
bformat(_("Error while reading the configuration file\n%1$s.\n"
"Please check your installation."), error));
- exit(EXIT_FAILURE);
}
+
+void reconfigureUserLyXDir()
+{
+ string const configure_command = package().configure_command();
+
+ lyxerr << _("LyX: reconfiguring user directory") << endl;
+ Path p(package().user_support());
+ Systemcall one;
+ one.startscript(Systemcall::Wait, configure_command);
+ lyxerr << "LyX: " << _("Done!") << endl;
}
-LyX::LyX(int & argc, char * argv[])
+} // namespace anon
+
+
+boost::scoped_ptr<LyX> LyX::singleton_;
+
+int 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.
+ return singleton_->priv_exec(argc, argv);
+}
+
+
+LyX & LyX::ref()
+{
+ BOOST_ASSERT(singleton_.get());
+ return *singleton_.get();
+}
+
+
+LyX const & LyX::cref()
+{
+ BOOST_ASSERT(singleton_.get());
+ return *singleton_.get();
+}
+
+
+LyX::LyX()
+ : first_start(false), geometryOption_(false)
+{}
+
+
+lyx::Session & LyX::session()
+{
+ BOOST_ASSERT(session_.get());
+ return *session_.get();
+}
+
+
+lyx::Session const & LyX::session() const
+{
+ BOOST_ASSERT(session_.get());
+ return *session_.get();
+}
+
+
+void LyX::addLyXView(LyXView * 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;
+}
+
+
+int 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);
+ lyx_gui::use_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);
- }
+ // Start the real execution loop.
+ if (lyx_gui::use_gui)
+ return lyx_gui::exec(argc, argv);
+ else
+ return exec2(argc, argv);
+}
+
+int LyX::exec2(int & argc, char * argv[])
+{
// check for any spurious extra arguments
// other than documents
for (int argi = 1; argi < argc ; ++argi) {
if (argv[argi][0] == '-') {
lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."),
argv[argi]) << endl;
- exit(1);
+ return EXIT_FAILURE;
}
}
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- init(want_gui);
+ bool const success = init();
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
+ if (!success)
+ return EXIT_FAILURE;
- if (want_gui) {
+ if (lyx_gui::use_gui)
lyx_gui::parse_lyxrc();
- }
vector<string> files;
- for (int argi = argc - 1; argi >= 1; --argi) {
- files.push_back(argv[argi]);
- }
+ for (int argi = argc - 1; argi >= 1; --argi)
+ files.push_back(os::internal_path(argv[argi]));
if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
for (; it != end; ++it) {
// get absolute path of file and add ".lyx" to
// the filename if necessary
- string s = FileSearch(string(), *it, "lyx");
+ string s = fileSearch(string(), *it, "lyx");
if (s.empty()) {
- last_loaded = newFile(*it, "");
+ Buffer * const b = newFile(*it, string(), true);
+ if (b)
+ last_loaded = b;
} else {
- last_loaded = bufferlist.newBuffer(s, false);
- last_loaded->error.connect(boost::bind(&LyX::printError, this, _1));
- if (!loadLyXFile(last_loaded, s)) {
- bufferlist.release(last_loaded);
- last_loaded = newFile(*it, string());
+ Buffer * buf = bufferlist.newBuffer(s, false);
+ if (loadLyXFile(buf, s)) {
+ last_loaded = buf;
+ ErrorList const & el = buf->errorList("Parse");
+ if (!el.empty())
+ for_each(el.begin(), el.end(),
+ boost::bind(&LyX::printError, this, _1));
}
+ else
+ bufferlist.release(buf);
}
}
if (last_loaded) {
bool success = false;
if (last_loaded->dispatch(batch_command, &success)) {
- QuitLyX();
- exit(!success);
+ quitLyX(false);
+ return !success;
}
- }
+ }
files.clear(); // the files are already loaded
}
- lyx_gui::start(batch_command, files);
+ if (lyx_gui::use_gui) {
+ // determine windows size and position, from lyxrc and/or session
+ // initial geometry
+ unsigned int width = 690;
+ unsigned int height = 510;
+ bool maximize = false;
+ // first try lyxrc
+ if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
+ width = lyxrc.geometry_width;
+ height = lyxrc.geometry_height;
+ }
+ // if lyxrc returns (0,0), then use session info
+ else {
+ string val = session().loadSessionInfo("WindowWidth");
+ if (!val.empty())
+ width = convert<unsigned int>(val);
+ val = session().loadSessionInfo("WindowHeight");
+ if (!val.empty())
+ height = convert<unsigned int>(val);
+ if (session().loadSessionInfo("WindowIsMaximized") == "yes")
+ maximize = true;
+ }
+ // if user wants to restore window position
+ int posx = -1;
+ int posy = -1;
+ if (lyxrc.geometry_xysaved) {
+ string val = session().loadSessionInfo("WindowPosX");
+ if (!val.empty())
+ posx = convert<int>(val);
+ val = session().loadSessionInfo("WindowPosY");
+ if (!val.empty())
+ posy = convert<int>(val);
+ }
+
+ if (geometryOption_) {
+ width = 0;
+ height = 0;
+ }
+ // create the main window
+ LyXView * view = lyx_gui::create_view(width, height, posx, posy, maximize);
+
+ // load files
+ for_each(files.begin(), files.end(),
+ bind(&LyXView::loadLyXFile, view, _1, true));
+
+ // if a file is specified, I assume that user wants to edit *that* file
+ if (files.empty() && lyxrc.load_session) {
+ vector<string> const & lastopened = session_->lastOpenedFiles();
+ // do not add to the lastfile list since these files are restored from
+ // last seesion, and should be already there (regular files), or should
+ // not be added at all (help files).
+ for_each(lastopened.begin(), lastopened.end(),
+ bind(&LyXView::loadLyXFile, view, _1, false));
+ }
+ // clear this list to save a few bytes of RAM
+ session_->clearLastOpenedFiles();
+
+ return lyx_gui::start(view, batch_command);
+ } else {
+ // Something went wrong above
+ quitLyX(false);
+ return 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)
+bool LyX::init()
{
+#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.
- bool const explicit_userdir = setLyxPaths();
-
- // Check that user LyX directory is ok. We don't do that if
- // running in batch mode.
- if (gui) {
- queryUserLyXDir(explicit_userdir);
- } 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");
- }
-
- if (lyxrc.lastfiles.empty()) {
- lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
+ lyxrc.template_path = addPath(package().system_support(),
+ "templates");
}
if (lyxrc.roman_font_name.empty())
// Read configuration files
//
- readRcFile("lyxrc.defaults");
+ // This one may have been distributed along with LyX.
+ if (!readRcFile("lyxrc.dist"))
+ return false;
+
+ // Set the PATH correctly.
+#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
+ if (!lyxrc.path_prefix.empty())
+ prependEnvPath("PATH", lyxrc.path_prefix);
+
+ // Check that user LyX directory is ok.
+ if (queryUserLyXDir(package().explicit_user_support()))
+ reconfigureUserLyXDir();
+
+ // no need for a splash when there is no GUI
+ if (!lyx_gui::use_gui) {
+ first_start = false;
+ }
+
+ // This one is generated in user_support directory by lib/configure.py.
+ if (!readRcFile("lyxrc.defaults"))
+ return false;
+
+ // Query the OS to know what formats are viewed natively
+ formats.setAutoOpen();
+
system_lyxrc = lyxrc;
system_formats = formats;
system_converters = converters;
+ system_movers = movers;
system_lcolor = lcolor;
- string prefsfile = "preferences";
- // back compatibility to lyxs < 1.1.6
- if (LibFileSearch(string(), prefsfile).empty())
- prefsfile = "lyxrc";
- if (!LibFileSearch(string(), prefsfile).empty())
- readRcFile(prefsfile);
+ // This one is edited through the preferences dialog.
+ if (!readRcFile("preferences"))
+ return false;
- readEncodingsFile("encodings");
- readLanguagesFile("languages");
+ if (!readEncodingsFile("encodings"))
+ return false;
+ if (!readLanguagesFile("languages"))
+ return false;
// Load the layouts
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
- LyXSetStyle();
+ if (!LyXSetStyle())
+ return false;
- if (gui) {
+ if (lyx_gui::use_gui) {
// Set up bindings
toplevel_keymap.reset(new kb_keymap);
defaultKeyBindings(toplevel_keymap.get());
toplevel_keymap->read(lyxrc.bind_file);
// Read menus
- readUIFile(lyxrc.ui_file);
+ if (!readUIFile(lyxrc.ui_file))
+ return false;
}
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
+ os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
+ if (!lyxrc.path_prefix.empty())
+ prependEnvPath("PATH", lyxrc.path_prefix);
+
+ 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.
+ return false;
+ }
+
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));
+ lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl;
+ session_.reset(new lyx::Session(lyxrc.num_lastfiles));
+ return true;
}
void LyX::defaultKeyBindings(kb_keymap * kbmap)
{
- kbmap->bind("Right", LFUN_RIGHT);
- kbmap->bind("Left", LFUN_LEFT);
- kbmap->bind("Up", LFUN_UP);
- kbmap->bind("Down", LFUN_DOWN);
-
- kbmap->bind("Tab", LFUN_CELL_FORWARD);
- kbmap->bind("ISO_Left_Tab", LFUN_CELL_FORWARD); // jbl 2001-23-02
+ kbmap->bind("Right", FuncRequest(LFUN_CHAR_FORWARD));
+ kbmap->bind("Left", FuncRequest(LFUN_CHAR_BACKWARD));
+ kbmap->bind("Up", FuncRequest(LFUN_UP));
+ kbmap->bind("Down", FuncRequest(LFUN_DOWN));
- kbmap->bind("Home", LFUN_HOME);
- kbmap->bind("End", LFUN_END);
- kbmap->bind("Prior", LFUN_PRIOR);
- kbmap->bind("Next", LFUN_NEXT);
+ kbmap->bind("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("Return", LFUN_BREAKPARAGRAPH);
- //kbmap->bind("~C-~S-~M-nobreakspace", LFUN_PROTECTEDSPACE);
+ kbmap->bind("Home", FuncRequest(LFUN_LINE_BEGIN));
+ kbmap->bind("End", FuncRequest(LFUN_LINE_END));
+ kbmap->bind("Prior", FuncRequest(LFUN_SCREEN_UP));
+ kbmap->bind("Next", FuncRequest(LFUN_SCREEN_DOWN));
- kbmap->bind("Delete", LFUN_DELETE);
- kbmap->bind("BackSpace", LFUN_BACKSPACE);
+ kbmap->bind("Return", FuncRequest(LFUN_BREAK_PARAGRAPH));
+ //kbmap->bind("~C-~S-~M-nobreakspace", FuncRequest(LFUN_PROTECTEDSPACE));
- // sub- and superscript -MV
- kbmap->bind("~S-underscore", LFUN_SUBSCRIPT);
- kbmap->bind("~S-asciicircum", LFUN_SUPERSCRIPT);
+ kbmap->bind("Delete", FuncRequest(LFUN_CHAR_DELETE_FORWARD));
+ kbmap->bind("BackSpace", FuncRequest(LFUN_CHAR_DELETE_BACKWARD));
// 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_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_CELL_SPLIT); // ale970515
- kbmap->bind("S-Tab", LFUN_CELL_BACKWARD); // jug20000522
- kbmap->bind("S-ISO_Left_Tab", LFUN_CELL_BACKWARD); // jbl 2001-23-02
-}
-
-
-void LyX::emergencyCleanup()
+ //kbmap->bind("KP_0", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_Decimal", FuncRequest(LFUN_SELF_INSERT));
+ kbmap->bind("KP_Enter", FuncRequest(LFUN_BREAK_PARAGRAPH));
+ //kbmap->bind("KP_1", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_2", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_3", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_4", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_5", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_6", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_Add", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_7", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_8", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_9", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_Divide", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_Multiply", FuncRequest(LFUN_SELF_INSERT));
+ //kbmap->bind("KP_Subtract", FuncRequest(LFUN_SELF_INSERT));
+ kbmap->bind("KP_Right", FuncRequest(LFUN_CHAR_FORWARD));
+ kbmap->bind("KP_Left", FuncRequest(LFUN_CHAR_BACKWARD));
+ kbmap->bind("KP_Up", FuncRequest(LFUN_UP));
+ kbmap->bind("KP_Down", FuncRequest(LFUN_DOWN));
+ kbmap->bind("KP_Home", FuncRequest(LFUN_LINE_BEGIN));
+ kbmap->bind("KP_End", FuncRequest(LFUN_LINE_END));
+ kbmap->bind("KP_Prior", FuncRequest(LFUN_SCREEN_UP));
+ kbmap->bind("KP_Next", FuncRequest(LFUN_SCREEN_DOWN));
+}
+
+
+void LyX::emergencyCleanup() const
{
// what to do about tmpfiles is non-obvious. we would
// like to delete any we find, but our lyxdir might
{
// bindKeyings for transparent handling of deadkeys
// The keysyms are gotten from XFree86 X11R6
- kbmap->bind("~C-~S-~M-dead_acute", LFUN_ACUTE);
- kbmap->bind("~C-~S-~M-dead_breve", LFUN_BREVE);
- kbmap->bind("~C-~S-~M-dead_caron", LFUN_CARON);
- kbmap->bind("~C-~S-~M-dead_cedilla", LFUN_CEDILLA);
- kbmap->bind("~C-~S-~M-dead_abovering", LFUN_CIRCLE);
- kbmap->bind("~C-~S-~M-dead_circumflex", LFUN_CIRCUMFLEX);
- kbmap->bind("~C-~S-~M-dead_abovedot", LFUN_DOT);
- kbmap->bind("~C-~S-~M-dead_grave", LFUN_GRAVE);
- kbmap->bind("~C-~S-~M-dead_doubleacute", LFUN_HUNG_UMLAUT);
- kbmap->bind("~C-~S-~M-dead_macron", LFUN_MACRON);
+ kbmap->bind("~C-~S-~M-dead_acute", FuncRequest(LFUN_ACCENT_ACUTE));
+ kbmap->bind("~C-~S-~M-dead_breve", FuncRequest(LFUN_ACCENT_BREVE));
+ kbmap->bind("~C-~S-~M-dead_caron", FuncRequest(LFUN_ACCENT_CARON));
+ kbmap->bind("~C-~S-~M-dead_cedilla", FuncRequest(LFUN_ACCENT_CEDILLA));
+ kbmap->bind("~C-~S-~M-dead_abovering", FuncRequest(LFUN_ACCENT_CIRCLE));
+ kbmap->bind("~C-~S-~M-dead_circumflex", FuncRequest(LFUN_ACCENT_CIRCUMFLEX));
+ kbmap->bind("~C-~S-~M-dead_abovedot", FuncRequest(LFUN_ACCENT_DOT));
+ kbmap->bind("~C-~S-~M-dead_grave", FuncRequest(LFUN_ACCENT_GRAVE));
+ kbmap->bind("~C-~S-~M-dead_doubleacute", FuncRequest(LFUN_ACCENT_HUNGARIAN_UMLAUT));
+ kbmap->bind("~C-~S-~M-dead_macron", FuncRequest(LFUN_ACCENT_MACRON));
// nothing with this name
- // kbmap->bind("~C-~S-~M-dead_special_caron", LFUN_SPECIAL_CARON);
- kbmap->bind("~C-~S-~M-dead_tilde", LFUN_TILDE);
- kbmap->bind("~C-~S-~M-dead_diaeresis", LFUN_UMLAUT);
+ // kbmap->bind("~C-~S-~M-dead_special_caron", LFUN_ACCENT_SPECIAL_CARON);
+ kbmap->bind("~C-~S-~M-dead_tilde", FuncRequest(LFUN_ACCENT_TILDE));
+ kbmap->bind("~C-~S-~M-dead_diaeresis", FuncRequest(LFUN_ACCENT_UMLAUT));
// nothing with this name either...
- //kbmap->bind("~C-~S-~M-dead_underbar", LFUN_UNDERBAR);
- kbmap->bind("~C-~S-~M-dead_belowdot", LFUN_UNDERDOT);
- kbmap->bind("~C-~S-~M-dead_tie", LFUN_TIE);
- kbmap->bind("~C-~S-~M-dead_ogonek", LFUN_OGONEK);
+ //kbmap->bind("~C-~S-~M-dead_underbar", FuncRequest(LFUN_ACCENT_UNDERBAR));
+ kbmap->bind("~C-~S-~M-dead_belowdot", FuncRequest(LFUN_ACCENT_UNDERDOT));
+ kbmap->bind("~C-~S-~M-dead_tie", FuncRequest(LFUN_ACCENT_TIE));
+ kbmap->bind("~C-~S-~M-dead_ogonek",FuncRequest(LFUN_ACCENT_OGONEK));
}
-void LyX::queryUserLyXDir(bool explicit_userdir)
+namespace {
+
+// return true if file does not exist or is older than configure.py.
+bool needsUpdate(string const & file)
{
- string const configure_script = AddName(system_lyxdir(), "configure");
+ static string const configure_script =
+ addName(package().system_support(), "configure.py");
+ string const absfile =
+ addName(package().user_support(), file);
+
+ return (! fs::exists(absfile))
+ || (fs::last_write_time(configure_script)
+ > fs::last_write_time(absfile));
+}
+
+}
+
+bool LyX::queryUserLyXDir(bool explicit_userdir)
+{
// 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;
- }
- return;
+
+ return needsUpdate("lyxrc.defaults")
+ || needsUpdate("textclass.lst")
+ || needsUpdate("packages.lst");
}
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;
+ lyx_exit(EXIT_FAILURE);
+ }
- 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;
+ lyxerr << bformat(_("LyX: Creating directory %1$s"),
+ package().user_support())
+ << endl;
+
+ if (!createDirectory(package().user_support(), 0755)) {
+ // Failed, so let's exit.
+ lyxerr << _("Failed to create directory. Exiting.")
+ << endl;
+ lyx_exit(EXIT_FAILURE);
}
- // Run configure in user lyx directory
- Path p(user_lyxdir());
- ::system(configure_script.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ return true;
}
-void LyX::readRcFile(string const & name)
+bool LyX::readRcFile(string const & name)
{
- lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
+ lyxerr[Debug::INIT] << "About to read " << name << "... ";
- string const lyxrc_path = LibFileSearch(string(), name);
+ string const lyxrc_path = libFileSearch(string(), name);
if (!lyxrc_path.empty()) {
- lyxerr[Debug::INIT] << "Found " << name
- << " in " << lyxrc_path << endl;
+ lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl;
- if (lyxrc.read(lyxrc_path) >= 0)
- return;
- }
+ if (lyxrc.read(lyxrc_path) < 0) {
+ showFileError(name);
+ return false;
+ }
+ } else
+ lyxerr[Debug::INIT] << "Not found." << lyxrc_path << endl;
+ return true;
- showFileError(name);
}
// Read the ui file `name'
-void LyX::readUIFile(string const & name)
+bool LyX::readUIFile(string const & name)
{
enum Uitags {
ui_menuset = 1,
<< "' has been read already. "
<< "Is this an include loop?"
<< endl;
- return;
+ return false;
}
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const 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;
showFileError(name);
- return;
+ return false;
}
uifiles.push_back(name);
case ui_include: {
lex.next(true);
string const file = lex.getString();
- readUIFile(file);
+ if (!readUIFile(file))
+ return false;
break;
}
case ui_menuset:
break;
}
}
+ return true;
}
// Read the languages file `name'
-void LyX::readLanguagesFile(string const & name)
+bool LyX::readLanguagesFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const lang_path = LibFileSearch(string(), name);
+ string const lang_path = libFileSearch(string(), name);
if (lang_path.empty()) {
showFileError(name);
- return;
+ return false;
}
languages.read(lang_path);
+ return true;
}
// Read the encodings file `name'
-void LyX::readEncodingsFile(string const & name)
+bool LyX::readEncodingsFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const enc_path = LibFileSearch(string(), name);
+ string const enc_path = libFileSearch(string(), name);
if (enc_path.empty()) {
showFileError(name);
- return;
+ return false;
}
encodings.read(enc_path);
+ return true;
}
_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
"Command line switches (case sensitive):\n"
"\t-help summarize LyX usage\n"
- "\t-userdir dir try to set user directory to dir\n"
- "\t-sysdir dir try to set system directory to dir\n"
+ "\t-userdir dir set user directory to dir\n"
+ "\t-sysdir dir 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"
int parse_version(string const &, string const &)
{
lyxerr << "LyX " << lyx_version
- << " of " << lyx_release_date << endl;
+ << " (" << lyx_release_date << ")" << endl;
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << lyx_version_info << endl;
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;
}
std::map<string, cmd_helper>::const_iterator it
= cmdmap.find(argv[i]);
+ // check for X11 -geometry option
+ if (lyx::support::compare(argv[i], "-geometry") == 0)
+ geometryOption_ = true;
+
// don't complain if not found - may be parsed later
if (it == cmdmap.end())
continue;
projects / lyx.git / blobdiff