#include "frontends/Application.h"
#include "support/environment.h"
+#include "support/filename.h"
#include "support/lyxlib.h"
#include "support/socktools.h"
using std::string;
+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.
LyXServerSocket::LyXServerSocket(LyXFunc * f, string const & addr)
: func(f),
- fd_(lyx::support::socktools::listen(addr, 3)),
+ fd_(support::socktools::listen(addr, 3)),
address_(addr)
{
if (fd_ == -1) {
// These env vars are used by DVI inverse search
// Needed by xdvi
- lyx::support::setEnv("XEDITOR", "lyxclient -g %f %l");
+ support::setEnv("XEDITOR", "lyxclient -g %f %l");
// Needed by lyxclient
- lyx::support::setEnv("LYXSOCKET", address_);
+ support::setEnv("LYXSOCKET", address_);
- theApp->registerSocketCallback(
+ theApp()->registerSocketCallback(
fd_,
boost::bind(&LyXServerSocket::serverCallback, this)
);
- lyxerr[Debug::LYXSERVER] << "lyx: New server socket "
+ LYXERR(Debug::LYXSERVER) << "lyx: New server socket "
<< fd_ << ' ' << address_ << endl;
}
LyXServerSocket::~LyXServerSocket()
{
if (fd_ != -1) {
- theApp->unregisterSocketCallback(fd_);
+ BOOST_ASSERT (theApp());
+ theApp()->unregisterSocketCallback(fd_);
if (::close(fd_) != 0)
lyxerr << "lyx: Server socket " << fd_
<< " IO error on closing: " << strerror(errno);
}
- lyx::support::unlink(address_);
- lyxerr[Debug::LYXSERVER] << "lyx: Server socket quitting" << endl;
+ support::unlink(support::FileName(address_));
+ LYXERR(Debug::LYXSERVER) << "lyx: Server socket quitting" << endl;
}
// is OK and if the number of clients does not exceed MAX_CLIENTS
void LyXServerSocket::serverCallback()
{
- int const client_fd = lyx::support::socktools::accept(fd_);
+ int const client_fd = support::socktools::accept(fd_);
if (fd_ == -1) {
- lyxerr[Debug::LYXSERVER] << "lyx: Failed to accept new client"
+ LYXERR(Debug::LYXSERVER) << "lyx: Failed to accept new client"
<< endl;
return;
}
// Register the new client.
clients[client_fd] =
shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
- theApp->registerSocketCallback(
+ theApp()->registerSocketCallback(
client_fd,
boost::bind(&LyXServerSocket::dataCallback,
this, client_fd)
if (key == "LYXCMD") {
string const cmd = line.substr(pos + 1);
func->dispatch(lyxaction.lookupFunc(cmd));
- string const rval = lyx::to_utf8(func->getMessage());
+ string const rval = to_utf8(func->getMessage());
if (func->errorStat()) {
client->writeln("ERROR:" + cmd + ':' + rval);
} else {
LyXDataSocket::LyXDataSocket(int fd)
: fd_(fd), connected_(true)
{
- lyxerr[Debug::LYXSERVER] << "lyx: New data socket " << fd_ << endl;
+ LYXERR(Debug::LYXSERVER) << "lyx: New data socket " << fd_ << endl;
}
lyxerr << "lyx: Data socket " << fd_
<< " IO error on closing: " << strerror(errno);
- theApp->unregisterSocketCallback(fd_);
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_ << " quitting."
+ theApp()->unregisterSocketCallback(fd_);
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_ << " quitting."
<< endl;
}
// Error conditions. The buffer must still be
// processed for lines read
if (count == 0) { // EOF -- connection closed
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
<< ": connection closed." << endl;
connected_ = false;
} else if ((count == -1) && (errno != EAGAIN)) { // IO error
// Cut a line from buffer
string::size_type pos = buffer_.find('\n');
if (pos == string::npos) {
- lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_
+ LYXERR(Debug::LYXSERVER) << "lyx: Data socket " << fd_
<< ": line not completed." << endl;
return false; // No complete line stored
}
connected_ = false;
}
}
+
+
+} // namespace lyx