Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 8449f9a4209633d6b6c9ef69163d85a2e084fbdb..d0ad5c7ce2e9734c4a0349da9492f97bcc6b94a3 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -66,6 +66,8 @@
 #include "os2_errortable.h"
 #endif
 
+using std::endl;
+
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver. 
 #ifndef HAVE_MKFIFO
@@ -118,7 +120,7 @@ void LyXComm::openConnection() {
                lyxerr << "LyXComm: Pipe " << tmp << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
-               pipename.clear();
+               pipename.erase();
                return;
        }
 #ifndef __EMX__
@@ -169,7 +171,7 @@ void LyXComm::openConnection() {
                lyxerr << "LyXComm: Pipe " << tmp << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
-               pipename.clear();
+               pipename.erase();
                return;
        }
 #ifndef __EMX__
@@ -341,7 +343,7 @@ void LyXComm::callback(int fd, void *v)
                        {
                                lyxerr << "LyxComm: truncated command: " 
                                       << lsbuf << endl;
-                               lsbuf.clear();
+                               lsbuf.erase();
                        }
                        break; // reset connection
                }
@@ -401,7 +403,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);
        }
@@ -428,6 +430,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
        bool server_only = false;
        while(*p) {
                // --- 1. check 'header' ---
+
                if (strncmp(p, "LYXSRV:", 7) == 0) {
                        server_only = true; 
                } else if(0!= strncmp(p, "LYXCMD:", 7)) {
@@ -440,7 +443,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                string client;
                while(*p && *p != ':')
                        client += char(*p++);
-               if(*p == ':') p++;
+               if(*p == ':') ++p;
                if(!*p) return;
                
                // --- 3. get function name ---
@@ -453,7 +456,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                if(!server_only && *p == ':' && *(++p)) {
                        while(*p && *p != '\n')
                                arg += char(*p++);
-                       if(*p) p++;
+                       if(*p) ++p;
                }
  
                lyxerr[Debug::LYXSERVER]
@@ -478,7 +481,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                int i= 0; //find place in clients[]
                                while (!serv->clients[i].empty() 
                                       && i<serv->numclients) 
-                                       i++;
+                                       ++i;
                                serv->clients[i] = client;
                                serv->numclients++;
                                buf = "LYXSRV:" + client + ":hello\n";
@@ -489,13 +492,13 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        } else if (cmd == "bye") {
                                // 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++) {
+                               int i = 0; //look if client is registered
+                               for (; i < serv->numclients; ++i) {
                                        if (serv->clients[i] == client) break;
                                }
-                               if (i<serv->numclients) {
+                               if (i < serv->numclients) {
                                        serv->numclients--;
-                                       serv->clients[i].clear();
+                                       serv->clients[i].erase();
                                        lyxerr[Debug::LYXSERVER]
                                                << "LyXServer: Client "
                                                << client << " said goodbye"
@@ -525,7 +528,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        string rval, buf;
                    
                        if (action>= 0) {
-                               rval = serv->func->Dispatch(cmd);
+                               rval = serv->func->Dispatch(action, arg.c_str());
                        } else {
                                rval = "Unknown command";
                        }