X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServer.cpp;h=522060e91b6a70682b7ad0163ae9449cafbb240e;hb=e6b93f7489fc0738b6097d49cb7b16eed2b4fb1e;hp=1a66682bc40f9e95db5cfc851fd38bb78457b299;hpb=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=features.git

diff --git a/src/Server.cpp b/src/Server.cpp
index 1a66682bc4..522060e91b 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -56,11 +56,15 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 
-#include "support/bind.h"
+#include <iostream>
 
 #ifdef _WIN32
-#include <io.h>
-#include <QCoreApplication>
+# include <io.h>
+# include <QCoreApplication>
+#else
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 #endif
 #include <QThread>
 
@@ -116,7 +120,7 @@ string errormsg(DWORD const error)
 	return message;
 }
 
-} // namespace anon
+} // namespace
 
 
 DWORD WINAPI pipeServerWrapper(void * arg)
@@ -136,14 +140,14 @@ DWORD WINAPI pipeServerWrapper(void * arg)
 
 
 LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb)
-	: stopserver_(0), pipename_(pip), client_(cli), clientcb_(ccb)
+	: stopserver_(0),
+	  ready_(false), pipename_(pip), client_(cli), clientcb_(ccb),
+	  deferred_loading_(false)
 {
 	for (int i = 0; i < MAX_PIPES; ++i) {
 		event_[i] = 0;
 		pipe_[i].handle = INVALID_HANDLE_VALUE;
 	}
-	ready_ = false;
-	deferred_loading_ = false;
 	openConnection();
 }
 
@@ -171,7 +175,7 @@ bool LyXComm::pipeServer()
 
 		pipe_[i].overlap.hEvent = event_[i];
 		pipe_[i].iobuf.erase();
-		pipe_[i].handle = CreateNamedPipe(pipename.c_str(),
+		pipe_[i].handle = CreateNamedPipeA(pipename.c_str(),
 				open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
 				MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
 				PIPE_TIMEOUT, NULL);
@@ -198,8 +202,8 @@ bool LyXComm::pipeServer()
 	LYXERR(Debug::LYXSERVER, "LyXComm: Connection established");
 	ready_ = true;
 	outbuf_.erase();
-	DWORD status;
-	bool success;
+	DWORD status = 0;
+	bool success = false;
 
 	while (!checkStopServer()) {
 		// Indefinitely wait for the completion of an overlapped
@@ -355,7 +359,7 @@ bool LyXComm::pipeServer()
 
 			error = GetLastError();
 
-			if (success && error == ERROR_IO_PENDING) {
+			if (success && (error == ERROR_IO_PENDING || error == NO_ERROR)) {
 				// The write operation is still pending.
 				// We get here when a reader is started
 				// well before a reply is ready, so delay
@@ -377,6 +381,9 @@ bool LyXComm::pipeServer()
 			if (!resetPipe(i, !success))
 				return false;
 			break;
+		case CONNECTING_STATE:
+			LYXERR0("Wrong pipe state");
+			break;
 		}
 	}
 
@@ -482,7 +489,7 @@ bool LyXComm::resetPipe(DWORD index, bool close_handle)
 		CloseHandle(pipe_[index].handle);
 
 		pipe_[index].iobuf.erase();
-		pipe_[index].handle = CreateNamedPipe(name.c_str(),
+		pipe_[index].handle = CreateNamedPipeA(name.c_str(),
 				open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
 				MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
 				PIPE_TIMEOUT, NULL);
@@ -520,7 +527,7 @@ void LyXComm::openConnection()
 	}
 
 	// Check whether the pipe name is being used by some other instance.
-	if (!stopserver_ && WaitNamedPipe(inPipeName().c_str(), 0)) {
+	if (!stopserver_ && WaitNamedPipeA(inPipeName().c_str(), 0)) {
 		// Tell the running instance to load the files
 		if (run_mode == USE_REMOTE && loadFilesInOtherInstance()) {
 			deferred_loading_ = true;
@@ -729,10 +736,10 @@ 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)
+	: infd_(-1), outfd_(-1),
+	  ready_(false), pipename_(pip), client_(cli), clientcb_(ccb),
+	  deferred_loading_(false)
 {
-	ready_ = false;
-	deferred_loading_ = false;
 	openConnection();
 }
 
@@ -857,8 +864,12 @@ int LyXComm::startPipe(string const & file, bool write)
 	}
 
 	if (!write) {
-		theApp()->registerSocketCallback(fd,
-			bind(&LyXComm::read_ready, this));
+		// Make sure not to call read_ready after destruction.
+		weak_ptr<void> tracker = tracker_.p();
+		theApp()->registerSocketCallback(fd, [this, tracker](){
+				if (!tracker.expired())
+					read_ready();
+			});
 	}
 
 	return fd;
@@ -992,14 +1003,30 @@ struct Sleep : QThread
 	}
 };
 
-} // namespace anon
+} // namespace
 
 
-bool LyXComm::loadFilesInOtherInstance()
+bool LyXComm::loadFilesInOtherInstance() const
 {
 	int pipefd;
-	int loaded_files = 0;
 	FileName const pipe(inPipeName());
+
+	if (theFilesToLoad().empty()) {
+		LYXERR0("LyX is already running in another instance\n"
+			"and 'use single instance' is active.");
+		// Wait a while for the other instance to reset the connection
+		Sleep::millisec(200);
+		pipefd = ::open(pipe.toFilesystemEncoding().c_str(), O_WRONLY);
+		if (pipefd >= 0) {
+			string const cmd = "LYXCMD:pipe:window-raise\n";
+			if (::write(pipefd, cmd.c_str(), cmd.length()) < 0)
+				LYXERR0("Cannot communicate with running instance!");
+			::close(pipefd);
+		}
+		return true;
+	}
+
+	int loaded_files = 0;
 	vector<string>::iterator it = theFilesToLoad().begin();
 	while (it != theFilesToLoad().end()) {
 		FileName fname = fileSearch(string(), os::internal_path(*it),
@@ -1157,7 +1184,7 @@ void Server::callback(string const & msg)
 						<< client << " said goodbye");
 				} else {
 					LYXERR(Debug::LYXSERVER,
-						"Server: ignoring bye messge from unregistered client" << client);
+						"Server: ignoring bye message from unregistered client" << client);
 				}
 			} else {
 				LYXERR0("Server: Undefined server command " << cmd << '.');
@@ -1173,7 +1200,7 @@ void Server::callback(string const & msg)
 			// connect to the lyxfunc in the single GuiView we
 			// support currently. (Lgb)
 
-			FuncRequest fr(lyxaction.lookupFunc(cmd), arg);
+			FuncRequest fr(lyxaction.lookupFunc(cmd), from_utf8(arg));
 			fr.setOrigin(FuncRequest::LYXSERVER);
 			DispatchResult dr;
 			theApp()->dispatch(fr, dr);