X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=16243172a912cfba662b4ca926cc649531eb6cdf;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=ce70c08217ae46b5447f7e31f10f8c29fd24d13d;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/lyxserver.C b/src/lyxserver.C
index ce70c08217..16243172a9 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,42 +39,65 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <cerrno>
-
 #include "lyxserver.h"
-#include "lyx_main.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"
 
-#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
+#include <boost/bind.hpp>
 
+#include <cerrno>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#include <fcntl.h>
 
-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.
-#ifndef HAVE_MKFIFO
-int mkfifo(char const * __path, mode_t __mode) {
-	return 0;
+#if !defined (HAVE_MKFIFO)
+// We provide a stub class that disables the lyxserver.
+
+void LyXComm::openConnection()
+{}
+
+
+void LyXComm::closeConnection()
+{}
+
+
+int LyXComm::startPipe(string const & filename, bool write)
+{
+	return -1;
 }
-#endif
+
+
+void LyXComm::endPipe(int & fd, string const & filename, bool write)
+{}
+
+
+void LyXComm::emergencyCleanup()
+{}
+
+void LyXComm::read_ready()
+{}
+
+
+void LyXComm::send(string const & msg)
+{}
+
+
+#else // defined (HAVE_MKFIFO)
 
 
 void LyXComm::openConnection()
@@ -139,44 +162,9 @@ void LyXComm::closeConnection()
 	ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
-	int fd;
-
-#ifdef __EMX__
-	HPIPE os2fd;
-	APIRET rc;
-	int errnum;
-	// Try create one instance of named pipe with the mode O_RDONLY|O_NONBLOCK.
-	// The current emx implementation of access() won't work with pipes.
-	rc = DosCreateNPipe(filename.c_str(), &os2fd, NP_ACCESS_INBOUND,
-		NP_NOWAIT|0x01, 0600, 0600, 0);
-	if (rc == ERROR_PIPE_BUSY) {
-		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
-		       << "If no other LyX program is active, please delete"
-			" the pipe by hand and try again." << endl;
-		pipename.erase();
-		return -1;
-	}
-
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr <<"LyXComm: Could not create pipe " << filename
-		       << strerror(errnum) << endl;
-		return -1;
-	};
-	// Listen to it.
-	rc = DosConnectNPipe(os2fd);
-	if (rc != NO_ERROR && rc != ERROR_PIPE_NOT_CONNECTED) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr <<"LyXComm: Could not create pipe " << filename
-		       << strerror(errnum) << endl;
-		return -1;
-	};
-	// Imported handles can be used both with OS/2 APIs and emx
-	// library functions.
-	fd = _imphandle(os2fd);
-#else
 	if (::access(filename.c_str(), F_OK) == 0) {
 		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
 		       << "If no other LyX program is active, please delete"
@@ -190,8 +178,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));
-#endif
+	int const fd = ::open(filename.c_str(),
+			      write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 
 	if (fd < 0) {
 		lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
@@ -201,7 +189,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;
@@ -214,34 +202,18 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 		return;
 
 	if (!write) {
-		lyx_gui::remove_read_callback(fd);
-	}
-
-#ifdef __EMX__
-	APIRET rc;
-	int errnum;
-
-	rc = DosDisConnectNPipe(fd);
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr << "LyXComm: Could not disconnect pipe " << filename
-		       << '\n' << strerror(errnum) << endl;
-		return;
+		lyx_gui::unregister_socket_callback(fd);
 	}
-#endif
 
 	if (::close(fd) < 0) {
 		lyxerr << "LyXComm: Could not close pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	}
 
-// OS/2 pipes are deleted automatically
-#ifndef __EMX__
 	if (unlink(filename) < 0) {
 		lyxerr << "LyXComm: Could not remove pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	};
-#endif
 
 	fd = -1;
 }
@@ -336,16 +308,20 @@ void LyXComm::send(string const & msg)
 		closeConnection();
 		openConnection();
 	}
-#ifdef __EMX__
-	APIRET rc;
-	int errnum;
-	rc = DosResetBuffer(outfd);	// To avoid synchronization problems.
-	if (rc != NO_ERROR) {
-		errnum = TranslateOS2Error(rc);
-		lyxerr << "LyXComm: Message could not be flushed: " << msg
-		       << '\n' << strerror(errnum) << endl;
-	}
-#endif
+}
+
+#endif // defined (HAVE_MKFIFO)
+
+
+string const LyXComm::inPipeName() const
+{
+	return pipename + string(".in");
+}
+
+
+string const LyXComm::outPipeName() const
+{
+	return pipename + string(".out");
 }
 
 
@@ -479,7 +455,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: