#include "funcrequest.h"
#include "LyXAction.h"
#include "lyxfunc.h"
+#include "frontends/Application.h"
+
+#include "support/filename.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
-#include "frontends/lyx_gui.h"
#include <boost/bind.hpp>
#include <cerrno>
-#include <sys/stat.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
#include <fcntl.h>
-#ifdef __EMX__
-#include <cstdlib>
-#include <io.h>
-#define OS2EMX_PLAIN_CHAR
-#define INCL_DOSNMPIPES
-#define INCL_DOSERRORS
-#include <os2.h>
-#include "support/os2_errortable.h"
-#endif
-using lyx::support::compare;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::unlink;
+namespace lyx {
+
+using support::compare;
+using support::FileName;
+using support::rtrim;
+using support::split;
+using support::unlink;
using std::endl;
using std::string;
-// provide an empty mkfifo() if we do not have one. This disables the
-// lyxserver.
-#ifndef HAVE_MKFIFO
-int mkfifo(char const * __path, mode_t __mode) {
- return 0;
+#if !defined (HAVE_MKFIFO)
+// We provide a stub class that disables the lyxserver.
+
+void LyXComm::openConnection()
+{}
+
+
+void LyXComm::closeConnection()
+{}
+
+
+int LyXComm::startPipe(string const & filename, bool write)
+{
+ return -1;
}
-#endif
+
+
+void LyXComm::endPipe(int & fd, string const & filename, bool write)
+{}
+
+
+void LyXComm::emergencyCleanup()
+{}
+
+void LyXComm::read_ready()
+{}
+
+
+void LyXComm::send(string const & msg)
+{}
+
+
+#else // defined (HAVE_MKFIFO)
void LyXComm::openConnection()
{
- lyxerr[Debug::LYXSERVER] << "LyXComm: Opening connection" << endl;
+ LYXERR(Debug::LYXSERVER) << "LyXComm: Opening connection" << endl;
// If we are up, that's an error
if (ready) {
ready = false;
if (pipename.empty()) {
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXComm: server is disabled, nothing to do"
<< endl;
return;
// We made it!
ready = true;
- lyxerr[Debug::LYXSERVER] << "LyXComm: Connection established" << endl;
+ LYXERR(Debug::LYXSERVER) << "LyXComm: Connection established" << endl;
}
/// Close pipes
void LyXComm::closeConnection()
{
- lyxerr[Debug::LYXSERVER] << "LyXComm: Closing connection" << endl;
+ LYXERR(Debug::LYXSERVER) << "LyXComm: Closing connection" << endl;
if (pipename.empty()) {
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXComm: server is disabled, nothing to do"
<< endl;
return;
}
-int LyXComm::startPipe(string const & filename, bool write)
+int LyXComm::startPipe(string const & file, bool write)
{
- int fd;
-
-#ifdef __EMX__
- HPIPE os2fd;
- APIRET rc;
- int errnum;
- // Try create one instance of named pipe with the mode O_RDONLY|O_NONBLOCK.
- // The current emx implementation of access() won't work with pipes.
- rc = DosCreateNPipe(filename.c_str(), &os2fd, NP_ACCESS_INBOUND,
- NP_NOWAIT|0x01, 0600, 0600, 0);
- if (rc == ERROR_PIPE_BUSY) {
- lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
- << "If no other LyX program is active, please delete"
- " the pipe by hand and try again." << endl;
- pipename.erase();
- return -1;
- }
-
- if (rc != NO_ERROR) {
- errnum = TranslateOS2Error(rc);
- lyxerr <<"LyXComm: Could not create pipe " << filename
- << strerror(errnum) << endl;
- return -1;
- };
- // Listen to it.
- rc = DosConnectNPipe(os2fd);
- if (rc != NO_ERROR && rc != ERROR_PIPE_NOT_CONNECTED) {
- errnum = TranslateOS2Error(rc);
- lyxerr <<"LyXComm: Could not create pipe " << filename
- << strerror(errnum) << endl;
- return -1;
- };
- // Imported handles can be used both with OS/2 APIs and emx
- // library functions.
- fd = _imphandle(os2fd);
-#else
- if (::access(filename.c_str(), F_OK) == 0) {
+ FileName const filename(file);
+ if (::access(filename.toFilesystemEncoding().c_str(), F_OK) == 0) {
lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
<< "If no other LyX program is active, please delete"
" the pipe by hand and try again." << endl;
return -1;
}
- if (::mkfifo(filename.c_str(), 0600) < 0) {
+ if (::mkfifo(filename.toFilesystemEncoding().c_str(), 0600) < 0) {
lyxerr << "LyXComm: Could not create pipe " << filename << '\n'
<< strerror(errno) << endl;
return -1;
};
- fd = ::open(filename.c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
-#endif
+ int const fd = ::open(filename.toFilesystemEncoding().c_str(),
+ write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK));
if (fd < 0) {
lyxerr << "LyXComm: Could not open pipe " << filename << '\n'
}
if (!write) {
- lyx_gui::register_socket_callback(fd, boost::bind(&LyXComm::read_ready, this));
+ theApp()->registerSocketCallback(fd,
+ boost::bind(&LyXComm::read_ready, this));
}
return fd;
return;
if (!write) {
- lyx_gui::unregister_socket_callback(fd);
+ theApp()->unregisterSocketCallback(fd);
}
-#ifdef __EMX__
- APIRET rc;
- int errnum;
-
- rc = DosDisConnectNPipe(fd);
- if (rc != NO_ERROR) {
- errnum = TranslateOS2Error(rc);
- lyxerr << "LyXComm: Could not disconnect pipe " << filename
- << '\n' << strerror(errnum) << endl;
- return;
- }
-#endif
-
if (::close(fd) < 0) {
lyxerr << "LyXComm: Could not close pipe " << filename
<< '\n' << strerror(errno) << endl;
}
-// OS/2 pipes are deleted automatically
-#ifndef __EMX__
- if (unlink(filename) < 0) {
+ if (unlink(FileName(filename)) < 0) {
lyxerr << "LyXComm: Could not remove pipe " << filename
<< '\n' << strerror(errno) << endl;
};
-#endif
fd = -1;
}
// the delim /wasn't/ found. ?:-P
string cmd;
read_buffer_= split(read_buffer_, cmd,'\n');
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXComm: status:" << status
<< ", read_buffer_:" << read_buffer_
<< ", cmd:" << cmd << endl;
return;
}
- if (lyxerr.debugging(Debug::LYXSERVER)) {
- lyxerr << "LyXComm: Sending '" << msg << '\'' << endl;
- }
+ LYXERR(Debug::LYXSERVER) << "LyXComm: Sending '" << msg << '\'' << endl;
if (pipename.empty()) return;
closeConnection();
openConnection();
}
-#ifdef __EMX__
- APIRET rc;
- int errnum;
- rc = DosResetBuffer(outfd); // To avoid synchronization problems.
- if (rc != NO_ERROR) {
- errnum = TranslateOS2Error(rc);
- lyxerr << "LyXComm: Message could not be flushed: " << msg
- << '\n' << strerror(errnum) << endl;
- }
-#endif
}
+#endif // defined (HAVE_MKFIFO)
+
string const LyXComm::inPipeName() const
{
void LyXServer::callback(LyXServer * serv, string const & msg)
{
- lyxerr[Debug::LYXSERVER] << "LyXServer: Received: '"
+ LYXERR(Debug::LYXSERVER) << "LyXServer: Received: '"
<< msg << '\'' << endl;
char const * p = msg.c_str();
if (*p) ++p;
}
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXServer: Client: '" << client
<< "' Command: '" << cmd
<< "' Argument: '" << arg << '\'' << endl;
if (cmd == "hello") {
// One more client
if (serv->numclients == MAX_CLIENTS) { //paranoid check
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXServer: too many clients..."
<< endl;
return;
serv->clients[i] = client;
serv->numclients++;
buf = "LYXSRV:" + client + ":hello\n";
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXServer: Greeting "
<< client << endl;
serv->pipes.send(buf);
if (i < serv->numclients) {
serv->numclients--;
serv->clients[i].erase();
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXServer: Client "
<< client << " said goodbye"
<< endl;
} else {
- lyxerr[Debug::LYXSERVER]
+ LYXERR(Debug::LYXSERVER)
<< "LyXServer: ignoring bye messge from unregistered client"
<< client << endl;
}
serv->func->dispatch(FuncRequest(lyxaction.lookupFunc(cmd), arg));
- string const rval = serv->func->getMessage();
+ string const rval = to_utf8(serv->func->getMessage());
//modified june 1999 stefano@zool.su.se:
//all commands produce an INFO or ERROR message
string buf = string("NOTIFY:") + s + "\n";
pipes.send(buf);
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff