X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=fd903ce18fa4f69898da1516ae4d2acb5b2b2602;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=2c753570add4e49daeb1ec57e7f3fdb90c441e36;hpb=8cc7e00cfd38935a2bd67b0cde6d9c9bc4e822d2;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 2c753570ad..fd903ce18f 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -3,11 +3,11 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author João Luis M. Assirati
+ * \author João Luis M. Assirati
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,39 +16,44 @@
 
 #include "ServerSocket.h"
 
+#include "DispatchResult.h"
 #include "FuncRequest.h"
+#include "LyX.h"
 #include "LyXAction.h"
-#include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
+#include "support/lassert.h"
 #include "support/socktools.h"
 
-#include <boost/bind.hpp>
+#include <boost/assert.hpp>
 
 #include <cerrno>
+#include <cstring>
 #include <ostream>
 
 #if defined (_WIN32)
 # include <io.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 using namespace std;
 using namespace lyx::support;
 
-using boost::shared_ptr;
 
 namespace lyx {
 
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
-ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
-	: func(f),
-	  fd_(socktools::listen(addr, 3)),
+ServerSocket::ServerSocket(FileName const & addr)
+	: fd_(socktools::listen(addr, 3)),
 	  address_(addr)
 {
 	if (fd_ == -1) {
@@ -60,15 +65,15 @@ ServerSocket::ServerSocket(LyXFunc * f, FileName const & addr)
 	// Needed by xdvi
 	setEnv("XEDITOR", "lyxclient -g %f %l");
 	// Needed by lyxclient
-	setEnv("LYXSOCKET", address_.absFilename());
+	setEnv("LYXSOCKET", address_.absFileName());
 
 	theApp()->registerSocketCallback(
 		fd_,
-		boost::bind(&ServerSocket::serverCallback, this)
+		bind(&ServerSocket::serverCallback, this)
 		);
 
 	LYXERR(Debug::LYXSERVER, "lyx: New server socket "
-				 << fd_ << ' ' << address_.absFilename());
+				 << fd_ << ' ' << address_.absFileName());
 }
 
 
@@ -90,7 +95,7 @@ ServerSocket::~ServerSocket()
 
 string const ServerSocket::address() const
 {
-	return address_.absFilename();
+	return address_.absFileName();
 }
 
 
@@ -98,6 +103,11 @@ string const ServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void ServerSocket::serverCallback()
 {
+	if (clients.size() >= MAX_CLIENTS) {
+		writeln("BYE:Too many clients connected");
+		return;
+	}
+
 	int const client_fd = socktools::accept(fd_);
 
 	if (fd_ == -1) {
@@ -105,17 +115,11 @@ void ServerSocket::serverCallback()
 		return;
 	}
 
-	if (clients.size() >= MAX_CLIENTS) {
-		writeln("BYE:Too many clients connected");
-		return;
-	}
-
 	// Register the new client.
-	clients[client_fd] =
-		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
+	clients[client_fd] = make_shared<LyXDataSocket>(client_fd);
 	theApp()->registerSocketCallback(
 		client_fd,
-		boost::bind(&ServerSocket::dataCallback,
+		bind(&ServerSocket::dataCallback,
 			    this, client_fd)
 		);
 }
@@ -125,14 +129,16 @@ void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-	shared_ptr<LyXDataSocket> client = clients[fd];
-
+	map<int, shared_ptr<LyXDataSocket> >::const_iterator it = clients.find(fd);
+	if (it == clients.end())
+		return;
+	shared_ptr<LyXDataSocket> client = it->second;
 	string line;
-	size_t pos;
 	bool saidbye = false;
 	while (!saidbye && client->readln(line)) {
 		// The protocol must be programmed here
 		// Split the key and the data
+		size_t pos;
 		if ((pos = line.find(':')) == string::npos) {
 			client->writeln("ERROR:" + line + ":malformed message");
 			continue;
@@ -141,13 +147,15 @@ void ServerSocket::dataCallback(int fd)
 		string const key = line.substr(0, pos);
 		if (key == "LYXCMD") {
 			string const cmd = line.substr(pos + 1);
-			func->dispatch(lyxaction.lookupFunc(cmd));
-			string const rval = to_utf8(func->getMessage());
-			if (func->errorStat()) {
+			FuncRequest fr(lyxaction.lookupFunc(cmd));
+			fr.setOrigin(FuncRequest::LYXSERVER);
+			DispatchResult dr;
+			theApp()->dispatch(fr, dr);
+			string const rval = to_utf8(dr.message());
+			if (dr.error())
 				client->writeln("ERROR:" + cmd + ':' + rval);
-			} else {
+			else
 				client->writeln("INFO:" + cmd + ':' + rval);
-			}
 		} else if (key == "HELLO") {
 			// no use for client name!
 			client->writeln("HELLO:");
@@ -189,7 +197,7 @@ void ServerSocket::writeln(string const & line)
 // void ServerSocket::dump() const
 // {
 //	lyxerr << "ServerSocket debug dump.\n"
-//	     << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
+//	     << "fd = " << fd_ << ", address = " << address_.absFileName() << ".\n"
 //	     << "Clients: " << clients.size() << ".\n";
 //	map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
 //	map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();