- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index aee81d0de593119131bd9bdb90107fe57c251dc1..63cd5b4553ed968e3a864f257ff65d019cc4fa94 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -41,11 +41,15 @@
 
 #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>
@@ -60,10 +64,14 @@
 #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.
@@ -136,6 +144,7 @@ void LyXComm::closeConnection()
        ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
        int fd;
@@ -198,7 +207,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;
@@ -211,7 +220,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__
@@ -346,6 +355,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()
@@ -476,7 +497,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: