X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.h;h=9390f5e23d012e17a03c3b31e1a183222b0f3ce3;hb=8cb2e519b3975cc643f2c93706137cf2e6a4f4d8;hp=761222a6700f66e30c53b4a26f6cae9842780a7a;hpb=2391d73a2c6091d19d1628c380d5c8f1006b5e6a;p=lyx.git diff --git a/src/lyxserver.h b/src/lyxserver.h index 761222a670..9390f5e23d 100644 --- a/src/lyxserver.h +++ b/src/lyxserver.h @@ -1,13 +1,13 @@ // -*- C++ -*- /* This file is part of -* ====================================================== +* ====================================================== * * LyX, The Document Processor * -* Copyright (C) 1995 Matthias Ettrich -* Copyright (C) 1995-1998 The LyX Team. +* Copyright 1995 Matthias Ettrich +* Copyright 1995-2000 The LyX Team. * -*======================================================*/ +* ====================================================== */ #ifndef LYXSERVER_H #define LYXSERVER_H @@ -29,8 +29,7 @@ class LyXServer; This class encapsulates all the dirty communication and thus provides a clean string interface. */ -class LyXComm -{ +class LyXComm { public: /** When we receive a message, we send it to a client. This is one of the small things that would have been a lot @@ -39,9 +38,8 @@ public: typedef void (*ClientCallbackfct)(LyXServer *, string const &); /// Construct with pipe-basename and callback to receive messages - LyXComm(string const &pip, LyXServer * cli, ClientCallbackfct ccb = 0) - :pipename(pip), client(cli), clientcb(ccb) - { + LyXComm(string const & pip, LyXServer * cli, ClientCallbackfct ccb = 0) + : pipename(pip), client(cli), clientcb(ccb) { ready = false; openConnection(); } @@ -53,6 +51,10 @@ public: /// Send message void send(string const &); + + /// We receive messages via XForms through this callback + static void callback(int fd, void *v); + private: /// Open pipes void openConnection(); @@ -60,9 +62,6 @@ private: /// Close pipes void closeConnection(); - /// We receive messages via XForms through this callback - static void callback(int fd, void *v); - /// This is -1 if not open int infd; @@ -84,22 +83,22 @@ private: /* --- prototypes -------------------------------------------------------- */ -class LyXServer -{ +/// +class LyXServer { public: // FIXME IN 0.13 // Hack! This should be changed in 0.13 - /// The lyx server should not take an argument "LyXFunc" but this is + // The lyx server should not take an argument "LyXFunc" but this is // how it will be done for 0.12. In 0.13 we must write a non-gui // bufferview. // IMO lyxserver is atypical, and for the moment the only one, non-gui // bufferview. We just have to find a way to handle situations like if // lyxserver is using a buffer that is being edited with a bufferview. // With a common buffer list this is not a problem, maybe. (Alejandro) - LyXServer(LyXFunc *f, string const &pip) - : numclients(0), func(f), pipes(pip, (this), callback) - { } + /// + LyXServer(LyXFunc * f, string const & pip) + : numclients(0), func(f), pipes(pip, (this), callback) {} /// ~LyXServer(); /// @@ -108,11 +107,16 @@ private: /// static void callback(LyXServer *, string const & msg); /// Names and number of current clients - enum { MAX_CLIENTS = 10 }; + enum { + /// + MAX_CLIENTS = 10 + }; + /// string clients[MAX_CLIENTS]; + /// int numclients; /// - LyXFunc *func; + LyXFunc * func; /// LyXComm pipes; };