X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxserver.h;h=3a3c180776645a62becc439539e62da77a7c8afd;hb=ac103f15a7cead429a7b2ee1f75d67cc988ec81d;hp=4311aba232cb846cbf062c46b2adfe6e7d02ff0e;hpb=8488e475a67fe5ba76730bca213230ba9a75b9a5;p=lyx.git

diff --git a/src/lyxserver.h b/src/lyxserver.h
index 4311aba232..3a3c180776 100644
--- a/src/lyxserver.h
+++ b/src/lyxserver.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
-* ====================================================== 
-* 
+* ======================================================
+*
 *           LyX, The Document Processor
-*        
+*
 *           Copyright 1995 Matthias Ettrich
 *           Copyright 1995-2001 The LyX Team.
 *
@@ -17,6 +17,9 @@
 #endif
 
 #include "LString.h"
+
+#include <boost/signals/trackable.hpp>
+ 
 class LyXFunc;
 class LyXServer;
 
@@ -29,7 +32,7 @@ class LyXServer;
  This class encapsulates all the dirty communication and thus provides
  a clean string interface.
  */
-class LyXComm {
+class LyXComm : public boost::signals::trackable {
 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
@@ -51,26 +54,36 @@ public:
 
 	/// clean up in emergency
 	void emergencyCleanup();
- 
+
 	/// Send message
 	void send(string const &);
 
-	/// We receive messages via XForms through this callback
-	static void callback(int fd, void *v);
+	/// asynch ready-to-be-read notification
+	void read_ready();
 
 private:
+	/// the filename of the in pipe
+	string const inPipeName() {
+		return pipename + ".in";
+	}
+
+	/// the filename of the out pipe
+	string const outPipeName() {
+		return pipename + ".out";
+	}
+
 	/// Open pipes
 	void openConnection();
-	
+
 	/// Close pipes
 	void closeConnection();
 
 	/// start a pipe
-	int startPipe(string const &);
- 
+	int startPipe(string const &, bool);
+
 	/// finish a pipe
-	void endPipe(int, string const &);
- 
+	void endPipe(int &, string const &, bool);
+
 	/// This is -1 if not open
 	int infd;
 
@@ -101,23 +114,23 @@ public:
 	// 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)
+	// 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();
 	///
 	void notifyClient(string const &);
-	
+
 	/// whilst crashing etc.
 	void emergencyCleanup() {
 		pipes.emergencyCleanup();
 	}
- 
+
 private:
 	///
 	static void callback(LyXServer *, string const & msg);