Better debug ouput

[lyx.git] / src / ServerSocket.cpp

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index ba56a7d873687e905f48828663a71bbc73c8819b..6d3368a517b1c44a2811f94812fa81fb04d8a8b2 100644 (file)
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -3,11 +3,11 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author João Luis M. Assirati
+ * \author João Luis M. Assirati
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,16 +16,16 @@
 
 #include "ServerSocket.h"
 
-#include "support/debug.h"
+#include "DispatchResult.h"
 #include "FuncRequest.h"
+#include "LyX.h"
 #include "LyXAction.h"
-#include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
-#include "support/lyxlib.h"
 #include "support/socktools.h"
 
 #include <boost/bind.hpp>
@@ -37,30 +37,30 @@
 # include <io.h>
 #endif
 
-using boost::shared_ptr;
-
 using namespace std;
+using namespace lyx::support;
+
+using boost::shared_ptr;
 
 namespace lyx {
 
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
-ServerSocket::ServerSocket(LyXFunc * f, support::FileName const & addr)
-       : func(f),
-         fd_(support::socktools::listen(addr, 3)),
+ServerSocket::ServerSocket(FileName const & addr)
+       : fd_(socktools::listen(addr, 3)),
          address_(addr)
 {
        if (fd_ == -1) {
-               lyxerr << "lyx: Disabling LyX socket." << endl;
+               LYXERR(Debug::LYXSERVER, "lyx: Disabling LyX socket.");
                return;
        }
 
        // These env vars are used by DVI inverse search
        // Needed by xdvi
-       support::setEnv("XEDITOR", "lyxclient -g %f %l");
+       setEnv("XEDITOR", "lyxclient -g %f %l");
        // Needed by lyxclient
-       support::setEnv("LYXSOCKET", address_.absFilename());
+       setEnv("LYXSOCKET", address_.absFilename());
 
        theApp()->registerSocketCallback(
                fd_,
@@ -80,7 +80,8 @@ ServerSocket::~ServerSocket()
                theApp()->unregisterSocketCallback(fd_);
                if (::close(fd_) != 0)
                        lyxerr << "lyx: Server socket " << fd_
-                              << " IO error on closing: " << strerror(errno);
+                              << " IO error on closing: " << strerror(errno)
+                              << endl;
        }
        address_.removeFile();
        LYXERR(Debug::LYXSERVER, "lyx: Server socket quitting");
@@ -97,7 +98,7 @@ string const ServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void ServerSocket::serverCallback()
 {
-       int const client_fd = support::socktools::accept(fd_);
+       int const client_fd = socktools::accept(fd_);
 
        if (fd_ == -1) {
                LYXERR(Debug::LYXSERVER, "lyx: Failed to accept new client");
@@ -140,13 +141,13 @@ void ServerSocket::dataCallback(int fd)
                string const key = line.substr(0, pos);
                if (key == "LYXCMD") {
                        string const cmd = line.substr(pos + 1);
-                       func->dispatch(lyxaction.lookupFunc(cmd));
-                       string const rval = to_utf8(func->getMessage());
-                       if (func->errorStat()) {
+                       DispatchResult dr;
+                       theApp()->dispatch(lyxaction.lookupFunc(cmd), dr);
+                       string const rval = to_utf8(dr.message());
+                       if (dr.error())
                                client->writeln("ERROR:" + cmd + ':' + rval);
-                       } else {
+                       else
                                client->writeln("INFO:" + cmd + ':' + rval);
-                       }
                } else if (key == "HELLO") {
                        // no use for client name!
                        client->writeln("HELLO:");
@@ -190,8 +191,8 @@ void ServerSocket::writeln(string const & line)
 //     lyxerr << "ServerSocket debug dump.\n"
 //          << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
 //          << "Clients: " << clients.size() << ".\n";
-//     std::map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
-//     std::map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
+//     map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
+//     map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
 //     for (; client != end; ++client)
 //             lyxerr << "fd = " << client->first << '\n';
 // }