X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=a6213f9deefe2fce95e8559d0ff8c1d7d8daef65;hb=d13d6da879462707cd947cdf00c0cf7c3dfac924;hp=0f38a4520472784cddbfd2f7bb93ea2d1e7e0604;hpb=91de22ef340abbf1e9ba7d422bcd9024fa90d63f;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 0f38a45204..a6213f9dee 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,25 +39,39 @@
 
 #include <config.h>
 
-#include <fcntl.h>
-
 #include "lyxserver.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "frontends/lyx_gui.h"
 
+#include <boost/bind.hpp>
+
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
+#include <cstdlib>
+#include <io.h>
 #define OS2EMX_PLAIN_CHAR
 #define INCL_DOSNMPIPES
 #define INCL_DOSERRORS
+#include <os2.h>
+#include "support/os2_errortable.h"
 #endif
 
-
-using namespace lyx::support;
+using lyx::support::compare;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::unlink;
 
 using std::endl;
+using std::string;
+
 
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver.
@@ -130,10 +144,9 @@ void LyXComm::closeConnection()
 	ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
-	int fd;
-
 #ifdef __EMX__
 	HPIPE os2fd;
 	APIRET rc;
@@ -166,7 +179,7 @@ int LyXComm::startPipe(string const & filename, bool write)
 	};
 	// Imported handles can be used both with OS/2 APIs and emx
 	// library functions.
-	fd = _imphandle(os2fd);
+	int const fd = _imphandle(os2fd);
 #else
 	if (::access(filename.c_str(), F_OK) == 0) {
 		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
@@ -181,7 +194,8 @@ int LyXComm::startPipe(string const & filename, bool write)
 		       << strerror(errno) << endl;
 		return -1;
 	};
-	fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
+	int const fd = ::open(filename.c_str(),
+			      write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 #endif
 
 	if (fd < 0) {
@@ -192,7 +206,7 @@ int LyXComm::startPipe(string const & filename, bool write)
 	}
 
 	if (!write) {
-		lyx_gui::set_read_callback(fd, this);
+		lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
 	}
 
 	return fd;
@@ -205,7 +219,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		return;
 
 	if (!write) {
-		lyx_gui::remove_read_callback(fd);
+		lyx_gui::unregister_socket_callback(fd);
 	}
 
 #ifdef __EMX__
@@ -340,6 +354,18 @@ void LyXComm::send(string const & msg)
 }
 
 
+string const LyXComm::inPipeName() const
+{
+	return pipename + string(".in");
+}
+
+
+string const LyXComm::outPipeName() const
+{
+	return pipename + string(".out");
+}
+
+
 // LyXServer class
 
 LyXServer::~LyXServer()
@@ -470,7 +496,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 			// support currently. (Lgb)
 
 
-			serv->func->dispatch(cmd + ' ' + arg);
+			serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
 			string const rval = serv->func->getMessage();
 
 			//modified june 1999 stefano@zool.su.se: