X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=8db6eefe78acb0344c1184691e86f35bcb7c8943;hb=ece9228f90e183c2ac57683df4937e73afd36759;hp=4992de8e73a6bede93ddee20d00f1441041e263c;hpb=2291614a6c2d9d3e5092f4786174885ed18b7bea;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 4992de8e73..8db6eefe78 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -48,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" @@ -90,6 +88,13 @@ 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 @@ -186,8 +191,6 @@ struct LyX::Impl /// the parsed command line batch command if any vector batch_commands; - /// - graphics::Previews preview_; /// SpellChecker * spell_checker_; /// @@ -283,22 +286,19 @@ int LyX::exec(int & argc, char * argv[]) { // Minimal setting of locale before parsing command line try { - init_package(os::utf8_argv(0), string(), string(), - top_build_dir_is_one_level_up); + 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_); } - // FIXME: This breaks out of source build under Windows. - locale_init(); // 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_); @@ -366,12 +366,19 @@ 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 * 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. @@ -380,7 +387,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(); @@ -496,7 +511,7 @@ bool LyX::loadFiles() continue; Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName(), false); - if (buf->loadLyXFile(fname)) { + if (buf->loadLyXFile() == Buffer::ReadSuccess) { ErrorList const & el = buf->errorList("Parse"); if (!el.empty()) for_each(el.begin(), el.end(), @@ -530,10 +545,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: @@ -649,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: @@ -723,6 +738,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 // @@ -742,7 +763,7 @@ 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())) @@ -784,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")) @@ -820,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()) @@ -938,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' @@ -1032,6 +1054,9 @@ 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" @@ -1040,8 +1065,13 @@ int parse_help(string const &, string const &, string &) " 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; @@ -1096,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()) { @@ -1142,6 +1190,20 @@ int parse_batch(string const &, 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") { @@ -1175,14 +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 @@ -1236,6 +1304,13 @@ void dispatch(FuncRequest const & action, DispatchResult & dr) } +vector & theFilesToLoad() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->files_to_load_; +} + + BufferList & theBufferList() { LASSERT(singleton_, /**/); @@ -1324,13 +1399,6 @@ Messages const & getGuiMessages() } -graphics::Previews & thePreviews() -{ - LASSERT(singleton_, /**/); - return singleton_->pimpl_->preview_; -} - - Session & theSession() { LASSERT(singleton_, /**/);