X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=b7fa35ee13fbeee11d1a8676a73f6f31fada827c;hb=0407364392abca866ee5a3da3c89ad41811ed81f;hp=9b9f6e0a75a76009cdc569df7a3e2f26a54a188a;hpb=e26331dd35359afbe4863c7db517b6900b23f019;p=lyx.git

diff --git a/src/Server.cpp b/src/Server.cpp
index 9b9f6e0a75..b7fa35ee13 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -51,15 +51,18 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #ifdef _WIN32
+#include <io.h>
 #include <QCoreApplication>
 #endif
+#include <QThread>
 
 #include <cerrno>
 #ifdef HAVE_SYS_STAT_H
@@ -140,6 +143,7 @@ LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
 		pipe_[i].handle = INVALID_HANDLE_VALUE;
 	}
 	ready_ = false;
+	deferred_loading_ = false;
 	openConnection();
 }
 
@@ -515,8 +519,14 @@ void LyXComm::openConnection()
 		return;
 	}
 
-	// Check whether the pipe name is being used by some other program.
+	// Check whether the pipe name is being used by some other instance.
 	if (!stopserver_ && WaitNamedPipe(inPipeName().c_str(), 0)) {
+		// Tell the running instance to load the files
+		if (run_mode == USE_REMOTE && loadFilesInOtherInstance()) {
+			deferred_loading_ = true;
+			pipename_.erase();
+			return;
+		}
 		lyxerr << "LyXComm: Pipe " << external_path(inPipeName())
 		       << " already exists.\nMaybe another instance of LyX"
 			  " is using it." << endl;
@@ -685,6 +695,7 @@ string const LyXComm::pipeName(DWORD index) const
 LyXComm::LyXComm(string const &, Server *, ClientCallbackfct)
 {}
 
+
 void LyXComm::openConnection()
 {}
 
@@ -706,6 +717,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 void LyXComm::emergencyCleanup()
 {}
 
+
 void LyXComm::read_ready()
 {}
 
@@ -716,11 +728,11 @@ void LyXComm::send(string const & msg)
 
 #else // defined (HAVE_MKFIFO)
 
-
 LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
 	: pipename_(pip), client_(cli), clientcb_(ccb)
 {
 	ready_ = false;
+	deferred_loading_ = false;
 	openConnection();
 }
 
@@ -798,6 +810,12 @@ int LyXComm::startPipe(string const & file, bool write)
 			if (fd >= 0) {
 				// Another LyX instance is using it.
 				::close(fd);
+				// Tell the running instance to load the files
+				if (run_mode == USE_REMOTE && loadFilesInOtherInstance()) {
+					deferred_loading_ = true;
+					pipename_.erase();
+					return -1;
+				}
 			} else if (errno == ENXIO) {
 				// No process is reading from the other end.
 				stalepipe = true;
@@ -840,7 +858,7 @@ int LyXComm::startPipe(string const & file, bool write)
 
 	if (!write) {
 		theApp()->registerSocketCallback(fd,
-			boost::bind(&LyXComm::read_ready, this));
+			bind(&LyXComm::read_ready, this));
 	}
 
 	return fd;
@@ -860,7 +878,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		       << '\n' << strerror(errno) << endl;
 	}
 
-	if (FileName(filename).removeFile() < 0) {
+	if (!FileName(filename).removeFile()) {
 		lyxerr << "LyXComm: Could not remove pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	}
@@ -898,7 +916,6 @@ void LyXComm::read_ready()
 	int status;
 	// the single = is intended here.
 	while ((status = ::read(infd_, charbuf, charbuf_size - 1))) {
-
 		if (status > 0) {
 			charbuf[status] = '\0'; // turn it into a c string
 			read_buffer_ += rtrim(charbuf, "\r");
@@ -949,7 +966,8 @@ void LyXComm::send(string const & msg)
 
 	LYXERR(Debug::LYXSERVER, "LyXComm: Sending '" << msg << '\'');
 
-	if (pipename_.empty()) return;
+	if (pipename_.empty())
+		return;
 
 	if (!ready_) {
 		LYXERR0("LyXComm: Pipes are closed. Could not send " << msg);
@@ -964,6 +982,49 @@ void LyXComm::send(string const & msg)
 
 #endif // defined (HAVE_MKFIFO)
 
+namespace {
+
+struct Sleep : QThread
+{
+	static void millisec(unsigned long ms)
+	{
+		QThread::usleep(ms * 1000);
+	}
+};
+
+} // namespace anon
+
+
+bool LyXComm::loadFilesInOtherInstance()
+{
+	int pipefd;
+	int loaded_files = 0;
+	FileName const pipe(inPipeName());
+	vector<string>::iterator it = theFilesToLoad().begin();
+	while (it != theFilesToLoad().end()) {
+		FileName fname = fileSearch(string(), os::internal_path(*it),
+						"lyx", may_not_exist);
+		if (fname.empty()) {
+			++it;
+			continue;
+		}
+		// Wait a while to allow time for the other
+		// instance to reset the connection
+		Sleep::millisec(200);
+		pipefd = ::open(pipe.toFilesystemEncoding().c_str(), O_WRONLY);
+		if (pipefd < 0)
+			break;
+		string const cmd = "LYXCMD:pipe:file-open:" +
+					fname.absFileName() + '\n';
+		if (::write(pipefd, cmd.c_str(), cmd.length()) < 0)
+			LYXERR0("Cannot write to pipe!");
+		::close(pipefd);
+		++loaded_files;
+		it = theFilesToLoad().erase(it);
+	}
+	return loaded_files > 0;
+}
+
 
 string const LyXComm::inPipeName() const
 {
@@ -1008,7 +1069,6 @@ Server::~Server()
 
 int compare(char const * a, char const * b, unsigned int len)
 {
-	using namespace std;
 	return strncmp(a, b, len);
 }
 
@@ -1113,7 +1173,8 @@ void Server::callback(string const & msg)
 			// connect to the lyxfunc in the single GuiView we
 			// support currently. (Lgb)
 
-			FuncRequest const fr(lyxaction.lookupFunc(cmd), arg);
+			FuncRequest fr(lyxaction.lookupFunc(cmd), arg);
+			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
 			theApp()->dispatch(fr, dr);
 			string const rval = to_utf8(dr.message());