X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flyxserver.C;h=b6c3e96d28a06ac8e085fe3701900406e0386ee7;hb=8555881d19d77b32315661699fab31a82d3833ab;hp=a3d781edadf3555f0ab80803d6a2a789531bbe65;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/lyxserver.C b/src/lyxserver.C index a3d781edad..b6c3e96d28 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -41,7 +41,6 @@ #include #include #include -#include FORMS_H_LOCATION #ifdef __GNUG__ #pragma implementation @@ -50,10 +49,10 @@ #include "lyxserver.h" #include "lyx_main.h" #include "debug.h" -#include "LyXAction.h" #include "lyxfunc.h" #include "support/lstrings.h" #include "support/lyxlib.h" +#include "frontends/lyx_gui.h" #ifdef __EMX__ #include @@ -76,26 +75,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 +98,7 @@ void LyXComm::openConnection() return; if ((outfd = startPipe(outPipeName(), true)) == -1) { - endPipe(infd, inPipeName()); + endPipe(infd, inPipeName(), false); return; } @@ -152,8 +131,8 @@ void LyXComm::closeConnection() return; } - endPipe(infd, inPipeName()); - endPipe(outfd, outPipeName()); + endPipe(infd, inPipeName(), false); + endPipe(outfd, outPipeName(), true); ready = false; } @@ -219,18 +198,23 @@ int LyXComm::startPipe(string const & filename, bool write) 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; @@ -264,75 +248,63 @@ 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); - - if (lyxerr.debugging(Debug::LYXSERVER)) { - lyxerr << "LyXComm: Receiving from fd " << fd << endl; - } + // nb! make read_buffer_ a class-member for multiple sessions + static string read_buffer_; + read_buffer_.erase(); - 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'); - // commit any commands read - while (lsbuf.find('\n') != string::npos) // while still - // commands - // left - { - // split() grabs the entire string if - // the delim /wasn't/ found. ?:-P - lsbuf= split(lsbuf, cmd,'\n'); - lyxerr[Debug::LYXSERVER] - << "LyXComm: status:" << status - << ", lsbuf:" << lsbuf - << ", cmd:" << cmd << endl; - if (!cmd.empty()) - c->clientcb(c->client, cmd); - //\n or not \n? + 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"); + + } else if (errno != EAGAIN) { + if (!read_buffer_.empty()) { + lyxerr << "LyXComm: truncated command: " + << read_buffer_ << '\n' + << "Resetting connection" << endl; + read_buffer_.erase(); } + + // reset connection + closeConnection(); + openConnection(); + break; + + } else { + // errno == EAGAIN + // Nothing new has arrived, so now's the time + // to tell the outside world if there's anything + // in the read buffer. + break; } - 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. - errno = 0; - return; // up to libforms select-loop (*crunch*) - } - if (errno != 0) - { - lyxerr << "LyXComm: " << strerror(errno) << endl; - if (!lsbuf.empty()) - { - lyxerr << "LyxComm: truncated command: " - << lsbuf << endl; - lsbuf.erase(); - } - break; // reset connection - } } - c->closeConnection(); - c->openConnection(); - errno= 0; + + if (!read_buffer_.empty()) { + read_buffer_ = rtrim(read_buffer_, "\n"); + lyxerr[Debug::LYXSERVER] + << "LyXComm: Received from fd " + << infd << '\n' + << '\"' << read_buffer_ << '\"' << endl; + clientcb(client, read_buffer_); + } + + errno = 0; } @@ -501,25 +473,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(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 +502,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