some tabular fixes for the problems reported by Helge

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 26d11f542df95e3f2b14309ab5e1b7167bfa12f1..a6213f9deefe2fce95e8559d0ff8c1d7d8daef65 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -1,12 +1,15 @@
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
+/**
+ * \file lyxserver.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 /**
   Docu   : To use the lyxserver define the name of the pipe in your
@@ -36,24 +39,21 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <cerrno>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #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"
 
+#include <boost/bind.hpp>
+
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
 #include <cstdlib>
 #include <io.h>
@@ -64,7 +64,14 @@
 #include "support/os2_errortable.h"
 #endif
 
+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.
@@ -137,10 +144,9 @@ void LyXComm::closeConnection()
        ready = false;
 }
 
+
 int LyXComm::startPipe(string const & filename, bool write)
 {
-       int fd;
-
 #ifdef __EMX__
        HPIPE os2fd;
        APIRET rc;
@@ -173,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"
@@ -188,18 +194,19 @@ 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) {
                lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
                       << strerror(errno) << endl;
-               lyx::unlink(filename);
+               unlink(filename);
                return -1;
        }
 
        if (!write) {
-               lyx_gui::set_read_callback(fd, this);
+               lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
        }
 
        return fd;
@@ -212,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__
@@ -235,7 +242,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
 
 // OS/2 pipes are deleted automatically
 #ifndef __EMX__
-       if (lyx::unlink(filename) < 0) {
+       if (unlink(filename) < 0) {
                lyxerr << "LyXComm: Could not remove pipe " << filename
                       << '\n' << strerror(errno) << endl;
        };
@@ -272,38 +279,40 @@ void LyXComm::read_ready()
                if (status > 0) {
                        charbuf[status] = '\0'; // turn it into a c string
                        read_buffer_ += rtrim(charbuf, "\r");
-
-               } else if (errno != EAGAIN) {
+                       // commit any commands read
+                       while (read_buffer_.find('\n') != string::npos) {
+                               // split() grabs the entire string if
+                               // the delim /wasn't/ found. ?:-P
+                               string cmd;
+                               read_buffer_= split(read_buffer_, cmd,'\n');
+                               lyxerr[Debug::LYXSERVER]
+                                       << "LyXComm: status:" << status
+                                       << ", read_buffer_:" << read_buffer_
+                                       << ", cmd:" << cmd << endl;
+                               if (!cmd.empty())
+                                       clientcb(client, cmd);
+                                       //\n or not \n?
+                       }
+               }
+               if (errno == EAGAIN) {
+                       errno = 0;
+                       return;
+               }
+               if (errno != 0) {
+                       lyxerr << "LyXComm: " << strerror(errno) << endl;
                        if (!read_buffer_.empty()) {
                                lyxerr << "LyXComm: truncated command: "
-                                      << read_buffer_ << '\n'
-                                      << "Resetting connection" << endl;
+                                      << read_buffer_ << endl;
                                read_buffer_.erase();
                        }
-
-                       // reset connection
-                       closeConnection();
-                       openConnection();
-                       break;
-
-               } else {
-                       // errno == EAGAIN
-                       // Nothing new has arrived, so now's the time
-                       // to tell the outside world if there's anything
-                       // in the read buffer.
-                       break;
+                       break; // reset connection
                }
        }
 
-       if (!read_buffer_.empty()) {
-               read_buffer_ = rtrim(read_buffer_, "\n");
-               lyxerr[Debug::LYXSERVER]
-                       << "LyXComm: Received from fd "
-                       << infd << '\n'
-                       << '\"' << read_buffer_ << '\"' << endl;
-               clientcb(client, read_buffer_);
-       }
-
+       // The connection gets reset in errno != EAGAIN
+       // Why does it need to be reset if errno == 0?
+       closeConnection();
+       openConnection();
        errno = 0;
 }
 
@@ -345,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()
@@ -475,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: