X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.C;h=ba1da6c533fc35389736577ac23de65d92d59b88;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=ad743460a1ac0072500370ec80d551c8b35e2dd8;hpb=201e5bdf707317be29e9b7476e2b97a34e2d0b48;p=lyx.git diff --git a/src/lyxserver.C b/src/lyxserver.C index ad743460a1..ba1da6c533 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -44,9 +44,11 @@ #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 @@ -56,20 +58,14 @@ #endif #include -#ifdef __EMX__ -# include -# include -# define OS2EMX_PLAIN_CHAR -# define INCL_DOSNMPIPES -# define INCL_DOSERRORS -# include -# 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; @@ -173,43 +169,10 @@ void LyXComm::closeConnection() } -int LyXComm::startPipe(string const & filename, bool write) +int LyXComm::startPipe(string const & file, bool write) { -#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. - int const 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; @@ -217,14 +180,13 @@ int LyXComm::startPipe(string const & filename, bool write) 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; }; - int const fd = ::open(filename.c_str(), + int const fd = ::open(filename.toFilesystemEncoding().c_str(), write ? (O_RDWR) : (O_RDONLY|O_NONBLOCK)); -#endif if (fd < 0) { lyxerr << "LyXComm: Could not open pipe " << filename << '\n' @@ -234,7 +196,8 @@ int LyXComm::startPipe(string const & filename, bool write) } 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; @@ -247,34 +210,18 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write) 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; } @@ -369,16 +316,6 @@ void LyXComm::send(string const & msg) 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) @@ -527,7 +464,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) 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 @@ -566,3 +503,6 @@ void LyXServer::notifyClient(string const & s) string buf = string("NOTIFY:") + s + "\n"; pipes.send(buf); } + + +} // namespace lyx