Added events

1 files changed, 85 insertions, 2 deletions

diff --git a/comm/BusAccess.h b/comm/BusAccess.h
index e0bcdf1..7a4abed 100644
--- a/comm/BusAccess.h
+++ b/comm/BusAccess.h
@@ -18,9 +18,15 @@
 
 #include "Datagram.h"
 #include "Stream.h"
+#include "BufStream.h"
 #include "SignalHandler.h"
 #include "ccu/List.h"
 #include "ccu/IdTable.h"
+#include "ccu/String.h"
+#include "ccu/HashTable.h"
+#include "dnn/Event.h"
+#include "dnn/Trigger.h"
+
 
 class UchBusSubscription;
 class UchBusTrigger;
@@ -31,6 +37,7 @@ friend	class	UchBusAgent;
 
 protected:
 static	int	Version;
+	CcuString	Name;
 	sword	ListenPort;
 	sword	BroadcastPort;
 	UchStream*	Server;
@@ -39,14 +46,90 @@ static	int	Version;
 	CcuIdTableOf<UchBusTrigger>	IdToSubscription;
 
 	void	HandleRead ();
+	void	Clear ();
 	void	DeferredHandle (int);
 	void	HandleEvent (int, const char*);
+	bool	CheckUnicity (UchBusAgent*, sword);
 
 public:
-		UchBusAccess (sword);
+	DnnTrigger	NewAgents;
+
+		UchBusAccess (const char*, sword);
 		~UchBusAccess ();
-	void	Subscribe (DnnBaseReaction&, const char*);
+	void	Subscribe (DnnBaseReaction&, const char*, ...);
 	void	Emit (const char*, ...);
 };
 
+
+class UchBusAgent : public UchBufStream {
+friend	class	UchBusAccess;
+friend	class	UchBusServer;
+
+protected:
+	CcuListOf<UchBusSubscription>	RemoteSubscriptions;
+	sword	RemoteId;
+	UchBusAccess*	MyBus;
+	CcuString	Name;
+
+	void	WriteString (const char*);
+	void	ProcessLine (const char*);
+
+		UchBusAgent (int, UchBusAccess*);
+		UchBusAgent (const char*, sword, UchBusAccess*);
+		~UchBusAgent ();
+
+	void	HandleRead ();
+	void	SendLocalSubscription (const UchBusTrigger*);
+	void	SayHello ();
+	void	SayBye ();
+	void	EmitEvent (const char*);
+
+public:
+	DnnTrigger	Bye;
+	CcuHashedArrayOf<DnnTrigger>	DirectMsg;
+
+	void	Emit (int, const char*, ...);
+inline	const char*	GetName () const	{ return Name; }
+};
+
+class UchAgentEvent : public DnnEvent {
+public:
+static	DnnEventType*	BusNewAgent, *BusAgentBye;
+
+protected:
+	UchBusAgent*	Agent;
+
+public:
+		UchAgentEvent (UchBusAgent*, DnnEventType*);
+		~UchAgentEvent ();
+
+
+inline	UchBusAgent*	GetAgent () const	{ return Agent;}
+};
+
+
+class UchDirectEvent : public DnnEvent {
+public:
+	UchBusAgent*	Agent;
+	CcuString	Msg;
+
+public:
+		UchDirectEvent (UchBusAgent*, const char*);
+		~UchDirectEvent ();
+};
+
+
+
+class UchBusEvent : public DnnEvent {
+public:
+	CcuString	Regexp;
+	int	NbMatches;
+	CcuListOf<CcuString>	MatchList;
+	CcuString	Matches;
+
+		UchBusEvent (const char*, const char*);
+		~UchBusEvent ();
+};
+
+
 #endif	/* BusAccess_H_ */