X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=cc856fb70a4e3a8aaca7f0a644e1d1af14e227e5;hb=3815df7705b09920f9bb60c6fd9ee0576fe0a834;hp=e5a31af35c8b9d56d59244cf26ff141063ac6fe9;hpb=00c37e4781093111b062bd7026b7755bf93e8aba;p=lyx.git diff --git a/src/lyx_main.C b/src/lyx_main.C index e5a31af35c..cc856fb70a 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -31,23 +31,25 @@ #include "session.h" #include "LColor.h" #include "lyx_cb.h" +#include "LyXAction.h" #include "lyxfunc.h" #include "lyxlex.h" #include "lyxrc.h" -#include "lyxtextclasslist.h" #include "lyxserver.h" +#include "lyxsocket.h" +#include "lyxtextclasslist.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/Application.h" +#include "frontends/Gui.h" #include "frontends/LyXView.h" #include "support/environment.h" #include "support/filetools.h" +#include "support/fontutils.h" #include "support/lyxlib.h" #include "support/convert.h" #include "support/os.h" @@ -61,29 +63,32 @@ #include #include -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 lyx { + +using support::addName; +using support::addPath; +using support::bformat; +using support::createDirectory; +using support::createLyXTmpDir; +using support::destroyDir; +using support::fileSearch; +using support::getEnv; +using support::i18nLibFileSearch; +using support::libFileSearch; +using support::package; +using support::prependEnvPath; +using support::rtrim; +using support::Systemcall; + +namespace Alert = frontend::Alert; +namespace os = support::os; namespace fs = boost::filesystem; using std::endl; using std::string; using std::vector; -using std::mem_fun_ref; +using std::for_each; #ifndef CXX_GLOBAL_CSTD using std::exit; @@ -91,14 +96,15 @@ using std::signal; using std::system; #endif +/// +frontend::Application * theApp = 0; -extern LyXServer * lyxserver; - -// This is the global bufferlist object -BufferList bufferlist; +/// are we using the GUI at all? +/** +* We default to true and this is changed to false when the export feature is used. +*/ +bool use_gui = true; -// convenient to have it here. -boost::scoped_ptr toplevel_keymap; namespace { @@ -108,23 +114,11 @@ 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)); + bformat(_("Error while reading the configuration file\n%1$s.\n" + "Please check your installation."), from_utf8(error))); } @@ -132,18 +126,39 @@ void reconfigureUserLyXDir() { string const configure_command = package().configure_command(); - lyxerr << _("LyX: reconfiguring user directory") << endl; - Path p(package().user_support()); + lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl; + support::Path p(package().user_support()); Systemcall one; one.startscript(Systemcall::Wait, configure_command); - lyxerr << "LyX: " << _("Done!") << endl; + lyxerr << "LyX: " << to_utf8(_("Done!")) << endl; } } // namespace anon +/// The main application class private implementation. +struct LyX::Singletons +{ + /// our function handler + LyXFunc lyxfunc_; + /// + BufferList buffer_list_; + /// + boost::scoped_ptr toplevel_keymap_; + /// + boost::scoped_ptr lyx_server_; + /// + boost::scoped_ptr lyx_socket_; + /// + boost::scoped_ptr application_; + /// lyx session, containing lastfiles, lastfilepos, and lastopened + boost::scoped_ptr session_; +}; + + boost::scoped_ptr LyX::singleton_; + int LyX::exec(int & argc, char * argv[]) { BOOST_ASSERT(!singleton_.get()); @@ -172,26 +187,102 @@ LyX const & LyX::cref() LyX::LyX() : first_start(false), geometryOption_(false) -{} +{ + pimpl_.reset(new Singletons); +} + + +BufferList & LyX::bufferList() +{ + return pimpl_->buffer_list_; +} -lyx::Session & LyX::session() +BufferList const & LyX::bufferList() const { - BOOST_ASSERT(session_.get()); - return *session_.get(); + return pimpl_->buffer_list_; } -lyx::Session const & LyX::session() const +Session & LyX::session() { - BOOST_ASSERT(session_.get()); - return *session_.get(); + BOOST_ASSERT(pimpl_->session_.get()); + return *pimpl_->session_.get(); } -void LyX::addLyXView(LyXView * lyxview) +Session const & LyX::session() const { - views_.push_back(lyxview); + BOOST_ASSERT(pimpl_->session_.get()); + return *pimpl_->session_.get(); +} + + +LyXFunc & LyX::lyxFunc() +{ + return pimpl_->lyxfunc_; +} + + +LyXFunc const & LyX::lyxFunc() const +{ + return pimpl_->lyxfunc_; +} + + +LyXServer & LyX::server() +{ + BOOST_ASSERT(pimpl_->lyx_server_.get()); + return *pimpl_->lyx_server_.get(); +} + + +LyXServer const & LyX::server() const +{ + BOOST_ASSERT(pimpl_->lyx_server_.get()); + return *pimpl_->lyx_server_.get(); +} + + +LyXServerSocket & LyX::socket() +{ + BOOST_ASSERT(pimpl_->lyx_socket_.get()); + return *pimpl_->lyx_socket_.get(); +} + + +LyXServerSocket const & LyX::socket() const +{ + BOOST_ASSERT(pimpl_->lyx_socket_.get()); + return *pimpl_->lyx_socket_.get(); +} + + +frontend::Application & LyX::application() +{ + BOOST_ASSERT(pimpl_->application_.get()); + return *pimpl_->application_.get(); +} + + +frontend::Application const & LyX::application() const +{ + BOOST_ASSERT(pimpl_->application_.get()); + return *pimpl_->application_.get(); +} + + +kb_keymap & LyX::topLevelKeymap() +{ + BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); + return *pimpl_->toplevel_keymap_.get(); +} + + +kb_keymap const & LyX::topLevelKeymap() const +{ + BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); + return *pimpl_->toplevel_keymap_.get(); } @@ -201,10 +292,12 @@ Buffer const * const LyX::updateInset(InsetBase const * inset) const return 0; Buffer const * buffer_ptr = 0; - ViewList::const_iterator it = views_.begin(); - ViewList::const_iterator const end = views_.end(); + vector const & view_ids = pimpl_->application_->gui().viewIds(); + vector::const_iterator it = view_ids.begin(); + vector::const_iterator const end = view_ids.end(); for (; it != end; ++it) { - Buffer const * ptr = (*it)->updateInset(inset); + Buffer const * ptr = + pimpl_->application_->gui().view(*it).updateInset(inset); if (ptr) buffer_ptr = ptr; } @@ -216,57 +309,132 @@ 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" - lyx_gui::use_gui = easyParse(argc, argv); + easyParse(argc, argv); - lyx::support::init_package(argv[0], cl_system_support, cl_user_support, - lyx::support::top_build_dir_is_one_level_up); + support::init_package(argv[0], cl_system_support, cl_user_support, + support::top_build_dir_is_one_level_up); - // Start the real execution loop. - if (lyx_gui::use_gui) - return lyx_gui::exec(argc, argv); - else - return exec2(argc, argv); + vector files; + int exit_status = execBatchCommands(argc, argv, files); + + if (exit_status) + return exit_status; + + if (use_gui) { + // Force adding of font path _before_ Application is initialized + support::addFontResources(); + pimpl_->application_.reset(createApplication(argc, argv)); + initGuiFont(); + // FIXME: this global pointer should probably go. + theApp = pimpl_->application_.get(); + restoreGuiSession(files); + // Start the real execution loop. + + // FIXME + /* Create a CoreApplication class that will provide the main event loop + * and the socket callback registering. With Qt4, only QtCore + * library would be needed. + * When this is done, a server_mode could be created and the following two + * line would be moved out from here. + */ + pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes)); + pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_, + support::os::internal_path(package().temp_dir() + "/lyxsocket"))); + + // handle the batch commands the user asked for + if (!batch_command.empty()) { + pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command)); + } + + exit_status = pimpl_->application_->start(batch_command); + // Kill the application object before exiting. This avoid crash + // on exit on Linux. + pimpl_->application_.reset(); + // Restore original font resources after Application is destroyed. + support::restoreFontResources(); + } + else { + // FIXME: create a ConsoleApplication + theApp = 0; + } + + return exit_status; +} + + +void LyX::prepareExit() +{ + // Set a flag that we do quitting from the program, + // so no refreshes are necessary. + quitting = true; + + // close buffers first + pimpl_->buffer_list_.closeAll(); + + // do any other cleanup procedures now + lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl; + + if (!destroyDir(package().temp_dir())) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + from_utf8(package().temp_dir())); + Alert::warning(_("Unable to remove temporary directory"), msg); + } +} + + +void LyX::earlyExit(int status) +{ + BOOST_ASSERT(pimpl_->application_.get()); + // LyX::pimpl_::application_ is not initialised at this + // point so it's safe to just exit after some cleanup. + prepareExit(); + exit(status); +} + + +void LyX::quit() +{ + lyxerr[Debug::INFO] << "Running QuitLyX." << endl; + + prepareExit(); + + if (use_gui) { + pimpl_->session_->writeFile(); + pimpl_->lyx_server_.reset(); + pimpl_->lyx_socket_.reset(); + pimpl_->application_->exit(0); + } } -int LyX::exec2(int & argc, char * argv[]) +int LyX::execBatchCommands(int & argc, char * argv[], + vector & files) { // 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; + lyxerr << to_utf8( + bformat(_("Wrong command line option `%1$s'. Exiting."), + from_utf8(argv[argi]))) << endl; return EXIT_FAILURE; } } // Initialization of LyX (reads lyxrc and more) lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl; - bool const success = init(); + bool success = init(); lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl; if (!success) return EXIT_FAILURE; - if (lyx_gui::use_gui) - lyx_gui::parse_lyxrc(); - - vector files; - 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")); - // if a file is specified, I assume that user wants to edit *that* file - if (files.empty() && lyxrc.load_session) { - vector const & lastopened = session_->lastOpenedFiles(); - files.insert(files.end(), lastopened.begin(), lastopened.end() ); - } - // clear this list to save a few bytes of RAM - session_->clearLastOpenedFiles(); - // Execute batch commands if available if (!batch_command.empty()) { @@ -283,87 +451,109 @@ int LyX::exec2(int & argc, char * argv[]) // the filename if necessary string s = fileSearch(string(), *it, "lyx"); if (s.empty()) { - last_loaded = newFile(*it, string(), true); + Buffer * const b = newFile(*it, string(), true); + if (b) + last_loaded = b; } else { - Buffer * buf = bufferlist.newBuffer(s, false); - if (loadLyXFile(buf, s)) + Buffer * buf = pimpl_->buffer_list_.newBuffer(s, false); + if (loadLyXFile(buf, s)) { last_loaded = buf; - else - bufferlist.release(buf); - - ErrorList const & el = buf->getErrorList(); - if (!el.empty()) { - // There should be a way to use the following but I (abdel) don't know - // how to make it compile on MSVC2005. - //for_each(el.begin(), el.end(), mem_fun_ref(&LyX::printError)); - for (ErrorList::const_iterator it = el.begin(); - it != el.end(); ++it) { - printError(*it); - } + ErrorList const & el = buf->errorList("Parse"); + if (!el.empty()) + for_each(el.begin(), el.end(), + boost::bind(&LyX::printError, this, _1)); } + else + pimpl_->buffer_list_.release(buf); } } // try to dispatch to last loaded buffer first if (last_loaded) { - bool success = false; + success = false; if (last_loaded->dispatch(batch_command, &success)) { - quitLyX(false); + prepareExit(); return !success; } } files.clear(); // the files are already loaded } - 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(val); - val = session().loadSessionInfo("WindowHeight"); - if (!val.empty()) - height = convert(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(val); - val = session().loadSessionInfo("WindowPosY"); - if (!val.empty()) - posy = convert(val); - } + return EXIT_SUCCESS; +} - if (geometryOption_) { - width = 0; - height = 0; - } - return lyx_gui::start(batch_command, files, width, height, posx, posy, maximize); +void LyX::restoreGuiSession(vector const & files) +{ + LyXView * view = newLyXView(); + + // load files + for_each(files.begin(), files.end(), + bind(&LyXView::loadLyXFile, view, _1, true)); - } else { - // Something went wrong above - quitLyX(false); - return EXIT_FAILURE; + // if a file is specified, I assume that user wants to edit *that* file + if (files.empty() && lyxrc.load_session) { + vector const & lastopened = pimpl_->session_->lastOpened().getfiles(); + // 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 + pimpl_->session_->lastOpened().clear(); } +LyXView * LyX::newLyXView() +{ + if (!lyx::use_gui) + return 0; + + // 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().sessionInfo().load("WindowWidth"); + if (!val.empty()) + width = convert(val); + val = session().sessionInfo().load("WindowHeight"); + if (!val.empty()) + height = convert(val); + if (session().sessionInfo().load("WindowIsMaximized") == "yes") + maximize = true; + } + + // if user wants to restore window position + int posx = -1; + int posy = -1; + if (lyxrc.geometry_xysaved) { + string val = session().sessionInfo().load("WindowPosX"); + if (!val.empty()) + posx = convert(val); + val = session().sessionInfo().load("WindowPosY"); + if (!val.empty()) + posy = convert(val); + } + + if (geometryOption_) { + width = 0; + height = 0; + } + // create the main window + LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize); + + return view; +} + /* Signals and Windows =================== @@ -456,7 +646,7 @@ static void error_handler(int err_sig) #else if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) #endif - lyx::support::abort(); + support::abort(); exit(0); } @@ -465,9 +655,23 @@ static void error_handler(int err_sig) void LyX::printError(ErrorItem const & ei) { - std::cerr << _("LyX: ") << ei.error - << ':' << ei.description << std::endl; + docstring tmp = _("LyX: ") + ei.error + char_type(':') + + ei.description; + std::cerr << to_utf8(tmp) << std::endl; +} + +void LyX::initGuiFont() +{ + if (lyxrc.roman_font_name.empty()) + lyxrc.roman_font_name = pimpl_->application_->romanFontName(); + + if (lyxrc.sans_font_name.empty()) + lyxrc.sans_font_name = pimpl_->application_->sansFontName(); + + if (lyxrc.typewriter_font_name.empty()) + lyxrc.typewriter_font_name + = pimpl_->application_->typewriterFontName(); } @@ -490,13 +694,6 @@ bool LyX::init() "templates"); } - if (lyxrc.roman_font_name.empty()) - lyxrc.roman_font_name = lyx_gui::roman_font_name(); - if (lyxrc.sans_font_name.empty()) - lyxrc.sans_font_name = lyx_gui::sans_font_name(); - if (lyxrc.typewriter_font_name.empty()) - lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name(); - // // Read configuration files // @@ -515,12 +712,12 @@ bool LyX::init() if (!lyxrc.path_prefix.empty()) prependEnvPath("PATH", lyxrc.path_prefix); - // Check that user LyX directory is ok. We don't do that if - // running in batch mode. - if (lyx_gui::use_gui) { - if (queryUserLyXDir(package().explicit_user_support())) - reconfigureUserLyXDir(); - } else { + // 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 (!use_gui) { first_start = false; } @@ -531,6 +728,9 @@ bool LyX::init() // Query the OS to know what formats are viewed natively formats.setAutoOpen(); + // Read lyxrc.dist again to be able to override viewer auto-detection. + readRcFile("lyxrc.dist"); + system_lyxrc = lyxrc; system_formats = formats; system_converters = converters; @@ -551,11 +751,13 @@ bool LyX::init() if (!LyXSetStyle()) return false; - if (lyx_gui::use_gui) { + if (use_gui) { // Set up bindings - toplevel_keymap.reset(new kb_keymap); - defaultKeyBindings(toplevel_keymap.get()); - toplevel_keymap->read(lyxrc.bind_file); + pimpl_->toplevel_keymap_.reset(new kb_keymap); + defaultKeyBindings(pimpl_->toplevel_keymap_.get()); + pimpl_->toplevel_keymap_->read(lyxrc.bind_file); + + pimpl_->lyxfunc_.initKeySequences(pimpl_->toplevel_keymap_.get()); // Read menus if (!readUIFile(lyxrc.ui_file)) @@ -577,9 +779,9 @@ bool LyX::init() 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)); + "%1$s. Make sure that this\n" + "path exists and is writable and try again."), + from_utf8(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 @@ -593,7 +795,7 @@ bool LyX::init() } lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl; - session_.reset(new lyx::Session(lyxrc.num_lastfiles)); + pimpl_->session_.reset(new Session(lyxrc.num_lastfiles)); return true; } @@ -657,9 +859,12 @@ void LyX::emergencyCleanup() const // contain documents etc. which might be helpful on // a crash - bufferlist.emergencyWriteAll(); - if (lyxserver) - lyxserver->emergencyCleanup(); + pimpl_->buffer_list_.emergencyWriteAll(); + if (use_gui) { + pimpl_->lyx_server_->emergencyCleanup(); + pimpl_->lyx_server_.reset(); + pimpl_->lyx_socket_.reset(); + } } @@ -700,7 +905,7 @@ bool needsUpdate(string const & file) addName(package().user_support(), file); return (! fs::exists(absfile)) - || (fs::last_write_time(configure_script) + || (fs::last_write_time(configure_script) > fs::last_write_time(absfile)); } @@ -713,9 +918,9 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) if (fs::exists(package().user_support()) && fs::is_directory(package().user_support())) { first_start = false; - - return needsUpdate("lyxrc.defaults") - || needsUpdate("textclass.lst") + + return needsUpdate("lyxrc.defaults") + || needsUpdate("textclass.lst") || needsUpdate("packages.lst"); } @@ -727,25 +932,25 @@ bool LyX::queryUserLyXDir(bool 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()), + "LyX directory, %1$s.\n" + "It is needed to keep your own configuration."), + from_utf8(package().user_support())), 1, 0, _("&Create directory"), _("&Exit LyX"))) { - lyxerr << _("No user LyX directory. Exiting.") << endl; - lyx_exit(EXIT_FAILURE); + lyxerr << to_utf8(_("No user LyX directory. Exiting.")) << endl; + earlyExit(EXIT_FAILURE); } - lyxerr << bformat(_("LyX: Creating directory %1$s"), - package().user_support()) + lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"), + from_utf8(package().user_support()))) << endl; if (!createDirectory(package().user_support(), 0755)) { // Failed, so let's exit. - lyxerr << _("Failed to create directory. Exiting.") + lyxerr << to_utf8(_("Failed to create directory. Exiting.")) << endl; - lyx_exit(EXIT_FAILURE); + earlyExit(EXIT_FAILURE); } return true; @@ -890,7 +1095,6 @@ bool LyX::readEncodingsFile(string const & name) namespace { -bool is_gui = true; string batch; /// return the the number of arguments consumed @@ -899,11 +1103,11 @@ typedef boost::function cmd_helper; int parse_dbg(string const & arg, string const &) { if (arg.empty()) { - lyxerr << _("List of supported debug flags:") << endl; + lyxerr << to_utf8(_("List of supported debug flags:")) << endl; Debug::showTags(lyxerr); exit(0); } - lyxerr << bformat(_("Setting debug level to %1$s"), arg) << endl; + lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl; lyxerr.level(Debug::value(arg)); Debug::showLevel(lyxerr, lyxerr.level()); @@ -914,7 +1118,7 @@ int parse_dbg(string const & arg, string const &) int parse_help(string const &, string const &) { lyxerr << - _("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" + to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" "\t-help summarize LyX usage\n" "\t-userdir dir set user directory to dir\n" @@ -931,7 +1135,7 @@ int parse_help(string const &, string const &) " 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; + "Check the LyX man page for more details.")) << endl; exit(0); return 0; } @@ -939,7 +1143,7 @@ int parse_help(string const &, string const &) 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; @@ -950,7 +1154,7 @@ int parse_version(string const &, string const &) int parse_sysdir(string const & arg, string const &) { if (arg.empty()) { - lyxerr << _("Missing directory for -sysdir switch") << endl; + lyxerr << to_utf8(_("Missing directory for -sysdir switch")) << endl; exit(1); } cl_system_support = arg; @@ -960,7 +1164,7 @@ int parse_sysdir(string const & arg, string const &) int parse_userdir(string const & arg, string const &) { if (arg.empty()) { - lyxerr << _("Missing directory for -userdir switch") << endl; + lyxerr << to_utf8(_("Missing directory for -userdir switch")) << endl; exit(1); } cl_user_support = arg; @@ -970,7 +1174,7 @@ int parse_userdir(string const & arg, string const &) int parse_execute(string const & arg, string const &) { if (arg.empty()) { - lyxerr << _("Missing command string after --execute switch") << endl; + lyxerr << to_utf8(_("Missing command string after --execute switch")) << endl; exit(1); } batch = arg; @@ -980,24 +1184,24 @@ int parse_execute(string const & arg, string const &) int parse_export(string const & type, string const &) { if (type.empty()) { - lyxerr << _("Missing file type [eg latex, ps...] after " - "--export switch") << endl; + lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " + "--export switch")) << endl; exit(1); } batch = "buffer-export " + type; - is_gui = false; + use_gui = false; return 1; } int parse_import(string const & type, string const & file) { if (type.empty()) { - lyxerr << _("Missing file type [eg latex, ps...] after " - "--import switch") << endl; + lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " + "--import switch")) << endl; exit(1); } if (file.empty()) { - lyxerr << _("Missing filename for --import") << endl; + lyxerr << to_utf8(_("Missing filename for --import")) << endl; exit(1); } @@ -1008,7 +1212,7 @@ int parse_import(string const & type, string const & file) } // namespace anon -bool LyX::easyParse(int & argc, char * argv[]) +void LyX::easyParse(int & argc, char * argv[]) { std::map cmdmap; @@ -1031,7 +1235,7 @@ bool LyX::easyParse(int & argc, char * argv[]) = cmdmap.find(argv[i]); // check for X11 -geometry option - if (lyx::support::compare(argv[i], "-geometry") == 0) + if (support::compare(argv[i], "-geometry") == 0) geometryOption_ = true; // don't complain if not found - may be parsed later @@ -1052,6 +1256,53 @@ bool LyX::easyParse(int & argc, char * argv[]) } batch_command = batch; +} + + +FuncStatus getStatus(FuncRequest const & action) +{ + return LyX::ref().lyxFunc().getStatus(action); +} + - return is_gui; +void dispatch(FuncRequest const & action) +{ + LyX::ref().lyxFunc().dispatch(action); } + + +BufferList & theBufferList() +{ + return LyX::ref().bufferList(); +} + + +LyXFunc & theLyXFunc() +{ + return LyX::ref().lyxFunc(); +} + + +LyXServer & theLyXServer() +{ + // FIXME: this should not be use_gui dependent + BOOST_ASSERT(use_gui); + return LyX::ref().server(); +} + + +LyXServerSocket & theLyXServerSocket() +{ + // FIXME: this should not be use_gui dependent + BOOST_ASSERT(use_gui); + return LyX::ref().socket(); +} + + +kb_keymap & theTopLevelKeymap() +{ + BOOST_ASSERT(use_gui); + return LyX::ref().topLevelKeymap(); +} + +} // namespace lyx