#include <unistd.h>
#include <fcntl.h>
#include <cerrno>
-#include FORMS_H_LOCATION
#ifdef __GNUG__
#pragma implementation
#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 <cstdlib>
#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;
return;
if ((outfd = startPipe(outPipeName(), true)) == -1) {
- endPipe(infd, inPipeName());
+ endPipe(infd, inPipeName(), false);
return;
}
return;
}
- endPipe(infd, inPipeName());
- endPipe(outfd, outPipeName());
+ endPipe(infd, inPipeName(), false);
+ endPipe(outfd, outPipeName(), true);
ready = false;
}
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;
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<LyXComm*>(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;
}
// connect to the lyxfunc in the single LyXView we
// support currently. (Lgb)
- kb_action action = static_cast<kb_action>(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 -
/* ---F+------------------------------------------------------------------ *\
- Function : LyxNotifyClient
+ Function : LyXNotifyClient
Called by : WorkAreaKeyPress
Purpose : send a notify messge to a client
Parameters: s - string to send
projects / lyx.git / blobdiff