X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=a6213f9deefe2fce95e8559d0ff8c1d7d8daef65;hb=d13d6da879462707cd947cdf00c0cf7c3dfac924;hp=db90e4619032e6d726c2810092531afce1c5deb2;hpb=98324cb046087c6e976146f2e9240920532d7eb7;p=lyx.git diff --git a/src/lyxserver.C b/src/lyxserver.C index db90e46190..a6213f9dee 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -1,12 +1,15 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor +/** + * \file lyxserver.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author Angus Leeming + * \author John Levon * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ /** Docu : To use the lyxserver define the name of the pipe in your @@ -36,25 +39,21 @@ #include -#include -#include -#include -#include -#include -#include FORMS_H_LOCATION - -#ifdef __GNUG__ -#pragma implementation -#endif - #include "lyxserver.h" -#include "lyx_main.h" #include "debug.h" +#include "funcrequest.h" +#include "LyXAction.h" #include "lyxfunc.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "frontends/lyx_gui.h" +#include + +#include +#include +#include + #ifdef __EMX__ #include #include @@ -65,7 +64,14 @@ #include "support/os2_errortable.h" #endif +using lyx::support::compare; +using lyx::support::rtrim; +using lyx::support::split; +using lyx::support::unlink; + using std::endl; +using std::string; + // provide an empty mkfifo() if we do not have one. This disables the // lyxserver. @@ -99,7 +105,7 @@ void LyXComm::openConnection() return; if ((outfd = startPipe(outPipeName(), true)) == -1) { - endPipe(infd, inPipeName()); + endPipe(infd, inPipeName(), false); return; } @@ -132,16 +138,15 @@ void LyXComm::closeConnection() return; } - endPipe(infd, inPipeName()); - endPipe(outfd, outPipeName()); + endPipe(infd, inPipeName(), false); + endPipe(outfd, outPipeName(), true); ready = false; } + int LyXComm::startPipe(string const & filename, bool write) { - int fd; - #ifdef __EMX__ HPIPE os2fd; APIRET rc; @@ -174,7 +179,7 @@ int LyXComm::startPipe(string const & filename, bool write) }; // Imported handles can be used both with OS/2 APIs and emx // library functions. - fd = _imphandle(os2fd); + int const fd = _imphandle(os2fd); #else if (::access(filename.c_str(), F_OK) == 0) { lyxerr << "LyXComm: Pipe " << filename << " already exists.\n" @@ -189,29 +194,34 @@ int LyXComm::startPipe(string const & filename, bool write) << strerror(errno) << endl; return -1; }; - fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK)); + int const fd = ::open(filename.c_str(), + write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK)); #endif if (fd < 0) { lyxerr << "LyXComm: Could not open pipe " << filename << '\n' << strerror(errno) << endl; - lyx::unlink(filename); + unlink(filename); return -1; } if (!write) { - lyx_gui::set_read_callback(fd, this); + lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this)); } return fd; } -void LyXComm::endPipe(int & fd, string const & filename) +void LyXComm::endPipe(int & fd, string const & filename, bool write) { if (fd < 0) return; + if (!write) { + lyx_gui::unregister_socket_callback(fd); + } + #ifdef __EMX__ APIRET rc; int errnum; @@ -232,7 +242,7 @@ void LyXComm::endPipe(int & fd, string const & filename) // OS/2 pipes are deleted automatically #ifndef __EMX__ - if (lyx::unlink(filename) < 0) { + if (unlink(filename) < 0) { lyxerr << "LyXComm: Could not remove pipe " << filename << '\n' << strerror(errno) << endl; }; @@ -245,8 +255,8 @@ void LyXComm::endPipe(int & fd, string const & filename) void LyXComm::emergencyCleanup() { if (!pipename.empty()) { - endPipe(infd, inPipeName()); - endPipe(outfd, outPipeName()); + endPipe(infd, inPipeName(), false); + endPipe(outfd, outPipeName(), true); } } @@ -254,31 +264,30 @@ void LyXComm::emergencyCleanup() // Receives messages and sends then to client void LyXComm::read_ready() { - if (lyxerr.debugging(Debug::LYXSERVER)) { - lyxerr << "LyXComm: Receiving from fd " << infd << endl; - } + // nb! make read_buffer_ a class-member for multiple sessions + static string read_buffer_; + read_buffer_.erase(); - int const CMDBUFLEN = 100; - char charbuf[CMDBUFLEN]; - string cmd; -// nb! make lsbuf a class-member for multiple sessions - static string lsbuf; + int const charbuf_size = 100; + char charbuf[charbuf_size]; errno = 0; int status; // the single = is intended here. - while ((status = read(infd, charbuf, CMDBUFLEN-1))) { + while ((status = ::read(infd, charbuf, charbuf_size - 1))) { + if (status > 0) { - charbuf[status]= '\0'; // turn it into a c string - lsbuf += strip(charbuf, '\r'); + charbuf[status] = '\0'; // turn it into a c string + read_buffer_ += rtrim(charbuf, "\r"); // commit any commands read - while (lsbuf.find('\n') != string::npos) { + while (read_buffer_.find('\n') != string::npos) { // split() grabs the entire string if // the delim /wasn't/ found. ?:-P - lsbuf= split(lsbuf, cmd,'\n'); + string cmd; + read_buffer_= split(read_buffer_, cmd,'\n'); lyxerr[Debug::LYXSERVER] << "LyXComm: status:" << status - << ", lsbuf:" << lsbuf + << ", read_buffer_:" << read_buffer_ << ", cmd:" << cmd << endl; if (!cmd.empty()) clientcb(client, cmd); @@ -291,18 +300,20 @@ void LyXComm::read_ready() } if (errno != 0) { lyxerr << "LyXComm: " << strerror(errno) << endl; - if (!lsbuf.empty()) - { - lyxerr << "LyxComm: truncated command: " - << lsbuf << endl; - lsbuf.erase(); + if (!read_buffer_.empty()) { + lyxerr << "LyXComm: truncated command: " + << read_buffer_ << endl; + read_buffer_.erase(); } break; // reset connection } } + + // The connection gets reset in errno != EAGAIN + // Why does it need to be reset if errno == 0? closeConnection(); openConnection(); - errno= 0; + errno = 0; } @@ -343,6 +354,18 @@ void LyXComm::send(string const & msg) } +string const LyXComm::inPipeName() const +{ + return pipename + string(".in"); +} + + +string const LyXComm::outPipeName() const +{ + return pipename + string(".out"); +} + + // LyXServer class LyXServer::~LyXServer() @@ -382,7 +405,8 @@ void LyXServer::callback(LyXServer * serv, string const & msg) if (compare(p, "LYXSRV:", 7) == 0) { server_only = true; } else if (0 != compare(p, "LYXCMD:", 7)) { - lyxerr << "LyXServer: Unknown request \"" << p << "\"" << endl; + lyxerr << "LyXServer: Unknown request \"" + << p << '"' << endl; return; } p += 7; @@ -458,7 +482,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) } } else { lyxerr <<"LyXServer: Undefined server command " - << cmd << "." << endl; + << cmd << '.' << endl; } return; } @@ -472,9 +496,9 @@ void LyXServer::callback(LyXServer * serv, string const & msg) // support currently. (Lgb) - serv->func->dispatch(cmd + ' ' + arg); + serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg)); string const rval = serv->func->getMessage(); - + //modified june 1999 stefano@zool.su.se: //all commands produce an INFO or ERROR message //in the output pipe, even if they do not return @@ -484,7 +508,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) buf = "ERROR:"; else buf = "INFO:"; - buf += client + ":" + cmd + ":" + rval + "\n"; + buf += client + ':' + cmd + ':' + rval + '\n'; serv->pipes.send(buf); // !!! we don't do any error checking - @@ -500,7 +524,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) /* ---F+------------------------------------------------------------------ *\ - Function : LyxNotifyClient + Function : LyXNotifyClient Called by : WorkAreaKeyPress Purpose : send a notify messge to a client Parameters: s - string to send