X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=d258cb5474e5621c99c32672b106137bedb602c0;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=a3d781edadf3555f0ab80803d6a2a789531bbe65;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/lyxserver.C b/src/lyxserver.C index a3d781edad..d258cb5474 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,24 +39,18 @@ #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 #ifdef __EMX__ #include @@ -65,7 +62,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. @@ -76,26 +80,6 @@ int mkfifo(char const * __path, mode_t __mode) { #endif -/* === variables ========================================================= */ - -extern LyXAction lyxaction; - - -extern "C" { - - // C wrapper - static - void C_LyXComm_callback(int fd, void *v) - { - LyXComm::callback(fd, v); - } - -} - - -// LyXComm class - -// Open pipes void LyXComm::openConnection() { lyxerr[Debug::LYXSERVER] << "LyXComm: Opening connection" << endl; @@ -119,7 +103,7 @@ void LyXComm::openConnection() return; if ((outfd = startPipe(outPipeName(), true)) == -1) { - endPipe(infd, inPipeName()); + endPipe(infd, inPipeName(), false); return; } @@ -152,12 +136,13 @@ 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; @@ -215,22 +200,27 @@ int LyXComm::startPipe(string const & filename, bool write) if (fd < 0) { lyxerr << "LyXComm: Could not open pipe " << filename << '\n' << strerror(errno) << endl; - lyx::unlink(filename); + unlink(filename); return -1; } - if (!write) - fl_add_io_callback(fd, FL_READ, C_LyXComm_callback, this); + if (!write) { + lyx_gui::set_read_callback(fd, 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::remove_read_callback(fd); + } + #ifdef __EMX__ APIRET rc; int errnum; @@ -251,7 +241,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; }; @@ -264,75 +254,65 @@ 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); } } // Receives messages and sends then to client -void LyXComm::callback(int fd, void *v) +void LyXComm::read_ready() { - LyXComm * c = static_cast(v); + // nb! make read_buffer_ a class-member for multiple sessions + static string read_buffer_; + read_buffer_.erase(); - if (lyxerr.debugging(Debug::LYXSERVER)) { - lyxerr << "LyXComm: Receiving from fd " << fd << endl; - } - - const int 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(fd, charbuf, CMDBUFLEN-1))) - {// break and return in loop - if (status > 0) // got something - { - charbuf[status]= '\0'; // turn it into a c string - lsbuf += strip(charbuf, '\r'); + while ((status = ::read(infd, charbuf, charbuf_size - 1))) { + + if (status > 0) { + 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 still - // commands - // left - { + 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()) - c->clientcb(c->client, cmd); + clientcb(client, cmd); //\n or not \n? } } - if (errno == EAGAIN) - { // EAGAIN is not really an error , it means we're - // only reading too fast for the writing process on - // the other end of the pipe. + if (errno == EAGAIN) { errno = 0; - return; // up to libforms select-loop (*crunch*) + return; } - if (errno != 0) - { + 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 } } - c->closeConnection(); - c->openConnection(); - errno= 0; + + // The connection gets reset in errno != EAGAIN + // Why does it need to be reset if errno == 0? + closeConnection(); + openConnection(); + errno = 0; } @@ -412,7 +392,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; @@ -488,7 +469,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) } } else { lyxerr <<"LyXServer: Undefined server command " - << cmd << "." << endl; + << cmd << '.' << endl; } return; } @@ -501,25 +482,20 @@ void LyXServer::callback(LyXServer * serv, string const & msg) // connect to the lyxfunc in the single LyXView we // support currently. (Lgb) - kb_action action = static_cast(lyxaction.LookupFunc(cmd)); - //int action = -1; - string rval, buf; - if (action>= 0) { - rval = serv->func->dispatch(action, arg); - } else { - rval = "Unknown command"; - } + serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg)); + string const rval = serv->func->getMessage(); - //modified june 1999 stefano@zool.su.se: + //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 //anything. See chapter 4 of Customization doc. - if (action<0 || serv->func->errorStat()) + string buf; + if (serv->func->errorStat()) buf = "ERROR:"; else buf = "INFO:"; - buf += string(client) + ":" + cmd + ":" + rval + "\n"; + buf += client + ':' + cmd + ':' + rval + '\n'; serv->pipes.send(buf); // !!! we don't do any error checking - @@ -535,7 +511,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