X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=b57245bb1e1fc2226964082db05838a89fa630fe;hb=7eaae7b7ffac7906dff89e4e27c9a5dcd322f3dc;hp=3c2dd305d889fdc70663413ad869f376b419cbca;hpb=988f372843941436021a45c5d8848c514f23887c;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 3c2dd305d8..b57245bb1e 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -4,10 +4,10 @@ * Licence details can be found in the file COPYING. * * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -17,104 +17,96 @@ #include "LyX.h" -#include "ConverterCache.h" +#include "AppleSpellChecker.h" +#include "AspellChecker.h" #include "Buffer.h" -#include "buffer_funcs.h" #include "BufferList.h" +#include "CmdDef.h" +#include "ColorSet.h" +#include "ConverterCache.h" #include "Converter.h" #include "CutAndPaste.h" -#include "debug.h" +#include "EnchantChecker.h" #include "Encoding.h" #include "ErrorList.h" #include "Format.h" -#include "gettext.h" +#include "FuncStatus.h" +#include "HunspellChecker.h" #include "KeyMap.h" #include "Language.h" -#include "Session.h" -#include "Color.h" -#include "LyXAction.h" -#include "LyXFunc.h" +#include "LaTeXFonts.h" +#include "LayoutFile.h" #include "Lexer.h" +#include "LyX.h" +#include "LyXAction.h" #include "LyXRC.h" #include "ModuleList.h" +#include "Mover.h" #include "Server.h" #include "ServerSocket.h" -#include "TextClassList.h" -#include "MenuBackend.h" -#include "Messages.h" -#include "Mover.h" -#include "ToolbarBackend.h" +#include "Session.h" +#include "WordList.h" #include "frontends/alert.h" #include "frontends/Application.h" -#include "frontends/Dialogs.h" -#include "frontends/Gui.h" -#include "frontends/LyXView.h" +#include "support/ConsoleApplication.h" +#include "support/lassert.h" +#include "support/debug.h" #include "support/environment.h" -#include "support/filetools.h" -#include "support/lyxlib.h" -#include "support/convert.h" #include "support/ExceptionMessage.h" +#include "support/filetools.h" +#include "support/gettext.h" +#include "support/lstrings.h" +#include "support/Messages.h" #include "support/os.h" #include "support/Package.h" -#include "support/Path.h" -#include "support/Systemcall.h" -#include +#include "support/bind.h" +#include #include #include #include #include +#include #include #include -using std::endl; -using std::for_each; -using std::map; -using std::make_pair; -using std::string; -using std::vector; - -#ifndef CXX_GLOBAL_CSTD -using std::exit; -using std::signal; -using std::system; +using namespace std; +using namespace lyx::support; + +#if defined (USE_MACOSX_PACKAGING) +#include #endif namespace lyx { -using support::addName; -using support::addPath; -using support::bformat; -using support::changeExtension; -using support::createDirectory; -using support::createLyXTmpDir; -using support::destroyDir; -using support::FileName; -using support::fileSearch; -using support::getEnv; -using support::i18nLibFileSearch; -using support::libFileSearch; -using support::package; -using support::prependEnvPath; -using support::rtrim; -using support::Systemcall; -using frontend::LyXView; - namespace Alert = frontend::Alert; namespace os = support::os; -/// are we using the GUI at all? -/** -* We default to true and this is changed to false when the export feature is used. -*/ +// 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; -bool quitting; // flag, that we are quitting the program + +// We default to open documents in an already running instance, provided that +// the lyxpipe has been setup. This can be overridden either on the command +// line or through preference settings. + +RunMode run_mode = PREFERRED; + + +// Tell what files can be silently overwritten during batch export. +// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES, UNSPECIFIED. +// Unless specified on command line (through the -f switch) or through the +// environment variable LYX_FORCE_OVERWRITE, the default will be MAIN_FILE. + +OverwriteFiles force_overwrite = UNSPECIFIED; + namespace { @@ -123,7 +115,7 @@ namespace { string cl_system_support; string cl_user_support; -std::string geometryArg; +string geometryArg; LyX * singleton_ = 0; @@ -134,37 +126,29 @@ void showFileError(string const & error) "Please check your installation."), from_utf8(error))); } - -void reconfigureUserLyXDir() -{ - string const configure_command = package().configure_command(); - - lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl; - support::Path p(package().user_support()); - Systemcall one; - one.startscript(Systemcall::Wait, configure_command); - lyxerr << "LyX: " << to_utf8(_("Done!")) << endl; -} - } // namespace anon - /// The main application class private implementation. -struct LyX::Singletons -{ - Singletons() +struct LyX::Impl { + Impl() + : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) + {} + + ~Impl() { - // Set the default User Interface language as soon as possible. - // The language used will be derived from the environment - // variables. - messages_["GUI"] = Messages(); + delete latexfonts_; + delete apple_spell_checker_; + delete aspell_checker_; + delete enchant_checker_; + delete hunspell_checker_; } - /// our function handler - LyXFunc lyxfunc_; + /// BufferList buffer_list_; /// - boost::scoped_ptr toplevel_keymap_; + KeyMap toplevel_keymap_; + /// + CmdDef toplevel_cmddef_; /// boost::scoped_ptr lyx_server_; /// @@ -175,7 +159,7 @@ struct LyX::Singletons boost::scoped_ptr session_; /// Files to load at start. - vector files_to_load_; + vector files_to_load_; /// The messages translators. map messages_; @@ -188,11 +172,49 @@ struct LyX::Singletons /// Movers movers_; - /// Movers system_movers_; + + /// the parsed command line batch command if any + vector batch_commands; + + /// + LaTeXFonts * latexfonts_; + + /// + SpellChecker * spell_checker_; + /// + SpellChecker * apple_spell_checker_; + /// + SpellChecker * aspell_checker_; + /// + SpellChecker * enchant_checker_; + /// + SpellChecker * hunspell_checker_; +}; + + +/// The main application class for console mode +class LyXConsoleApp : public ConsoleApplication +{ +public: + LyXConsoleApp(LyX * lyx, int & argc, char * argv[]) + : ConsoleApplication(lyx_package, argc, argv), lyx_(lyx), + argc_(argc), argv_(argv) + { + } + void doExec() + { + int const exit_status = lyx_->execWithoutGui(argc_, argv_); + exit(exit_status); + } +private: + LyX * lyx_; + int & argc_; + char ** argv_; }; + /// frontend::Application * theApp() { @@ -205,20 +227,29 @@ frontend::Application * theApp() LyX::~LyX() { + delete pimpl_; + singleton_ = 0; + WordList::cleanupWordLists(); } -LyX & LyX::ref() +void lyx_exit(int exit_code) { - BOOST_ASSERT(singleton_); - return *singleton_; -} + if (exit_code) + // Something wrong happened so better save everything, just in + // case. + emergencyCleanup(); +#ifndef NDEBUG + // Properly crash in debug mode in order to get a useful backtrace. + abort(); +#endif -LyX const & LyX::cref() -{ - BOOST_ASSERT(singleton_); - return *singleton_; + // In release mode, try to exit gracefully. + if (theApp()) + theApp()->exit(exit_code); + else + exit(exit_code); } @@ -226,233 +257,71 @@ LyX::LyX() : first_start(false) { singleton_ = this; - pimpl_.reset(new Singletons); -} - - -BufferList & LyX::bufferList() -{ - return pimpl_->buffer_list_; -} - - -BufferList const & LyX::bufferList() const -{ - return pimpl_->buffer_list_; -} - - -Session & LyX::session() -{ - BOOST_ASSERT(pimpl_->session_.get()); - return *pimpl_->session_.get(); -} - - -Session const & LyX::session() const -{ - BOOST_ASSERT(pimpl_->session_.get()); - return *pimpl_->session_.get(); + pimpl_ = new Impl; } -LyXFunc & LyX::lyxFunc() -{ - return pimpl_->lyxfunc_; -} - - -LyXFunc const & LyX::lyxFunc() const -{ - return pimpl_->lyxfunc_; -} - - -Server & LyX::server() -{ - BOOST_ASSERT(pimpl_->lyx_server_.get()); - return *pimpl_->lyx_server_.get(); -} - - -Server const & LyX::server() const -{ - BOOST_ASSERT(pimpl_->lyx_server_.get()); - return *pimpl_->lyx_server_.get(); -} - - -ServerSocket & LyX::socket() -{ - BOOST_ASSERT(pimpl_->lyx_socket_.get()); - return *pimpl_->lyx_socket_.get(); -} - - -ServerSocket 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(); -} - - -KeyMap & LyX::topLevelKeymap() -{ - BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); - return *pimpl_->toplevel_keymap_.get(); -} - - -Converters & LyX::converters() -{ - return pimpl_->converters_; -} - - -Converters & LyX::systemConverters() -{ - return pimpl_->system_converters_; -} - - -KeyMap const & LyX::topLevelKeymap() const -{ - BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); - return *pimpl_->toplevel_keymap_.get(); -} - - -Messages & LyX::getMessages(std::string const & language) +Messages & LyX::messages(string const & language) { map::iterator it = pimpl_->messages_.find(language); if (it != pimpl_->messages_.end()) return it->second; - std::pair::iterator, bool> result = - pimpl_->messages_.insert(std::make_pair(language, Messages(language))); + pair::iterator, bool> result = + pimpl_->messages_.insert(make_pair(language, Messages(language))); - BOOST_ASSERT(result.second); + LATTEST(result.second); return result.first->second; } -Messages & LyX::getGuiMessages() -{ - return pimpl_->messages_["GUI"]; -} - - -void LyX::setGuiLanguage(std::string const & language) -{ - pimpl_->messages_["GUI"] = Messages(language); -} - - -Buffer const * LyX::updateInset(Inset const * inset) const +int LyX::exec(int & argc, char * argv[]) { - if (quitting || !inset) - return 0; - - Buffer const * buffer_ptr = 0; - 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 = - pimpl_->application_->gui().view(*it).updateInset(inset); - if (ptr) - buffer_ptr = ptr; + // Minimal setting of locale before parsing command line + try { + init_package(os::utf8_argv(0), string(), string()); + // we do not get to this point when init_package throws an exception + setLocale(); + } catch (ExceptionMessage const & message) { + LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_); } - return buffer_ptr; -} - -void LyX::hideDialogs(std::string const & name, Inset * inset) const -{ - if (quitting || !use_gui) - return; - - 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) - pimpl_->application_->gui().view(*it).getDialogs(). - hide(name, inset); -} - - -int LyX::exec(int & argc, char * argv[]) -{ // Here we need to parse the command line. At least // we need to parse for "-dbg" and "-help" easyParse(argc, argv); try { - support::init_package(to_utf8(from_local8bit(argv[0])), - cl_system_support, cl_user_support, - support::top_build_dir_is_one_level_up); - } catch (support::ExceptionMessage const & message) { - if (message.type_ == support::ErrorException) { + init_package(os::utf8_argv(0), cl_system_support, cl_user_support); + } catch (ExceptionMessage const & message) { + if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); - exit(1); - } else if (message.type_ == support::WarningException) { + lyx_exit(1); + } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); } } // Reinit the messages machinery in case package() knows // something interesting about the locale directory. - Messages::init(); + setLocale(); if (!use_gui) { - // FIXME: create a ConsoleApplication - int exit_status = init(argc, argv); - if (exit_status) { - prepareExit(); - return exit_status; - } - - loadFiles(); + LyXConsoleApp app(this, argc, argv); - if (batch_command.empty() || pimpl_->buffer_list_.empty()) { - prepareExit(); - return EXIT_SUCCESS; - } - - BufferList::iterator begin = pimpl_->buffer_list_.begin(); + // Reestablish our defaults, as Qt overwrites them + // after creating app + setLocale();//??? - bool final_success = false; - for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) { - Buffer * buf = *I; - if (buf != buf->getMasterBuffer()) - continue; - bool success = false; - buf->dispatch(batch_command, &success); - final_success |= success; - } - prepareExit(); - return !final_success; + return app.exec(); } // Let the frontend parse and remove all arguments that it knows pimpl_->application_.reset(createApplication(argc, argv)); - initGuiFont(); + // Reestablish our defaults, as Qt overwrites them + // after createApplication() + setLocale();//??? // Parse and remove all known arguments in the LyX singleton // Give an error for all remaining ones. @@ -465,21 +334,36 @@ int LyX::exec(int & argc, char * argv[]) return exit_status; } + // If not otherwise specified by a command line option or + // by preferences, we default to reuse a running instance. + if (run_mode == PREFERRED) + run_mode = USE_REMOTE; + // FIXME /* Create a CoreApplication class that will provide the main event loop - * and the socket callback registering. With Qt4, only QtCore + * and the socket callback registering. With Qt, 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. + * However, note that the first of the two lines below triggers the + * "single instance" behavior, which should occur right at this point. */ // Note: socket callback must be registered after init(argc, argv) // such that package().temp_dir() is properly initialized. - pimpl_->lyx_server_.reset(new Server(&pimpl_->lyxfunc_, lyxrc.lyxpipes)); - pimpl_->lyx_socket_.reset(new ServerSocket(&pimpl_->lyxfunc_, - FileName(package().temp_dir().absFilename() + "/lyxsocket"))); + pimpl_->lyx_server_.reset(new Server(lyxrc.lyxpipes)); + pimpl_->lyx_socket_.reset(new ServerSocket( + FileName(package().temp_dir().absFileName() + "/lyxsocket"))); // Start the real execution loop. - exit_status = pimpl_->application_->exec(); + if (!theServer().deferredLoadingToOtherInstance()) + exit_status = pimpl_->application_->exec(); + else if (!pimpl_->files_to_load_.empty()) { + vector::const_iterator it = pimpl_->files_to_load_.begin(); + vector::const_iterator end = pimpl_->files_to_load_.end(); + lyxerr << _("The following files could not be loaded:") << endl; + for (; it != end; ++it) + lyxerr << *it << endl; + } prepareExit(); @@ -493,26 +377,13 @@ void LyX::prepareExit() cap::clearCutStack(); cap::clearSelection(); - // Set a flag that we do quitting from the program, - // so no refreshes are necessary. - quitting = true; + // Write the index file of the converter cache + ConverterCache::get().writeIndex(); // close buffers first pimpl_->buffer_list_.closeAll(); - // do any other cleanup procedures now - if (package().temp_dir() != package().system_temp_dir()) { - LYXERR(Debug::INFO) << "Deleting tmp dir " - << package().temp_dir().absFilename() << endl; - - if (!destroyDir(package().temp_dir())) { - docstring const msg = - bformat(_("Unable to remove the temporary directory %1$s"), - from_utf8(package().temp_dir().absFilename())); - Alert::warning(_("Unable to remove temporary directory"), msg); - } - } - + // register session changes and shutdown server and socket if (use_gui) { if (pimpl_->session_) pimpl_->session_->writeFile(); @@ -521,16 +392,35 @@ void LyX::prepareExit() pimpl_->lyx_socket_.reset(); } + // do any other cleanup procedures now + if (package().temp_dir() != package().system_temp_dir()) { + string const abs_tmpdir = package().temp_dir().absFileName(); + if (!contains(package().temp_dir().absFileName(), "lyx_tmpdir")) { + docstring const msg = + bformat(_("%1$s does not appear like a LyX created temporary directory."), + from_utf8(abs_tmpdir)); + Alert::warning(_("Cannot remove temporary directory"), msg); + } else { + LYXERR(Debug::INFO, "Deleting tmp dir " + << package().temp_dir().absFileName()); + if (!package().temp_dir().destroyDirectory()) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + from_utf8(package().temp_dir().absFileName())); + Alert::warning(_("Unable to remove temporary directory"), msg); + } + } + } + // Kill the application object before exiting. This avoids crashes // when exiting on Linux. - if (pimpl_->application_) - pimpl_->application_.reset(); + pimpl_->application_.reset(); } void LyX::earlyExit(int status) { - BOOST_ASSERT(pimpl_->application_.get()); + LATTEST(pimpl_->application_.get()); // LyX::pimpl_::application_ is not initialised at this // point so it's safe to just exit after some cleanup. prepareExit(); @@ -546,214 +436,176 @@ int LyX::init(int & argc, char * argv[]) if (argv[argi][0] == '-') { lyxerr << to_utf8( bformat(_("Wrong command line option `%1$s'. Exiting."), - from_utf8(argv[argi]))) << endl; + from_utf8(os::utf8_argv(argi)))) << endl; return EXIT_FAILURE; } } // Initialization of LyX (reads lyxrc and more) - LYXERR(Debug::INIT) << "Initializing LyX::init..." << endl; + LYXERR(Debug::INIT, "Initializing LyX::init..."); bool success = init(); - LYXERR(Debug::INIT) << "Initializing LyX::init...done" << endl; + LYXERR(Debug::INIT, "Initializing LyX::init...done"); if (!success) return EXIT_FAILURE; - for (int argi = argc - 1; argi >= 1; --argi) { - // get absolute path of file and add ".lyx" to - // the filename if necessary - pimpl_->files_to_load_.push_back(fileSearch(string(), - os::internal_path(to_utf8(from_local8bit(argv[argi]))), - "lyx", support::allow_unreadable)); + // Remaining arguments are assumed to be files to load. + for (int argi = 1; argi < argc; ++argi) + pimpl_->files_to_load_.push_back(os::utf8_argv(argi)); + + if (!use_gui && pimpl_->files_to_load_.empty()) { + lyxerr << to_utf8(_("Missing filename for this operation.")) << endl; + return EXIT_FAILURE; } - if (first_start) - pimpl_->files_to_load_.push_back(i18nLibFileSearch("examples", "splash.lyx")); + if (first_start) { + pimpl_->files_to_load_.push_back( + i18nLibFileSearch("examples", "splash.lyx").absFileName()); + } return EXIT_SUCCESS; } -void LyX::addFileToLoad(FileName const & fname) +int LyX::execWithoutGui(int & argc, char * argv[]) { - vector::const_iterator cit = std::find( - pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(), - fname); + int exit_status = init(argc, argv); + if (exit_status) { + prepareExit(); + return exit_status; + } + + // this is correct, since return values are inverted. + exit_status = !loadFiles(); + + if (pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) { + prepareExit(); + return exit_status; + } + + BufferList::iterator begin = pimpl_->buffer_list_.begin(); - if (cit == pimpl_->files_to_load_.end()) - pimpl_->files_to_load_.push_back(fname); + bool final_success = false; + for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) { + Buffer * buf = *I; + if (buf != buf->masterBuffer()) + continue; + vector::const_iterator bcit = pimpl_->batch_commands.begin(); + vector::const_iterator bcend = pimpl_->batch_commands.end(); + DispatchResult dr; + for (; bcit != bcend; ++bcit) { + LYXERR(Debug::ACTION, "Buffer::dispatch: cmd: " << *bcit); + buf->dispatch(*bcit, dr); + final_success |= !dr.error(); + } + } + prepareExit(); + return !final_success; } -void LyX::loadFiles() +bool LyX::loadFiles() { - vector::const_iterator it = pimpl_->files_to_load_.begin(); - vector::const_iterator end = pimpl_->files_to_load_.end(); + LATTEST(!use_gui); + bool success = true; + vector::const_iterator it = pimpl_->files_to_load_.begin(); + vector::const_iterator end = pimpl_->files_to_load_.end(); for (; it != end; ++it) { - if (it->empty()) + // get absolute path of file and add ".lyx" to + // the filename if necessary + FileName fname = fileSearch(string(), os::internal_path(*it), "lyx", + may_not_exist); + + if (fname.empty()) continue; - Buffer * buf = pimpl_->buffer_list_.newBuffer(it->absFilename(), false); - if (loadLyXFile(buf, *it)) { + Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName()); + if (buf->loadLyXFile() == Buffer::ReadSuccess) { ErrorList const & el = buf->errorList("Parse"); if (!el.empty()) for_each(el.begin(), el.end(), - boost::bind(&LyX::printError, this, _1)); + bind(&LyX::printError, this, _1)); } - else + else { pimpl_->buffer_list_.release(buf); + docstring const error_message = + bformat(_("LyX failed to load the following file: %1$s"), + from_utf8(fname.absFileName())); + lyxerr << to_utf8(error_message) << endl; + success = false; + } } + return success; } -void LyX::execBatchCommands() +void execBatchCommands() +{ + LAPPERR(singleton_); + singleton_->execCommands(); +} + + +void LyX::execCommands() { // The advantage of doing this here is that the event loop // is already started. So any need for interaction will be // aknowledged. - restoreGuiSession(); // if reconfiguration is needed. - if (textclasslist.empty()) { - switch (Alert::prompt( - _("No textclass is found"), - _("LyX cannot continue because no textclass is found. " - "You can either reconfigure normally, or reconfigure using " - "default textclasses, or quit LyX."), - 0, 2, - _("&Reconfigure"), - _("&Use Default"), - _("&Exit LyX"))) + if (LayoutFileList::get().empty()) { + switch (Alert::prompt( + _("No textclass is found"), + _("LyX will only have minimal functionality because no textclasses " + "have been found. You can either try to reconfigure LyX normally, " + "try to reconfigure without checking your LaTeX installation, or continue."), + 0, 2, + _("&Reconfigure"), + _("&Without LaTeX"), + _("&Continue"))) { case 0: // regular reconfigure - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, "")); + lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, "")); break; case 1: // reconfigure --without-latex-config - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, + lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, " --without-latex-config")); break; + default: + break; } - pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT)); - return; } - - // Execute batch commands if available - if (batch_command.empty()) - return; - - LYXERR(Debug::INIT) << "About to handle -x '" - << batch_command << '\'' << endl; - - pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command)); -} - - -void LyX::restoreGuiSession() -{ - LyXView * view = newLyXView(); - // if there is no valid class list, do not load any file. - if (textclasslist.empty()) - return; + // create the first main window + lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); - // if some files were specified at command-line we assume that the - // user wants to edit *these* files and not to restore the session. if (!pimpl_->files_to_load_.empty()) { - for_each(pimpl_->files_to_load_.begin(), - pimpl_->files_to_load_.end(), - bind(&LyXView::loadLyXFile, view, _1, true)); + // if some files were specified at command-line we assume that the + // user wants to edit *these* files and not to restore the session. + for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) { + lyx::dispatch( + FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i])); + } // clear this list to save a few bytes of RAM pimpl_->files_to_load_.clear(); - pimpl_->session_->lastOpened().clear(); - - } else if (lyxrc.load_session) { - vector const & lastopened = pimpl_->session_->lastOpened().getfiles(); - // do not add to the lastfile list since these files are restored from - // last session, 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)); + } else + pimpl_->application_->restoreGuiSession(); - // clear this list to save a few bytes of RAM - pimpl_->session_->lastOpened().clear(); - } + // Execute batch commands if available + if (pimpl_->batch_commands.empty()) + return; - BufferList::iterator I = pimpl_->buffer_list_.begin(); - BufferList::iterator end = pimpl_->buffer_list_.end(); - for (; I != end; ++I) { - Buffer * buf = *I; - if (buf != buf->getMasterBuffer()) - continue; - updateLabels(*buf); + vector::const_iterator bcit = pimpl_->batch_commands.begin(); + vector::const_iterator bcend = pimpl_->batch_commands.end(); + for (; bcit != bcend; ++bcit) { + LYXERR(Debug::INIT, "About to handle -x '" << *bcit << '\''); + lyx::dispatch(lyxaction.lookupFunc(*bcit)); } - - // FIXME: Switch to the last loaded Buffer. This must not be the first one - // because the Buffer won't be connected in this case. The correct solution - // would be to avoid the manual connection of the current Buffer in LyXView. - if (!pimpl_->buffer_list_.empty()) - view->setBuffer(pimpl_->buffer_list_.last()); } -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; - // default icon size, will be overwritten by stored session value - unsigned int iconSizeXY = 0; - int maximized = LyXView::NotMaximized; - // 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); - val = session().sessionInfo().load("WindowMaximized"); - if (!val.empty()) - maximized = convert(val); - val = session().sessionInfo().load("IconSizeXY"); - if (!val.empty()) - iconSizeXY = convert(val); - } - - // 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 (!geometryArg.empty()) - { - width = 0; - height = 0; - } - - // create the main window - LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximized, iconSizeXY, geometryArg); - - return view; -} - /* Signals and Windows =================== @@ -761,7 +613,7 @@ 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) +Ctrl+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. @@ -796,7 +648,7 @@ static void error_handler(int err_sig) // We have received a signal indicating a fatal error, so // try and save the data ASAP. - LyX::cref().emergencyCleanup(); + emergencyCleanup(); // These lyxerr calls may or may not work: @@ -809,21 +661,23 @@ static void error_handler(int err_sig) // This shouldn't matter here, however, as we've already invoked // emergencyCleanup. + docstring msg; switch (err_sig) { #ifdef SIGHUP case SIGHUP: - lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl; + msg = _("SIGHUP signal caught!\nBye."); break; #endif case SIGFPE: - lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl; + msg = _("SIGFPE signal caught!\nBye."); break; case SIGSEGV: - lyxerr << "\nlyx: SIGSEGV signal caught\n" - "Sorry, you have found a bug in LyX. " + msg = _("SIGSEGV signal caught!\n" + "Sorry, you have found a bug in LyX, " + "hope you have not lost any data.\n" "Please read the bug-reporting instructions " - "in Help->Introduction and send us a bug report, " - "if necessary. Thanks !\nBye." << endl; + "in 'Help->Introduction' and send us a bug report, " + "if necessary. Thanks!\nBye."); break; case SIGINT: case SIGTERM: @@ -831,6 +685,12 @@ static void error_handler(int err_sig) break; } + if (!msg.empty()) { + lyxerr << "\nlyx: " << msg << endl; + // try to make a GUI message + Alert::error(_("LyX crashed!"), msg, true); + } + // Deinstall the signal handlers #ifdef SIGHUP signal(SIGHUP, SIG_DFL); @@ -842,11 +702,18 @@ static void error_handler(int err_sig) #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 +#ifdef _MSC_VER + // with abort() it crashes again. + exit(err_sig); #else - if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) + abort(); #endif - support::abort(); + } + exit(0); } @@ -857,23 +724,60 @@ void LyX::printError(ErrorItem const & ei) { docstring tmp = _("LyX: ") + ei.error + char_type(':') + ei.description; - std::cerr << to_utf8(tmp) << std::endl; + cerr << to_utf8(tmp) << endl; } +#if defined (USE_MACOSX_PACKAGING) +namespace { + // Unexposed--extract an environment variable name from its NAME=VALUE + // representation + std::string varname(const char* line) + { + size_t nameLen = strcspn(line, "="); + if (nameLen == strlen(line)) { + return std::string(); + } else { + return std::string(line, nameLen); + } + } +} -void LyX::initGuiFont() +void cleanDuplicateEnvVars() { - if (lyxrc.roman_font_name.empty()) - lyxrc.roman_font_name = pimpl_->application_->romanFontName(); + std::set seen; + std::set dupes; - if (lyxrc.sans_font_name.empty()) - lyxrc.sans_font_name = pimpl_->application_->sansFontName(); + // Create a list of the environment variables that appear more than once + for (char **read = *_NSGetEnviron(); *read; read++) { + std::string name = varname(*read); + if (name.size() == 0) { + continue; + } + if (seen.find(name) != seen.end()) { + dupes.insert(name); + } else { + seen.insert(name); + } + } - if (lyxrc.typewriter_font_name.empty()) - lyxrc.typewriter_font_name - = pimpl_->application_->typewriterFontName(); + // Loop over the list of duplicated variables + std::set::iterator dupe = dupes.begin(); + std::set::iterator const dend = dupes.end(); + for (; dupe != dend; ++dupe) { + const char *name = (*dupe).c_str(); + char *val = getenv(name); + if (val != NULL) { + LYXERR(Debug::INIT, "Duplicate environment variable: " << name); + // unsetenv removes *all* instances of the variable from the environment + unsetenv(name); + + // replace with the value from getenv (in practice appears to be the + // first value in the list) + setenv(name, val, 0); + } + } } - +#endif bool LyX::init() { @@ -886,14 +790,40 @@ bool LyX::init() signal(SIGTERM, error_handler); // SIGPIPE can be safely ignored. - lyxrc.tempdir_path = package().temp_dir().absFilename(); - lyxrc.document_path = package().document_dir().absFilename(); +#if defined (USE_MACOSX_PACKAGING) + cleanDuplicateEnvVars(); +#endif + + lyxrc.tempdir_path = package().temp_dir().absFileName(); + lyxrc.document_path = package().document_dir().absFileName(); + if (lyxrc.example_path.empty()) { + lyxrc.example_path = addPath(package().system_support().absFileName(), + "examples"); + } if (lyxrc.template_path.empty()) { - lyxrc.template_path = addPath(package().system_support().absFilename(), + lyxrc.template_path = addPath(package().system_support().absFileName(), "templates"); } + // init LyXDir environment variable + string const lyx_dir = package().lyx_dir().absFileName(); + LYXERR(Debug::INIT, "Setting LyXDir... to \"" << lyx_dir << "\""); + if (!setEnv("LyXDir", lyx_dir)) + LYXERR(Debug::INIT, "\t... failed!"); + + if (package().explicit_user_support() && getEnv(LYX_USERDIR_VER).empty()) { + // -userdir was given on the command line. + // Make it available to child processes, otherwise tex2lyx + // would not find all layout files, and other converters might + // use it as well. + string const user_dir = package().user_support().absFileName(); + LYXERR(Debug::INIT, "Setting " LYX_USERDIR_VER "... to \"" + << user_dir << '"'); + if (!setEnv(LYX_USERDIR_VER, user_dir)) + LYXERR(Debug::INIT, "\t... failed!"); + } + // // Read configuration files // @@ -902,26 +832,41 @@ bool LyX::init() if (!readRcFile("lyxrc.dist")) return false; - // Set the language defined by the distributor. - //setGuiLanguage(lyxrc.gui_language); - // 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().absFilename()); + prependEnvPath("PATH", package().binary_dir().absFileName()); #endif if (!lyxrc.path_prefix.empty()) - prependEnvPath("PATH", lyxrc.path_prefix); + prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix)); // Check that user LyX directory is ok. - if (queryUserLyXDir(package().explicit_user_support())) - reconfigureUserLyXDir(); + { + string const lock_file = package().getConfigureLockName(); + int fd = fileLock(lock_file.c_str()); + + if (queryUserLyXDir(package().explicit_user_support())) { + package().reconfigureUserLyXDir(""); + } + fileUnlock(fd, lock_file.c_str()); + } - // no need for a splash when there is no GUI if (!use_gui) { + // No need for a splash when there is no GUI first_start = false; + // Default is to overwrite the main file during export, unless + // the -f switch was specified or LYX_FORCE_OVERWRITE was set + if (force_overwrite == UNSPECIFIED) { + string const what = getEnv("LYX_FORCE_OVERWRITE"); + if (what == "all") + force_overwrite = ALL_FILES; + else if (what == "none") + force_overwrite = NO_FILES; + else + force_overwrite = MAIN_FILE; + } } // This one is generated in user_support directory by lib/configure.py. @@ -941,56 +886,55 @@ bool LyX::init() system_lcolor = lcolor; // This one is edited through the preferences dialog. - if (!readRcFile("preferences")) + if (!readRcFile("preferences", true)) return false; + // The language may have been set to someting useful through prefs + setLocale(); + if (!readEncodingsFile("encodings", "unicodesymbols")) return false; if (!readLanguagesFile("languages")) return false; + LYXERR(Debug::INIT, "Reading layouts..."); // Load the layouts - LYXERR(Debug::INIT) << "Reading layouts..." << endl; - if (!LyXSetStyle()) - return false; + LayoutFileList::get().read(); //...and the modules - moduleList.load(); + theModuleList.read(); // read keymap and ui files in batch mode as well // because InsetInfo needs to know these to produce // the correct output - // Set the language defined by the user. - //setGuiLanguage(lyxrc.gui_language); + // Set up command definitions + pimpl_->toplevel_cmddef_.read(lyxrc.def_file); + // FIXME // Set up bindings - pimpl_->toplevel_keymap_.reset(new 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)) - return false; + pimpl_->toplevel_keymap_.read("site"); + pimpl_->toplevel_keymap_.read(lyxrc.bind_file); + // load user bind file user.bind + pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK); if (lyxerr.debugging(Debug::LYXRC)) lyxrc.print(); os::windows_style_tex_paths(lyxrc.windows_style_tex_paths); + // Prepend path prefix a second time to take the user preferences into a account if (!lyxrc.path_prefix.empty()) - prependEnvPath("PATH", lyxrc.path_prefix); + prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix)); FileName const document_path(lyxrc.document_path); if (document_path.exists() && document_path.isDirectory()) package().document_dir() = document_path; - package().temp_dir() = createLyXTmpDir(FileName(lyxrc.tempdir_path)); + package().set_temp_dir(createLyXTmpDir(FileName(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."), + "\"%1$s\"\n" + "Make sure that this 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 @@ -1000,11 +944,10 @@ bool LyX::init() return false; } - LYXERR(Debug::INIT) << "LyX tmp dir: `" - << package().temp_dir().absFilename() - << '\'' << endl; + LYXERR(Debug::INIT, "LyX tmp dir: `" + << package().temp_dir().absFileName() << '\''); - LYXERR(Debug::INIT) << "Reading session information '.lyx/session'..." << endl; + LYXERR(Debug::INIT, "Reading session information '.lyx/session'..."); pimpl_->session_.reset(new Session(lyxrc.num_lastfiles)); // This must happen after package initialization and after lyxrc is @@ -1015,122 +958,23 @@ bool LyX::init() } -void LyX::defaultKeyBindings(KeyMap * kbmap) -{ - 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("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_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("Return", FuncRequest(LFUN_BREAK_PARAGRAPH)); - //kbmap->bind("~C-~S-~M-nobreakspace", FuncRequest(LFUN_PROTECTEDSPACE)); - - 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", 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 +void 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 - pimpl_->buffer_list_.emergencyWriteAll(); + singleton_->pimpl_->buffer_list_.emergencyWriteAll(); if (use_gui) { - if (pimpl_->lyx_server_) - pimpl_->lyx_server_->emergencyCleanup(); - pimpl_->lyx_server_.reset(); - pimpl_->lyx_socket_.reset(); + if (singleton_->pimpl_->lyx_server_) + singleton_->pimpl_->lyx_server_->emergencyCleanup(); + singleton_->pimpl_->lyx_server_.reset(); + singleton_->pimpl_->lyx_socket_.reset(); } } -void LyX::deadKeyBindings(KeyMap * kbmap) -{ - // bindKeyings for transparent handling of deadkeys - // The keysyms are gotten from XFree86 X11R6 - 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_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", 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)); -} - - -// return true if file does not exist or is older than configure.py. -static bool needsUpdate(string const & file) -{ - // We cannot initialize configure_script directly because the package - // is not initialized yet when static objects are constructed. - static FileName configure_script; - static bool firstrun = true; - if (firstrun) { - configure_script = - FileName(addName(package().system_support().absFilename(), - "configure.py")); - firstrun = false; - } - - FileName absfile = - FileName(addName(package().user_support().absFilename(), file)); - return !absfile.exists() - || configure_script.lastModified() > absfile.lastModified(); -} - - bool LyX::queryUserLyXDir(bool explicit_userdir) { // Does user directory exist? @@ -1138,10 +982,10 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) if (sup.exists() && sup.isDirectory()) { first_start = false; - return needsUpdate("lyxrc.defaults") - || needsUpdate("lyxmodules.lst") - || needsUpdate("textclass.lst") - || needsUpdate("packages.lst"); + return configFileNeedsUpdate("lyxrc.defaults") + || configFileNeedsUpdate("lyxmodules.lst") + || configFileNeedsUpdate("textclass.lst") + || configFileNeedsUpdate("packages.lst"); } first_start = !explicit_userdir; @@ -1154,7 +998,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) bformat(_("You have specified a non-existent user " "LyX directory, %1$s.\n" "It is needed to keep your own configuration."), - from_utf8(package().user_support().absFilename())), + from_utf8(package().user_support().absFileName())), 1, 0, _("&Create directory"), _("&Exit LyX"))) { @@ -1163,9 +1007,9 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) } lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"), - from_utf8(sup.absFilename()))) << endl; + from_utf8(sup.absFileName()))) << endl; - if (!createDirectory(sup, 0755)) { + if (!sup.createDirectory(0755)) { // Failed, so let's exit. lyxerr << to_utf8(_("Failed to create directory. Exiting.")) << endl; @@ -1176,126 +1020,28 @@ bool LyX::queryUserLyXDir(bool explicit_userdir) } -bool LyX::readRcFile(string const & name) +bool LyX::readRcFile(string const & name, bool check_format) { - LYXERR(Debug::INIT) << "About to read " << name << "... "; + LYXERR(Debug::INIT, "About to read " << name << "... "); FileName const lyxrc_path = libFileSearch(string(), name); - if (!lyxrc_path.empty()) { - - LYXERR(Debug::INIT) << "Found in " << lyxrc_path << endl; - - if (lyxrc.read(lyxrc_path) < 0) { - showFileError(name); - return false; - } - } else - LYXERR(Debug::INIT) << "Not found." << lyxrc_path << endl; - return true; - -} - - -// Read the ui file `name' -bool LyX::readUIFile(string const & name, bool include) -{ - enum Uitags { - ui_menuset = 1, - ui_toolbars, - ui_toolbarset, - ui_include, - ui_last - }; - - struct keyword_item uitags[ui_last - 1] = { - { "include", ui_include }, - { "menuset", ui_menuset }, - { "toolbars", ui_toolbars }, - { "toolbarset", ui_toolbarset } - }; - - // Ensure that a file is read only once (prevents include loops) - static std::list uifiles; - std::list::const_iterator it = uifiles.begin(); - std::list::const_iterator end = uifiles.end(); - it = std::find(it, end, name); - if (it != end) { - LYXERR(Debug::INIT) << "UI file '" << name - << "' has been read already. " - << "Is this an include loop?" - << endl; - return false; + if (lyxrc_path.empty()) { + LYXERR(Debug::INIT, "Not found." << lyxrc_path); + // FIXME + // This was the previous logic, but can it be right?? + return true; } - - LYXERR(Debug::INIT) << "About to read " << name << "..." << endl; - - - FileName ui_path; - if (include) { - ui_path = libFileSearch("ui", name, "inc"); - if (ui_path.empty()) - ui_path = libFileSearch("ui", - changeExtension(name, "inc")); - } - else - ui_path = libFileSearch("ui", name, "ui"); - - if (ui_path.empty()) { - LYXERR(Debug::INIT) << "Could not find " << name << endl; + LYXERR(Debug::INIT, "Found in " << lyxrc_path); + bool const success = lyxrc.read(lyxrc_path, check_format); + if (!success) showFileError(name); - return false; - } - - uifiles.push_back(name); - - LYXERR(Debug::INIT) << "Found " << name - << " in " << ui_path << endl; - Lexer lex(uitags, ui_last - 1); - lex.setFile(ui_path); - 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()) { - switch (lex.lex()) { - case ui_include: { - lex.next(true); - string const file = lex.getString(); - if (!readUIFile(file, true)) - return false; - break; - } - case ui_menuset: - menubackend.read(lex); - break; - - case ui_toolbarset: - toolbarbackend.readToolbars(lex); - break; - - case ui_toolbars: - toolbarbackend.readToolbarSettings(lex); - break; - - default: - if (!rtrim(lex.getString()).empty()) - lex.printError("LyX::ReadUIFile: " - "Unknown menu tag: `$$Token'"); - break; - } - } - return true; + return success; } - // Read the languages file `name' bool LyX::readLanguagesFile(string const & name) { - LYXERR(Debug::INIT) << "About to read " << name << "..." << endl; + LYXERR(Debug::INIT, "About to read " << name << "..."); FileName const lang_path = libFileSearch(string(), name); if (lang_path.empty()) { @@ -1311,8 +1057,8 @@ bool LyX::readLanguagesFile(string const & name) bool LyX::readEncodingsFile(string const & enc_name, string const & symbols_name) { - LYXERR(Debug::INIT) << "About to read " << enc_name << " and " - << symbols_name << "..." << endl; + LYXERR(Debug::INIT, "About to read " << enc_name << " and " + << symbols_name << "..."); FileName const symbols_path = libFileSearch(string(), symbols_name); if (symbols_path.empty()) { @@ -1332,29 +1078,27 @@ bool LyX::readEncodingsFile(string const & enc_name, namespace { -string batch; - /// return the the number of arguments consumed -typedef boost::function cmd_helper; +typedef boost::function cmd_helper; -int parse_dbg(string const & arg, string const &) +int parse_dbg(string const & arg, string const &, string &) { if (arg.empty()) { - lyxerr << to_utf8(_("List of supported debug flags:")) << endl; - Debug::showTags(lyxerr); + cout << to_utf8(_("List of supported debug flags:")) << endl; + Debug::showTags(cout); exit(0); } lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl; - lyxerr.level(Debug::value(arg)); + lyxerr.setLevel(Debug::value(arg)); Debug::showLevel(lyxerr, lyxerr.level()); return 1; } -int parse_help(string const &, string const &) +int parse_help(string const &, string const &, string &) { - lyxerr << + cout << to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" "\t-help summarize LyX usage\n" @@ -1367,28 +1111,49 @@ int parse_help(string const &, string const &) "\t-x [--execute] command\n" " where command is a lyx command.\n" "\t-e [--export] fmt\n" - " where fmt is the export format of choice.\n" + " where fmt is the export format of choice. Look in\n" + " Tools->Preferences->File Handling->File Formats->Short Name\n" + " to see which parameter (which differs from the format name\n" + " in the File->Export menu) should be passed.\n" + " Note that the order of -e and -x switches matters.\n" + "\t-E [--export-to] fmt filename\n" + " where fmt is the export format of choice (see --export),\n" + " and filename is the destination filename.\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" + "\t-f [--force-overwrite] what\n" + " where what is either `all', `main' or `none',\n" + " specifying whether all files, main file only, or no files,\n" + " respectively, are to be overwritten during a batch export.\n" + " Anything else is equivalent to `all', but is not consumed.\n" + "\t-n [--no-remote]\n" + " open documents in a new instance\n" + "\t-r [--remote]\n" + " open documents in an already running instance\n" + " (a working lyxpipe is needed)\n" + "\t-batch execute commands without launching GUI and exit.\n" + "\t-version summarize version and build info\n" "Check the LyX man page for more details.")) << endl; exit(0); return 0; } -int parse_version(string const &, string const &) + +int parse_version(string const &, string const &, string &) { - lyxerr << "LyX " << lyx_version + cout << "LyX " << lyx_version << " (" << lyx_release_date << ")" << endl; - lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; - - lyxerr << lyx_version_info << endl; + if (string(lyx_git_commit_hash) != "none") + cout << to_utf8(_(" Git commit hash ")) + << string(lyx_git_commit_hash).substr(0,8) << endl; + cout << lyx_version_info << endl; exit(0); return 0; } -int parse_sysdir(string const & arg, string const &) + +int parse_sysdir(string const & arg, string const &, string &) { if (arg.empty()) { Alert::error(_("No system directory"), @@ -1399,7 +1164,8 @@ int parse_sysdir(string const & arg, string const &) return 1; } -int parse_userdir(string const & arg, string const &) + +int parse_userdir(string const & arg, string const &, string &) { if (arg.empty()) { Alert::error(_("No user directory"), @@ -1410,7 +1176,8 @@ int parse_userdir(string const & arg, string const &) return 1; } -int parse_execute(string const & arg, string const &) + +int parse_execute(string const & arg, string const &, string & batch) { if (arg.empty()) { Alert::error(_("Incomplete command"), @@ -1421,7 +1188,26 @@ int parse_execute(string const & arg, string const &) return 1; } -int parse_export(string const & type, string const &) + +int parse_export_to(string const & type, string const & output_file, string & batch) +{ + if (type.empty()) { + lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " + "--export-to switch")) << endl; + exit(1); + } + if (output_file.empty()) { + lyxerr << to_utf8(_("Missing destination filename after " + "--export-to switch")) << endl; + exit(1); + } + batch = "buffer-export " + type + " " + output_file; + use_gui = false; + return 2; +} + + +int parse_export(string const & type, string const &, string & batch) { if (type.empty()) { lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " @@ -1433,7 +1219,8 @@ int parse_export(string const & type, string const &) return 1; } -int parse_import(string const & type, string const & file) + +int parse_import(string const & type, string const & file, string & batch) { if (type.empty()) { lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after " @@ -1444,21 +1231,55 @@ int parse_import(string const & type, string const & file) lyxerr << to_utf8(_("Missing filename for --import")) << endl; exit(1); } - batch = "buffer-import " + type + ' ' + file; return 2; } -int parse_geometry(string const & arg1, string const &) + +int parse_geometry(string const & arg1, string const &, string &) { geometryArg = arg1; -#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING)) - // remove also the arg - return 1; -#else - // don't remove "-geometry" + // don't remove "-geometry", it will be pruned out later in the + // frontend if need be. return -1; -#endif +} + + +int parse_batch(string const &, string const &, string &) +{ + use_gui = false; + return 0; +} + + +int parse_noremote(string const &, string const &, string &) +{ + run_mode = NEW_INSTANCE; + return 0; +} + + +int parse_remote(string const &, string const &, string &) +{ + run_mode = USE_REMOTE; + return 0; +} + + +int parse_force(string const & arg, string const &, string &) +{ + if (arg == "all") { + force_overwrite = ALL_FILES; + return 1; + } else if (arg == "main") { + force_overwrite = MAIN_FILE; + return 1; + } else if (arg == "none") { + force_overwrite = NO_FILES; + return 1; + } + force_overwrite = ALL_FILES; + return 0; } @@ -1467,7 +1288,7 @@ int parse_geometry(string const & arg1, string const &) void LyX::easyParse(int & argc, char * argv[]) { - std::map cmdmap; + map cmdmap; cmdmap["-dbg"] = parse_dbg; cmdmap["-help"] = parse_help; @@ -1480,128 +1301,241 @@ void LyX::easyParse(int & argc, char * argv[]) cmdmap["--execute"] = parse_execute; cmdmap["-e"] = parse_export; cmdmap["--export"] = parse_export; + cmdmap["-E"] = parse_export_to; + cmdmap["--export-to"] = parse_export_to; cmdmap["-i"] = parse_import; cmdmap["--import"] = parse_import; cmdmap["-geometry"] = parse_geometry; + cmdmap["-batch"] = parse_batch; + cmdmap["-f"] = parse_force; + cmdmap["--force-overwrite"] = parse_force; + cmdmap["-n"] = parse_noremote; + cmdmap["--no-remote"] = parse_noremote; + cmdmap["-r"] = parse_remote; + cmdmap["--remote"] = parse_remote; for (int i = 1; i < argc; ++i) { - std::map::const_iterator it + map::const_iterator it = cmdmap.find(argv[i]); // don't complain if not found - may be parsed later if (it == cmdmap.end()) continue; - string const arg((i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string()); - string const arg2((i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string()); + string const arg = + (i + 1 < argc) ? os::utf8_argv(i + 1) : string(); + string const arg2 = + (i + 2 < argc) ? os::utf8_argv(i + 2) : string(); - int const remove = 1 + it->second(arg, arg2); + string batch; + int const remove = 1 + it->second(arg, arg2, batch); + if (!batch.empty()) + pimpl_->batch_commands.push_back(batch); // Now, remove used arguments by shifting // the following ones remove places down. if (remove > 0) { + os::remove_internal_args(i, remove); argc -= remove; for (int j = i; j < argc; ++j) argv[j] = argv[j + remove]; --i; } } - - batch_command = batch; } FuncStatus getStatus(FuncRequest const & action) { - return LyX::ref().lyxFunc().getStatus(action); + LAPPERR(theApp()); + return theApp()->getStatus(action); } void dispatch(FuncRequest const & action) { - LyX::ref().lyxFunc().dispatch(action); + LAPPERR(theApp()); + return theApp()->dispatch(action); } -BufferList & theBufferList() +void dispatch(FuncRequest const & action, DispatchResult & dr) +{ + LAPPERR(theApp()); + return theApp()->dispatch(action, dr); +} + + +vector & theFilesToLoad() { - return LyX::ref().bufferList(); + LAPPERR(singleton_); + return singleton_->pimpl_->files_to_load_; } -LyXFunc & theLyXFunc() +BufferList & theBufferList() { - return LyX::ref().lyxFunc(); + LAPPERR(singleton_); + return singleton_->pimpl_->buffer_list_; } Server & theServer() { // FIXME: this should not be use_gui dependent - BOOST_ASSERT(use_gui); - return LyX::ref().server(); + LWARNIF(use_gui); + LAPPERR(singleton_); + return *singleton_->pimpl_->lyx_server_.get(); } ServerSocket & theServerSocket() { // FIXME: this should not be use_gui dependent - BOOST_ASSERT(use_gui); - return LyX::ref().socket(); + LWARNIF(use_gui); + LAPPERR(singleton_); + return *singleton_->pimpl_->lyx_socket_.get(); } KeyMap & theTopLevelKeymap() { - return LyX::ref().topLevelKeymap(); + LAPPERR(singleton_); + return singleton_->pimpl_->toplevel_keymap_; } Converters & theConverters() { - return LyX::ref().converters(); + LAPPERR(singleton_); + return singleton_->pimpl_->converters_; } Converters & theSystemConverters() { - return LyX::ref().systemConverters(); + LAPPERR(singleton_); + return singleton_->pimpl_->system_converters_; } Movers & theMovers() { - return LyX::ref().pimpl_->movers_; + LAPPERR(singleton_); + return singleton_->pimpl_->movers_; } -Mover const & getMover(std::string const & fmt) +Mover const & getMover(string const & fmt) { - return LyX::ref().pimpl_->movers_(fmt); + LAPPERR(singleton_); + return singleton_->pimpl_->movers_(fmt); } -void setMover(std::string const & fmt, std::string const & command) +void setMover(string const & fmt, string const & command) { - LyX::ref().pimpl_->movers_.set(fmt, command); + LAPPERR(singleton_); + singleton_->pimpl_->movers_.set(fmt, command); } Movers & theSystemMovers() { - return LyX::ref().pimpl_->system_movers_; + LAPPERR(singleton_); + return singleton_->pimpl_->system_movers_; +} + + +Messages const & getMessages(string const & language) +{ + LAPPERR(singleton_); + return singleton_->messages(language); +} + + +Messages const & getGuiMessages() +{ + LAPPERR(singleton_); + return singleton_->messages(Messages::guiLanguage()); } -Messages & getMessages(std::string const & language) +Session & theSession() { - return LyX::ref().getMessages(language); + LAPPERR(singleton_); + return *singleton_->pimpl_->session_.get(); } -Messages & getGuiMessages() +LaTeXFonts & theLaTeXFonts() { - return LyX::ref().getGuiMessages(); + LAPPERR(singleton_); + if (!singleton_->pimpl_->latexfonts_) + singleton_->pimpl_->latexfonts_ = new LaTeXFonts; + return *singleton_->pimpl_->latexfonts_; +} + + +CmdDef & theTopLevelCmdDef() +{ + LAPPERR(singleton_); + return singleton_->pimpl_->toplevel_cmddef_; +} + + +SpellChecker * theSpellChecker() +{ + if (!singleton_->pimpl_->spell_checker_) + setSpellChecker(); + return singleton_->pimpl_->spell_checker_; +} + + +void setSpellChecker() +{ + SpellChecker::ChangeNumber speller_change_number =singleton_->pimpl_->spell_checker_ ? + singleton_->pimpl_->spell_checker_->changeNumber() : 0; + + if (lyxrc.spellchecker == "native") { +#if defined(USE_MACOSX_PACKAGING) + if (!singleton_->pimpl_->apple_spell_checker_) + singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker; + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "aspell") { +#if defined(USE_ASPELL) + if (!singleton_->pimpl_->aspell_checker_) + singleton_->pimpl_->aspell_checker_ = new AspellChecker; + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "enchant") { +#if defined(USE_ENCHANT) + if (!singleton_->pimpl_->enchant_checker_) + singleton_->pimpl_->enchant_checker_ = new EnchantChecker; + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else if (lyxrc.spellchecker == "hunspell") { +#if defined(USE_HUNSPELL) + if (!singleton_->pimpl_->hunspell_checker_) + singleton_->pimpl_->hunspell_checker_ = new HunspellChecker; + singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_; +#else + singleton_->pimpl_->spell_checker_ = 0; +#endif + } else { + singleton_->pimpl_->spell_checker_ = 0; + } + if (singleton_->pimpl_->spell_checker_) { + singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number); + singleton_->pimpl_->spell_checker_->advanceChangeNumber(); + } } } // namespace lyx