remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / lyxserver.C

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 7a05e818ff9a6e53ae82b78ac93290d7b2532aa4..bcf9a321c51d915e467b7749472d1f9c9bc7c8f8 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -44,9 +44,11 @@
 #include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
+#include "frontends/Application.h"
+
+#include "support/filename.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "frontends/lyx_gui.h"
 
 #include <boost/bind.hpp>
 
@@ -56,10 +58,14 @@
 #endif
 #include <fcntl.h>
 
-using lyx::support::compare;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::unlink;
+
+namespace lyx {
+
+using support::compare;
+using support::FileName;
+using support::rtrim;
+using support::split;
+using support::unlink;
 
 using std::endl;
 using std::string;
@@ -102,7 +108,7 @@ void LyXComm::send(string const & msg)
 
 void LyXComm::openConnection()
 {
-       lyxerr[Debug::LYXSERVER] << "LyXComm: Opening connection" << endl;
+       LYXERR(Debug::LYXSERVER) << "LyXComm: Opening connection" << endl;
 
        // If we are up, that's an error
        if (ready) {
@@ -113,7 +119,7 @@ void LyXComm::openConnection()
        ready = false;
 
        if (pipename.empty()) {
-               lyxerr[Debug::LYXSERVER]
+               LYXERR(Debug::LYXSERVER)
                        << "LyXComm: server is disabled, nothing to do"
                        << endl;
                return;
@@ -135,17 +141,17 @@ void LyXComm::openConnection()
 
        // We made it!
        ready = true;
-       lyxerr[Debug::LYXSERVER] << "LyXComm: Connection established" << endl;
+       LYXERR(Debug::LYXSERVER) << "LyXComm: Connection established" << endl;
 }
 
 
 /// Close pipes
 void LyXComm::closeConnection()
 {
-       lyxerr[Debug::LYXSERVER] << "LyXComm: Closing connection" << endl;
+       LYXERR(Debug::LYXSERVER) << "LyXComm: Closing connection" << endl;
 
        if (pipename.empty()) {
-               lyxerr[Debug::LYXSERVER]
+               LYXERR(Debug::LYXSERVER)
                        << "LyXComm: server is disabled, nothing to do"
                        << endl;
                return;
@@ -163,9 +169,10 @@ void LyXComm::closeConnection()
 }
 
 
-int LyXComm::startPipe(string const & filename, bool write)
+int LyXComm::startPipe(string const & file, bool write)
 {
-       if (::access(filename.c_str(), F_OK) == 0) {
+       FileName const filename(file);
+       if (::access(filename.toFilesystemEncoding().c_str(), F_OK) == 0) {
                lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
                       << "If no other LyX program is active, please delete"
                        " the pipe by hand and try again." << endl;
@@ -173,12 +180,12 @@ int LyXComm::startPipe(string const & filename, bool write)
                return -1;
        }
 
-       if (::mkfifo(filename.c_str(), 0600) < 0) {
+       if (::mkfifo(filename.toFilesystemEncoding().c_str(), 0600) < 0) {
                lyxerr << "LyXComm: Could not create pipe " << filename << '\n'
                       << strerror(errno) << endl;
                return -1;
        };
-       int const fd = ::open(filename.c_str(),
+       int const fd = ::open(filename.toFilesystemEncoding().c_str(),
                              write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
 
        if (fd < 0) {
@@ -189,7 +196,8 @@ int LyXComm::startPipe(string const & filename, bool write)
        }
 
        if (!write) {
-               lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
+               theApp()->registerSocketCallback(fd,
+                       boost::bind(&LyXComm::read_ready, this));
        }
 
        return fd;
@@ -202,7 +210,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
                return;
 
        if (!write) {
-               lyx_gui::unregister_socket_callback(fd);
+               theApp()->unregisterSocketCallback(fd);
        }
 
        if (::close(fd) < 0) {
@@ -210,7 +218,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write)
                       << '\n' << strerror(errno) << endl;
        }
 
-       if (unlink(filename) < 0) {
+       if (unlink(FileName(filename)) < 0) {
                lyxerr << "LyXComm: Could not remove pipe " << filename
                       << '\n' << strerror(errno) << endl;
        };
@@ -252,7 +260,7 @@ void LyXComm::read_ready()
                                // the delim /wasn't/ found. ?:-P
                                string cmd;
                                read_buffer_= split(read_buffer_, cmd,'\n');
-                               lyxerr[Debug::LYXSERVER]
+                               LYXERR(Debug::LYXSERVER)
                                        << "LyXComm: status:" << status
                                        << ", read_buffer_:" << read_buffer_
                                        << ", cmd:" << cmd << endl;
@@ -292,9 +300,7 @@ void LyXComm::send(string const & msg)
                return;
        }
 
-       if (lyxerr.debugging(Debug::LYXSERVER)) {
-               lyxerr << "LyXComm: Sending '" << msg << '\'' << endl;
-       }
+       LYXERR(Debug::LYXSERVER) << "LyXComm: Sending '" << msg << '\'' << endl;
 
        if (pipename.empty()) return;
 
@@ -348,7 +354,7 @@ LyXServer::~LyXServer()
 
 void LyXServer::callback(LyXServer * serv, string const & msg)
 {
-       lyxerr[Debug::LYXSERVER] << "LyXServer: Received: '"
+       LYXERR(Debug::LYXSERVER) << "LyXServer: Received: '"
                                 << msg << '\'' << endl;
 
        char const * p = msg.c_str();
@@ -390,7 +396,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        if (*p) ++p;
                }
 
-               lyxerr[Debug::LYXSERVER]
+               LYXERR(Debug::LYXSERVER)
                        << "LyXServer: Client: '" << client
                        << "' Command: '" << cmd
                        << "' Argument: '" << arg << '\'' << endl;
@@ -404,7 +410,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                        if (cmd == "hello") {
                                // One more client
                                if (serv->numclients == MAX_CLIENTS) { //paranoid check
-                                       lyxerr[Debug::LYXSERVER]
+                                       LYXERR(Debug::LYXSERVER)
                                                << "LyXServer: too many clients..."
                                                << endl;
                                        return;
@@ -416,7 +422,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                serv->clients[i] = client;
                                serv->numclients++;
                                buf = "LYXSRV:" + client + ":hello\n";
-                               lyxerr[Debug::LYXSERVER]
+                               LYXERR(Debug::LYXSERVER)
                                        << "LyXServer: Greeting "
                                        << client << endl;
                                serv->pipes.send(buf);
@@ -430,12 +436,12 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
                                if (i < serv->numclients) {
                                        serv->numclients--;
                                        serv->clients[i].erase();
-                                       lyxerr[Debug::LYXSERVER]
+                                       LYXERR(Debug::LYXSERVER)
                                                << "LyXServer: Client "
                                                << client << " said goodbye"
                                                << endl;
                                } else {
-                                       lyxerr[Debug::LYXSERVER]
+                                       LYXERR(Debug::LYXSERVER)
                                                << "LyXServer: ignoring bye messge from unregistered client"
                                                << client << endl;
                                }
@@ -456,7 +462,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg)
 
 
                        serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
-                       string const rval = lyx::to_utf8(serv->func->getMessage());
+                       string const rval = to_utf8(serv->func->getMessage());
 
                        //modified june 1999 stefano@zool.su.se:
                        //all commands produce an INFO or ERROR message
@@ -495,3 +501,6 @@ void LyXServer::notifyClient(string const & s)
        string buf = string("NOTIFY:") + s + "\n";
        pipes.send(buf);
 }
+
+
+} // namespace lyx