white-space changes, removed definitions.h several enum changes because of this,...

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 6bfed35380753279c8485c01f01465899171b69e..d6c217529dd4156be94d65f928b9af1d293fa809 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-1999 The LyX Team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 /**
   Docu   : To use the lyxserver define the name of the pipe in your
@@ -79,6 +79,10 @@ int  mkfifo( char *__path, mode_t __mode ) {
 
 extern LyXAction lyxaction;
 
+// C wrapper
+extern "C" void C_LyXComm_callback(int fd, void *v);
+
+
 // LyXComm class
  
  // Open pipes
@@ -135,8 +139,8 @@ void LyXComm::openConnection() {
        rc = DosConnectNPipe(fd);
        if (rc != NO_ERROR && rc != ERROR_PIPE_NOT_CONNECTED) {
                errnum = TranslateOS2Error(rc);
-               lyxerr <<"LyXComm: Could not create pipe " + tmp);
-               lyxerr <<strerror(errnum);
+               lyxerr <<"LyXComm: Could not create pipe " << tmp
+                      << strerror(errnum) << endl;
                return;
        };
        // Imported handles can be used both with OS/2 APIs and emx
@@ -148,7 +152,7 @@ void LyXComm::openConnection() {
                       << strerror(errno) << endl;
                return;
        }
-       fl_add_io_callback(infd, FL_READ, callback, (void*)this);
+       fl_add_io_callback(infd, FL_READ, C_LyXComm_callback, (void*)this);
  
        // --- prepare output pipe ---------------------------------------
  
@@ -234,7 +238,7 @@ void LyXComm::closeConnection() {
        }
  
        if(infd > -1) {
-               fl_remove_io_callback(infd, FL_READ, callback);
+               fl_remove_io_callback(infd, FL_READ, C_LyXComm_callback);
  
                string tmp = pipename + ".in";
 #ifdef __EMX__         // Notify the operating system.
@@ -300,11 +304,11 @@ void LyXComm::callback(int fd, void *v)
        errno = 0;
        int status;
        // the single = is intended here.
-       while((status = read(fd,charbuf,CMDBUFLEN-1)))
+       while((status = read(fd, charbuf, CMDBUFLEN-1)))
        {// break and return in loop
                if(status > 0) // got something
                {
-                       charbuf[status]='\0'; // turn it into a c string
+                       charbuf[status]= '\0'; // turn it into a c string
                        lsbuf += strip(charbuf, '\r');
                        // commit any commands read
                        while(lsbuf.find('\n') != string::npos) // while still
@@ -313,7 +317,7 @@ void LyXComm::callback(int fd, void *v)
                        {
                                // split() grabs the entire string if
                                // the delim /wasn't/ found. ?:-P 
-                               lsbuf=split(lsbuf, cmd,'\n');
+                               lsbuf= split(lsbuf, cmd,'\n');
                                lyxerr[Debug::LYXSERVER]
                                        << "LyXComm: status:" << status
                                        << ", lsbuf:" << lsbuf 
@@ -337,15 +341,21 @@ void LyXComm::callback(int fd, void *v)
                        {
                                lyxerr << "LyxComm: truncated command: " 
                                       << lsbuf << endl;
-                               lsbuf.erase();
+                               lsbuf.clear();
                        }
                        break; // reset connection
                }
        }
        c->closeConnection();
        c->openConnection();
-       errno=0;
+       errno= 0;
 }
+
+extern "C" void C_LyXComm_callback(int fd, void *v)
+{
+       LyXComm::callback(fd, v);
+}
+
  
 void LyXComm::send(string const & msg) {
        if (msg.empty()) {
@@ -376,8 +386,8 @@ void LyXComm::send(string const & msg) {
        rc = DosResetBuffer(outfd);     // To avoid synchronization problems.
        if (rc != NO_ERROR) {
                errnum = TranslateOS2Error(rc);
-               lyxerr <<"LyXComm: Message could not be flushed: " +msg);
-               lyxerr <<strerror(errnum));
+               lyxerr << "LyXComm: Message could not be flushed: " << msg
+                      << '\n' << strerror(errnum) << endl;
        }
 #endif
 }
@@ -391,7 +401,7 @@ LyXServer::~LyXServer()
        // modified june 1999 by stefano@zool.su.se to send as many bye
        // messages as there are clients, each with client's name.
        string message;
-       for (int i=0; i<numclients; i++) {
+       for (int i= 0; i<numclients; i++) {
                message = "LYXSRV:" + clients[i] + ":bye\n";
                pipes.send(message);
        }
@@ -418,9 +428,9 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
        bool server_only = false;
        while(*p) {
                // --- 1. check 'header' ---
-               if (strncmp(p, "LYXSRV:", 7)==0) {
+               if (strncmp(p, "LYXSRV:", 7) == 0) {
                        server_only = true; 
-               } else if(0!=strncmp(p, "LYXCMD:", 7)) {
+               } else if(0!= strncmp(p, "LYXCMD:", 7)) {
                        lyxerr << "LyXServer: Unknown request" << endl;
                        return;
                }
@@ -459,13 +469,13 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        // we are listening.
                        if (cmd == "hello") {
                                // One more client
-                               if(serv->numclients==MAX_CLIENTS){ //paranoid check
+                               if(serv->numclients == MAX_CLIENTS){ //paranoid check
                                        lyxerr[Debug::LYXSERVER]
                                                << "LyXServer: too many clients..."
                                                << endl;
                                        return;
                                }
-                               int i=0; //find place in clients[]
+                               int i= 0; //find place in clients[]
                                while (!serv->clients[i].empty() 
                                       && i<serv->numclients) 
                                        i++;
@@ -477,15 +487,15 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                        << client << endl;
                                serv->pipes.send(buf);
                        } else if (cmd == "bye") {
-                               // If clients==0 maybe we should reset the pipes
+                               // If clients == 0 maybe we should reset the pipes
                                // to prevent fake callbacks
                                int i; //look if client is registered
-                               for (i=0; i<serv->numclients; i++) {
+                               for (i= 0; i<serv->numclients; i++) {
                                        if (serv->clients[i] == client) break;
                                }
                                if (i<serv->numclients) {
                                        serv->numclients--;
-                                       serv->clients[i].erase();
+                                       serv->clients[i].clear();
                                        lyxerr[Debug::LYXSERVER]
                                                << "LyXServer: Client "
                                                << client << " said goodbye"
@@ -514,7 +524,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        //int action = -1;
                        string rval, buf;
                    
-                       if (action>=0) {
+                       if (action>= 0) {
                                rval = serv->func->Dispatch(action, arg.c_str());
                        } else {
                                rval = "Unknown command";