X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=3d73a67ed6d955c08318323357856f5ec10aa8f9;hb=1b32a0502e9206813b6b41365848673d8ac70b03;hp=deaee5c14ac90d857d69136d7a240700409eb90b;hpb=45bc27809bae95259e251a2215b39f945d8835ca;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index deaee5c14a..3d73a67ed6 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,9 +16,10 @@
 
 #include "ServerSocket.h"
 
+#include "DispatchResult.h"
 #include "FuncRequest.h"
+#include "LyX.h"
 #include "LyXAction.h"
-#include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
@@ -27,9 +28,10 @@
 #include "support/FileName.h"
 #include "support/socktools.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <cerrno>
+#include <ostream>
 
 #if defined (_WIN32)
 # include <io.h>
@@ -38,20 +40,18 @@
 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) {
-		lyxerr << "lyx: Disabling LyX socket." << endl;
+		LYXERR(Debug::LYXSERVER, "lyx: Disabling LyX socket.");
 		return;
 	}
 
@@ -59,15 +59,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());
 }
 
 
@@ -79,7 +79,8 @@ ServerSocket::~ServerSocket()
 		theApp()->unregisterSocketCallback(fd_);
 		if (::close(fd_) != 0)
 			lyxerr << "lyx: Server socket " << fd_
-			       << " IO error on closing: " << strerror(errno);
+			       << " IO error on closing: " << strerror(errno)
+			       << endl;
 	}
 	address_.removeFile();
 	LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting");
@@ -88,7 +89,7 @@ ServerSocket::~ServerSocket()
 
 string const ServerSocket::address() const
 {
-	return address_.absFilename();
+	return address_.absFileName();
 }
 
 
@@ -113,7 +114,7 @@ void ServerSocket::serverCallback()
 		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
 	theApp()->registerSocketCallback(
 		client_fd,
-		boost::bind(&ServerSocket::dataCallback,
+		bind(&ServerSocket::dataCallback,
 			    this, client_fd)
 		);
 }
@@ -123,8 +124,10 @@ 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;
@@ -139,13 +142,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:");
@@ -187,7 +192,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();