X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=e65ef903209b06b3d589cd49528327e182a72ea7;hb=e2982037d9f981a6070c3cf90148bde33edbfdc9;hp=88ebfd468eeefcabd9eb55a7791c52a24d7de10b;hpb=ffec54c980c38b970de5d25ef58d39e21067a033;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 88ebfd468e..e65ef90320 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -90,6 +90,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
@@ -284,10 +291,11 @@ 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);
+			top_build_dir_is_one_level_up);
 	} 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
@@ -296,8 +304,8 @@ int LyX::exec(int & argc, char * argv[])
 
 	try {
 		init_package(os::utf8_argv(0),
-			      cl_system_support, cl_user_support,
-			      top_build_dir_is_one_level_up);
+			cl_system_support, cl_user_support,
+			top_build_dir_is_one_level_up);
 	} catch (ExceptionMessage const & message) {
 		if (message.type_ == ErrorException) {
 			Alert::error(message.title_, message.details_);
@@ -364,13 +372,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.
@@ -379,7 +394,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<string>::const_iterator it = pimpl_->files_to_load_.begin();
+		vector<string>::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();
 
@@ -495,7 +518,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(),
@@ -529,10 +552,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:
@@ -548,7 +571,7 @@ void LyX::execCommands()
 			break;
 		}
 	}
-	
+
 	// create the first main window
 	lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
 
@@ -676,7 +699,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);
@@ -722,6 +745,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
 	//
@@ -741,7 +770,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()))
@@ -783,7 +812,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"))
@@ -807,6 +836,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);
@@ -818,7 +848,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())
@@ -848,7 +878,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;
 }
 
@@ -884,7 +914,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();
@@ -936,21 +966,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'
@@ -1038,8 +1069,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;
@@ -1133,14 +1169,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;
@@ -1181,6 +1231,10 @@ void LyX::easyParse(int & argc, char * argv[])
 	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<string, cmd_helper>::const_iterator it
@@ -1234,6 +1288,13 @@ void dispatch(FuncRequest const & action, DispatchResult & dr)
 }
 
 
+vector<string> & theFilesToLoad()
+{
+	LASSERT(singleton_, /**/);
+	return singleton_->pimpl_->files_to_load_;
+}
+
+
 BufferList & theBufferList()
 {
 	LASSERT(singleton_, /**/);
@@ -1353,39 +1414,48 @@ SpellChecker * theSpellChecker()
 
 void setSpellChecker()
 {
-#if defined(USE_MACOSX_PACKAGING)
+	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_;
-		return;
-	}
+#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