X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=8c9fdbcb02b8433ded8909e5329bb3139bf11997;hb=2e72a0af48023956ae6ce3285b47168c2fed5099;hp=5fb2d59edace44e8f12f88d5e977789134583918;hpb=a0eea97e44340b19d1e386edb967e3525ff8c025;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 5fb2d59eda..8c9fdbcb02 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -17,6 +17,7 @@ #include "LyX.h" +#include "AppleSpellChecker.h" #include "AspellChecker.h" #include "Buffer.h" #include "BufferList.h" @@ -33,6 +34,7 @@ #include "HunspellChecker.h" #include "KeyMap.h" #include "Language.h" +#include "LaTeXFonts.h" #include "LayoutFile.h" #include "Lexer.h" #include "LyX.h" @@ -43,12 +45,11 @@ #include "Server.h" #include "ServerSocket.h" #include "Session.h" +#include "WordList.h" #include "frontends/alert.h" #include "frontends/Application.h" -#include "graphics/Previews.h" - #include "support/lassert.h" #include "support/debug.h" #include "support/environment.h" @@ -89,10 +90,19 @@ namespace os = support::os; bool use_gui = true; +// 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. +// 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 = NO_FILES; +OverwriteFiles force_overwrite = UNSPECIFIED; namespace { @@ -128,18 +138,15 @@ void reconfigureUserLyXDir() } // namespace anon /// The main application class private implementation. -struct LyX::Impl -{ - Impl() : spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) - { - // Set the default User Interface language as soon as possible. - // The language used will be derived from the environment - // variables. - messages_["GUI"] = Messages(); - } +struct LyX::Impl { + Impl() + : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) + {} ~Impl() { + delete latexfonts_; + delete apple_spell_checker_; delete aspell_checker_; delete enchant_checker_; delete hunspell_checker_; @@ -181,12 +188,15 @@ struct LyX::Impl bool first_start; /// the parsed command line batch command if any vector batch_commands; - + /// - graphics::Previews preview_; + LaTeXFonts * latexfonts_; + /// SpellChecker * spell_checker_; /// + SpellChecker * apple_spell_checker_; + /// SpellChecker * aspell_checker_; /// SpellChecker * enchant_checker_; @@ -194,6 +204,7 @@ struct LyX::Impl SpellChecker * hunspell_checker_; }; + /// frontend::Application * theApp() { @@ -208,6 +219,7 @@ LyX::~LyX() { delete pimpl_; singleton_ = 0; + WordList::cleanupWordLists(); } @@ -254,35 +266,23 @@ Messages & LyX::messages(string const & language) } -void setRcGuiLanguage() +int LyX::exec(int & argc, char * argv[]) { - LASSERT(singleton_, /**/); - if (lyxrc.gui_language == "auto") - return; - Language const * language = languages.getLanguage(lyxrc.gui_language); - if (language) { - LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code()); - if (!setEnv("LANGUAGE", language->code())) - LYXERR(Debug::LOCALE, "\t... failed!"); + // 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 + locale_init(); + } catch (ExceptionMessage const & message) { + LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_); } - LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US"); - if (!setEnv("LC_ALL", "en_US")) - LYXERR(Debug::LOCALE, "\t... failed!"); - Messages::init(); - singleton_->pimpl_->messages_["GUI"] = Messages(); -} - -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 { - init_package(os::utf8_argv(0), - cl_system_support, cl_user_support, - top_build_dir_is_one_level_up); + 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_); @@ -322,7 +322,7 @@ int LyX::exec(int & argc, char * argv[]) vector::const_iterator bcit = pimpl_->batch_commands.begin(); vector::const_iterator bcend = pimpl_->batch_commands.end(); DispatchResult dr; - for (; bcit != bcend; bcit++) { + for (; bcit != bcend; ++bcit) { LYXERR(Debug::ACTION, "Buffer::dispatch: cmd: " << *bcit); buf->dispatch(*bcit, dr); final_success |= !dr.error(); @@ -349,13 +349,20 @@ int LyX::exec(int & argc, char * argv[]) prepareExit(); 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 * 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. @@ -364,7 +371,15 @@ int LyX::exec(int & argc, char * argv[]) 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(); @@ -415,8 +430,7 @@ void LyX::prepareExit() // Kill the application object before exiting. This avoids crashes // when exiting on Linux. - if (pimpl_->application_) - pimpl_->application_.reset(); + pimpl_->application_.reset(); } @@ -451,7 +465,7 @@ int LyX::init(int & argc, char * argv[]) return EXIT_FAILURE; // Remaining arguments are assumed to be files to load. - for (int argi = argc - 1; argi >= 1; --argi) + for (int argi = 1; argi < argc; ++argi) pimpl_->files_to_load_.push_back(os::utf8_argv(argi)); if (first_start) { @@ -479,8 +493,8 @@ bool LyX::loadFiles() if (fname.empty()) continue; - Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName(), false); - if (buf->loadLyXFile(fname)) { + 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(), @@ -514,10 +528,10 @@ void LyX::execCommands() _("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 using only the defaults, or continue."), + "try to reconfigure without checking your LaTeX installation, or continue."), 0, 2, _("&Reconfigure"), - _("&Use Defaults"), + _("&Without LaTeX"), _("&Continue"))) { case 0: @@ -533,7 +547,7 @@ void LyX::execCommands() break; } } - + // create the first main window lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); @@ -555,7 +569,7 @@ void LyX::execCommands() vector::const_iterator bcit = pimpl_->batch_commands.begin(); vector::const_iterator bcend = pimpl_->batch_commands.end(); - for (; bcit != bcend; bcit++) { + for (; bcit != bcend; ++bcit) { LYXERR(Debug::INIT, "About to handle -x '" << *bcit << '\''); lyx::dispatch(lyxaction.lookupFunc(*bcit)); } @@ -633,7 +647,7 @@ static void error_handler(int err_sig) "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."); + "if necessary. Thanks!\nBye."); break; case SIGINT: case SIGTERM: @@ -661,7 +675,7 @@ static void error_handler(int err_sig) (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) { #else if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) { -#endif +#endif #ifdef _MSC_VER // with abort() it crashes again. exit(err_sig); @@ -707,6 +721,12 @@ bool LyX::init() "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!"); + // // Read configuration files // @@ -715,9 +735,6 @@ bool LyX::init() if (!readRcFile("lyxrc.dist")) return false; - // Set the language defined by the distributor. - setRcGuiLanguage(); - // Set the PATH correctly. #if !defined (USE_POSIX_PACKAGING) // Add the directory containing the LyX executable to the path @@ -726,15 +743,26 @@ bool LyX::init() 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(); - // 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. @@ -747,9 +775,6 @@ bool LyX::init() // Read lyxrc.dist again to be able to override viewer auto-detection. readRcFile("lyxrc.dist"); - // Set again the language defined by the distributor. - setRcGuiLanguage(); - system_lyxrc = lyxrc; system_formats = formats; pimpl_->system_converters_ = pimpl_->converters_; @@ -757,7 +782,7 @@ bool LyX::init() system_lcolor = lcolor; // This one is edited through the preferences dialog. - if (!readRcFile("preferences")) + if (!readRcFile("preferences", true)) return false; if (!readEncodingsFile("encodings", "unicodesymbols")) @@ -765,9 +790,6 @@ bool LyX::init() if (!readLanguagesFile("languages")) return false; - // Set the language defined by the user. - setRcGuiLanguage(); - LYXERR(Debug::INIT, "Reading layouts..."); // Load the layouts LayoutFileList::get().read(); @@ -781,6 +803,7 @@ bool LyX::init() // Set up command definitions pimpl_->toplevel_cmddef_.read(lyxrc.def_file); + // FIXME // Set up bindings pimpl_->toplevel_keymap_.read("site"); pimpl_->toplevel_keymap_.read(lyxrc.bind_file); @@ -792,7 +815,7 @@ bool LyX::init() os::windows_style_tex_paths(lyxrc.windows_style_tex_paths); 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()) @@ -822,7 +845,7 @@ bool LyX::init() // This must happen after package initialization and after lyxrc is // read, therefore it can't be done by a static object. ConverterCache::init(); - + return true; } @@ -848,7 +871,7 @@ void emergencyCleanup() static bool needsUpdate(string const & file) { // We cannot initialize configure_script directly because the package - // is not initialized yet when static objects are constructed. + // is not initialized yet when static objects are constructed. static FileName configure_script; static bool firstrun = true; if (firstrun) { @@ -858,7 +881,7 @@ static bool needsUpdate(string const & file) firstrun = false; } - FileName absfile = + FileName absfile = FileName(addName(package().user_support().absFileName(), file)); return !absfile.exists() || configure_script.lastModified() > absfile.lastModified(); @@ -910,21 +933,22 @@ 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 << "... "); FileName const lyxrc_path = libFileSearch(string(), name); - if (!lyxrc_path.empty()) { - LYXERR(Debug::INIT, "Found in " << lyxrc_path); - if (lyxrc.read(lyxrc_path) < 0) { - showFileError(name); - return false; - } - } else { + if (lyxrc_path.empty()) { LYXERR(Debug::INIT, "Not found." << lyxrc_path); + // FIXME + // This was the previous logic, but can it be right?? + return true; } - return true; + LYXERR(Debug::INIT, "Found in " << lyxrc_path); + bool const success = lyxrc.read(lyxrc_path, check_format); + if (!success) + showFileError(name); + return success; } // Read the languages file `name' @@ -973,8 +997,8 @@ typedef boost::function cmd_helpe 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; @@ -987,7 +1011,7 @@ int parse_dbg(string const & arg, string const &, string &) 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" @@ -1000,20 +1024,28 @@ int parse_help(string const &, string const &, string &) "\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" - " Look on Tools->Preferences->File formats->Format\n" + " where fmt is the export format of choice. Look in\n" + " Tools->Preferences->File Handling->File Formats->Short Name\n" " to get an idea which parameters 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-f [--force-overwrite] what\n" - " where what is either `all' or `main'.\n" - " Using `all', all files are overwritten during\n" - " a batch export, otherwise only the main file will be.\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-batch execute commands without launching GUI and exit.\n" - "\t-version summarize version and build info\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; @@ -1022,11 +1054,11 @@ int parse_help(string const &, string const &, string &) 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; + cout << "Built on " << __DATE__ << ", " << __TIME__ << endl; - lyxerr << lyx_version_info << endl; + cout << lyx_version_info << endl; exit(0); return 0; } @@ -1068,6 +1100,24 @@ int parse_execute(string const & arg, string const &, string & batch) } +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()) { @@ -1107,14 +1157,28 @@ int parse_geometry(string const & arg1, string const &, string &) } -int parse_batch(string const &, string const &, string &) +int parse_batch(string const &, string const &, string &) { use_gui = false; return 0; } -int parse_force(string const & arg, string const &, string &) +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; @@ -1122,6 +1186,9 @@ int parse_force(string const & arg, string const &, string &) } 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; @@ -1144,14 +1211,20 @@ void LyX::easyParse(int & argc, char * argv[]) cmdmap["-userdir"] = parse_userdir; cmdmap["-x"] = parse_execute; cmdmap["--execute"] = parse_execute; - cmdmap["-e"] = parse_export; + 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) { map::const_iterator it @@ -1205,6 +1278,13 @@ void dispatch(FuncRequest const & action, DispatchResult & dr) } +vector & theFilesToLoad() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->files_to_load_; +} + + BufferList & theBufferList() { LASSERT(singleton_, /**/); @@ -1289,21 +1369,35 @@ Messages const & getMessages(string const & language) Messages const & getGuiMessages() { LASSERT(singleton_, /**/); - return singleton_->pimpl_->messages_["GUI"]; + // A cache to translate full language name to language code + static string last_language = "auto"; + static string code; + if (lyxrc.gui_language != last_language) { + if (lyxrc.gui_language == "auto") + code.clear(); + else { + Language const * l = languages.getLanguage(lyxrc.gui_language); + code = l ? l->code() : string(); + } + last_language = lyxrc.gui_language; + } + return singleton_->messages(code); } -graphics::Previews & thePreviews() +Session & theSession() { LASSERT(singleton_, /**/); - return singleton_->pimpl_->preview_; + return *singleton_->pimpl_->session_.get(); } -Session & theSession() +LaTeXFonts & theLaTeXFonts() { LASSERT(singleton_, /**/); - return *singleton_->pimpl_->session_.get(); + if (!singleton_->pimpl_->latexfonts_) + singleton_->pimpl_->latexfonts_ = new LaTeXFonts; + return *singleton_->pimpl_->latexfonts_; } @@ -1324,31 +1418,48 @@ SpellChecker * theSpellChecker() 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 (lyxrc.spellchecker == "aspell") { if (!singleton_->pimpl_->aspell_checker_) - singleton_->pimpl_->aspell_checker_ = new AspellChecker(); + singleton_->pimpl_->aspell_checker_ = new AspellChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_; - return; - } +#else + singleton_->pimpl_->spell_checker_ = 0; #endif + } else if (lyxrc.spellchecker == "enchant") { #if defined(USE_ENCHANT) - if (lyxrc.spellchecker == "enchant") { if (!singleton_->pimpl_->enchant_checker_) - singleton_->pimpl_->enchant_checker_ = new EnchantChecker(); + singleton_->pimpl_->enchant_checker_ = new EnchantChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_; - return; - } +#else + singleton_->pimpl_->spell_checker_ = 0; #endif + } else if (lyxrc.spellchecker == "hunspell") { #if defined(USE_HUNSPELL) - if (lyxrc.spellchecker == "hunspell") { if (!singleton_->pimpl_->hunspell_checker_) - singleton_->pimpl_->hunspell_checker_ = new HunspellChecker(); + singleton_->pimpl_->hunspell_checker_ = new HunspellChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_; - return; - } +#else + singleton_->pimpl_->spell_checker_ = 0; #endif - singleton_->pimpl_->spell_checker_ = 0; + } 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