]> git.lyx.org Git - lyx.git/blobdiff - src/lyxserver.C
partial framebox support
[lyx.git] / src / lyxserver.C
index e9692fd6f48e02ba44862c674a994fe8d40075ff..0c4e152e1e20969c82cf649911afa26deb132db7 100644 (file)
@@ -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);
        }
 }
 
@@ -267,7 +270,9 @@ void LyXComm::read_ready()
        errno = 0;
        int status;
        // the single = is intended here.
-       while ((status = read(infd, charbuf, CMDBUFLEN-1))) {
+       while ((status = read(infd, charbuf, CMDBUFLEN - 1))) {
+               int rerrno = errno;
                if (status > 0) {
                        charbuf[status]= '\0'; // turn it into a c string
                        lsbuf += rtrim(charbuf, "\r");
@@ -285,15 +290,14 @@ void LyXComm::read_ready()
                                        //\n or not \n?
                        }
                }
-               if (errno == EAGAIN) {
+               if (rerrno == EAGAIN) {
                        errno = 0;
                        return;
                }
-               if (errno != 0) {
-                       lyxerr << "LyXComm: " << strerror(errno) << endl;
-                       if (!lsbuf.empty())
-                       {
-                               lyxerr << "LyxComm: truncated command: "
+               if (rerrno != 0) {
+                       lyxerr << "LyXComm: " << strerror(rerrno) << endl;
+                       if (!lsbuf.empty()) {
+                               lyxerr << "LyXComm: truncated command: "
                                       << lsbuf << endl;
                                lsbuf.erase();
                        }
@@ -500,7 +504,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