X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=8db6eefe78acb0344c1184691e86f35bcb7c8943;hb=ece9228f90e183c2ac57683df4937e73afd36759;hp=c24d87c92c4af7873b33911b3d6543382e6d5aed;hpb=c98745c081e3328a8b1d91ea8011d4158af8e16f;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index c24d87c92c..8db6eefe78 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" @@ -47,8 +48,6 @@ #include "frontends/alert.h" #include "frontends/Application.h" -#include "graphics/Previews.h" - #include "support/lassert.h" #include "support/debug.h" #include "support/environment.h" @@ -62,7 +61,7 @@ #include "support/Path.h" #include "support/Systemcall.h" -#include +#include "support/bind.h" #include #include @@ -88,6 +87,22 @@ 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, 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 { // Filled with the command line arguments "foo" of "-sysdir foo" or @@ -123,7 +138,7 @@ void reconfigureUserLyXDir() /// The main application class private implementation. struct LyX::Impl { - Impl() : spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) + Impl() : spell_checker_(0), apple_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 @@ -133,6 +148,7 @@ struct LyX::Impl ~Impl() { + delete apple_spell_checker_; delete aspell_checker_; delete enchant_checker_; delete hunspell_checker_; @@ -175,11 +191,11 @@ struct LyX::Impl /// the parsed command line batch command if any vector batch_commands; - /// - graphics::Previews preview_; /// SpellChecker * spell_checker_; /// + SpellChecker * apple_spell_checker_; + /// SpellChecker * aspell_checker_; /// SpellChecker * enchant_checker_; @@ -199,8 +215,8 @@ frontend::Application * theApp() LyX::~LyX() { - singleton_ = 0; delete pimpl_; + singleton_ = 0; } @@ -268,14 +284,21 @@ void setRcGuiLanguage() int LyX::exec(int & argc, char * argv[]) { + // 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_); + } + // 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_); @@ -342,22 +365,37 @@ 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. pimpl_->lyx_server_.reset(new Server(lyxrc.lyxpipes)); pimpl_->lyx_socket_.reset(new ServerSocket( - FileName(package().temp_dir().absFilename() + "/lyxsocket"))); + 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(); @@ -388,19 +426,19 @@ void LyX::prepareExit() // 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")) { + 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()); + << 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())); + from_utf8(package().temp_dir().absFileName())); Alert::warning(_("Unable to remove temporary directory"), msg); } } @@ -444,12 +482,12 @@ 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) { pimpl_->files_to_load_.push_back( - i18nLibFileSearch("examples", "splash.lyx").absFilename()); + i18nLibFileSearch("examples", "splash.lyx").absFileName()); } return EXIT_SUCCESS; @@ -472,12 +510,12 @@ 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(), false); + 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 { pimpl_->buffer_list_.release(buf); @@ -502,16 +540,16 @@ void LyX::execCommands() // aknowledged. // if reconfiguration is needed. - while (LayoutFileList::get().empty()) { + if (LayoutFileList::get().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."), + _("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"), - _("&Use Default"), - _("&Exit LyX"))) + _("&Without LaTeX"), + _("&Continue"))) { case 0: // regular reconfigure @@ -523,11 +561,10 @@ void LyX::execCommands() " --without-latex-config")); break; default: - lyx::dispatch(FuncRequest(LFUN_LYX_QUIT)); - return; + break; } } - + // create the first main window lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); @@ -627,7 +664,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: @@ -652,10 +689,10 @@ 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 + if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) { +#endif #ifdef _MSC_VER // with abort() it crashes again. exit(err_sig); @@ -689,18 +726,24 @@ 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(); + 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(), + 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!"); + // // Read configuration files // @@ -717,18 +760,29 @@ bool LyX::init() // 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(); - // 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. @@ -751,7 +805,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")) @@ -762,10 +816,9 @@ bool LyX::init() // Set the language defined by the user. setRcGuiLanguage(); - // Load the layouts LYXERR(Debug::INIT, "Reading layouts..."); - if (!LyXSetStyle()) - return false; + // Load the layouts + LayoutFileList::get().read(); //...and the modules theModuleList.read(); @@ -776,6 +829,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); @@ -787,7 +841,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()) @@ -809,7 +863,7 @@ bool LyX::init() } LYXERR(Debug::INIT, "LyX tmp dir: `" - << package().temp_dir().absFilename() << '\''); + << package().temp_dir().absFileName() << '\''); LYXERR(Debug::INIT, "Reading session information '.lyx/session'..."); pimpl_->session_.reset(new Session(lyxrc.num_lastfiles)); @@ -817,7 +871,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,13 +902,13 @@ static bool needsUpdate(string const & file) static bool firstrun = true; if (firstrun) { configure_script = - FileName(addName(package().system_support().absFilename(), + FileName(addName(package().system_support().absFileName(), "configure.py")); firstrun = false; } - FileName absfile = - FileName(addName(package().user_support().absFilename(), file)); + FileName absfile = + FileName(addName(package().user_support().absFileName(), file)); return !absfile.exists() || configure_script.lastModified() > absfile.lastModified(); } @@ -883,7 +937,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"))) { @@ -892,7 +946,7 @@ 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 (!sup.createDirectory(0755)) { // Failed, so let's exit. @@ -905,21 +959,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' @@ -999,11 +1054,24 @@ int parse_help(string const &, string const &, string &) " Look on Tools->Preferences->File formats->Format\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-batch execute commands without launching GUI and exit.\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; @@ -1058,6 +1126,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()) { @@ -1097,13 +1183,44 @@ 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_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; +} + + } // namespace anon @@ -1120,12 +1237,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 @@ -1179,6 +1304,13 @@ void dispatch(FuncRequest const & action, DispatchResult & dr) } +vector & theFilesToLoad() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->files_to_load_; +} + + BufferList & theBufferList() { LASSERT(singleton_, /**/); @@ -1267,13 +1399,6 @@ Messages const & getGuiMessages() } -graphics::Previews & thePreviews() -{ - LASSERT(singleton_, /**/); - return singleton_->pimpl_->preview_; -} - - Session & theSession() { LASSERT(singleton_, /**/); @@ -1298,31 +1423,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_->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_->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_->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