update no.po

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index e9692fd6f48e02ba44862c674a994fe8d40075ff..26d11f542df95e3f2b14309ab5e1b7167bfa12f1 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <cerrno>
-#include FORMS_H_LOCATION
 
 #ifdef __GNUG__
 #pragma implementation
@@ -99,7 +98,7 @@ void LyXComm::openConnection()
                return;
 
        if ((outfd = startPipe(outPipeName(), true)) == -1) {
-               endPipe(infd, inPipeName());
+               endPipe(infd, inPipeName(), false);
                return;
        }
 
@@ -132,8 +131,8 @@ void LyXComm::closeConnection()
                return;
        }
 
-       endPipe(infd, inPipeName());
-       endPipe(outfd, outPipeName());
+       endPipe(infd, inPipeName(), false);
+       endPipe(outfd, outPipeName(), true);
 
        ready = false;
 }
@@ -207,11 +206,15 @@ int LyXComm::startPipe(string const & filename, bool write)
 }
 
 
-void LyXComm::endPipe(int & fd, string const & filename)
+void LyXComm::endPipe(int & fd, string const & filename, bool write)
 {
        if (fd < 0)
                return;
 
+       if (!write) {
+               lyx_gui::remove_read_callback(fd);
+       }
+
 #ifdef __EMX__
        APIRET rc;
        int errnum;
@@ -245,8 +248,8 @@ void LyXComm::endPipe(int & fd, string const & filename)
 void LyXComm::emergencyCleanup()
 {
        if (!pipename.empty()) {
-               endPipe(infd, inPipeName());
-               endPipe(outfd, outPipeName());
+               endPipe(infd, inPipeName(), false);
+               endPipe(outfd, outPipeName(), true);
        }
 }
 
@@ -254,55 +257,54 @@ void LyXComm::emergencyCleanup()
 // Receives messages and sends then to client
 void LyXComm::read_ready()
 {
-       if (lyxerr.debugging(Debug::LYXSERVER)) {
-               lyxerr << "LyXComm: Receiving from fd " << infd << endl;
-       }
+       // nb! make read_buffer_ a class-member for multiple sessions
+       static string read_buffer_;
+       read_buffer_.erase();
 
-       int const CMDBUFLEN = 100;
-       char charbuf[CMDBUFLEN];
-       string cmd;
-// nb! make lsbuf a class-member for multiple sessions
-       static string lsbuf;
+       int const charbuf_size = 100;
+       char charbuf[charbuf_size];
 
        errno = 0;
        int status;
        // the single = is intended here.
-       while ((status = read(infd, charbuf, CMDBUFLEN-1))) {
+       while ((status = ::read(infd, charbuf, charbuf_size - 1))) {
+
                if (status > 0) {
-                       charbuf[status]= '\0'; // turn it into a c string
-                       lsbuf += rtrim(charbuf, "\r");
-                       // commit any commands read
-                       while (lsbuf.find('\n') != string::npos) {
-                               // split() grabs the entire string if
-                               // the delim /wasn't/ found. ?:-P
-                               lsbuf= split(lsbuf, cmd,'\n');
-                               lyxerr[Debug::LYXSERVER]
-                                       << "LyXComm: status:" << status
-                                       << ", lsbuf:" << lsbuf
-                                       << ", cmd:" << cmd << endl;
-                               if (!cmd.empty())
-                                       clientcb(client, cmd);
-                                       //\n or not \n?
+                       charbuf[status] = '\0'; // turn it into a c string
+                       read_buffer_ += rtrim(charbuf, "\r");
+
+               } else if (errno != EAGAIN) {
+                       if (!read_buffer_.empty()) {
+                               lyxerr << "LyXComm: truncated command: "
+                                      << read_buffer_ << '\n'
+                                      << "Resetting connection" << 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;
                }
-               if (errno == EAGAIN) {
-                       errno = 0;
-                       return;
-               }
-               if (errno != 0) {
-                       lyxerr << "LyXComm: " << strerror(errno) << endl;
-                       if (!lsbuf.empty())
-                       {
-                               lyxerr << "LyxComm: truncated command: "
-                                      << lsbuf << endl;
-                               lsbuf.erase();
-                       }
-                       break; // reset connection
-               }
        }
-       closeConnection();
-       openConnection();
-       errno= 0;
+
+       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_);
+       }
+
+       errno = 0;
 }
 
 
@@ -382,7 +384,8 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                if (compare(p, "LYXSRV:", 7) == 0) {
                        server_only = true;
                } else if (0 != compare(p, "LYXCMD:", 7)) {
-                       lyxerr << "LyXServer: Unknown request \"" << p << "\"" << endl;
+                       lyxerr << "LyXServer: Unknown request \""
+                              << p << '"' << endl;
                        return;
                }
                p += 7;
@@ -458,7 +461,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                }
                        } else {
                                lyxerr <<"LyXServer: Undefined server command "
-                                      << cmd << "." << endl;
+                                      << cmd << '.' << endl;
                        }
                        return;
                }
@@ -484,7 +487,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                buf = "ERROR:";
                        else
                                buf = "INFO:";
-                       buf += client + ":" + cmd + ":" +  rval + "\n";
+                       buf += client + ':' + cmd + ':' +  rval + '\n';
                        serv->pipes.send(buf);
 
                        // !!! we don't do any error checking -
@@ -500,7 +503,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 
 /* ---F+------------------------------------------------------------------ *\
-   Function  : LyxNotifyClient
+   Function  : LyXNotifyClient
    Called by : WorkAreaKeyPress
    Purpose   : send a notify messge to a client
    Parameters: s - string to send