Utilisateur : Fcolin Date : 6/08/03 Heure : 17:27 Archivé dans $/EScribe/Ivy Commentaire: (vss 6)

1 files changed, 31 insertions, 6 deletions

diff --git a/CSharp/Ivy/IvyPPC/Ivy.cs b/CSharp/Ivy/IvyPPC/Ivy.cs
index 47f427b..ed4c4aa 100644
--- a/CSharp/Ivy/IvyPPC/Ivy.cs
+++ b/CSharp/Ivy/IvyPPC/Ivy.cs
@@ -12,6 +12,7 @@ namespace IvyBus
 	using System.Net.Sockets;

 	using System.Threading;

 	using System.Configuration;

+	using System.Windows.Forms;

 	

 	/// <summary> The Main bus Class

 	/// </summary>

@@ -108,6 +109,8 @@ namespace IvyBus
 		internal Hashtable regexp_out;

 		internal String ready_message = null;

 		

+		// for synchronous event 

+		private Control syncControl = null;

 		/// <summary> Readies the structures for the software bus connexion.

 		/// </summary>

 		/// <example> This sample shows how to start working with Ivy.

@@ -141,6 +144,10 @@ namespace IvyBus
 			if ( debug_str != null ) 

 				debug = bool.Parse(debug_str);	

 		}

+		public Ivy(String name, String message, Control sync) :this( name, message ) 

+		{

+			syncControl = sync;	

+		}

 		

 		/// <summary> connects the Ivy bus to a domain or list of domains.

 		/// </summary>

@@ -371,23 +378,39 @@ namespace IvyBus
 		internal void FireDirectMessage (IvyClient app, int id, string arg )

 		{

 			if ( directMessageReceived != null )

-			directMessageReceived( app, id, arg);

+			{

+				if ( syncControl != null )

+					syncControl.Invoke( directMessageReceived, new object[]{app,id,arg});

+				else directMessageReceived( app, id, arg);

+			}

 		}

 		internal void FireClientConnected (IvyClient app)

 		{

 			if ( clientConnected != null )

-			clientConnected( app);

+			{

+				if ( syncControl != null )

+					syncControl.Invoke( clientConnected, new object[]{app});

+				else clientConnected( app);

+			}

 		}

 		internal void FireClientDisconnected (IvyClient app)

 		{

 			if ( clientDisconnected != null )

-				clientDisconnected( app);

+			{

+				if ( syncControl != null )

+					syncControl.Invoke( clientDisconnected, new object[]{app});

+				else clientDisconnected( app);

+			}

 		}

 		internal bool FireDie (IvyClient app, int id )

 		{

 			if ( dieReceived != null )

-				return dieReceived( app, id);

-			else return false;

+			{

+				if ( syncControl != null )

+				 syncControl.Invoke( dieReceived, new object[]{app,id});

+			 else return dieReceived( app, id);

+			}

+			return false;

 		}

 

 	

@@ -446,7 +469,9 @@ namespace IvyBus
 			{

 				throw new IvyException("(callCallback) Not regexp matching id " + key);

 			}

-			callback(client, tab);

+			if ( syncControl != null )

+				syncControl.Invoke( callback, new object[]{client,tab});

+			else callback(client, tab);

 		}

 		

 		private static String[] myTokenize(String s, String separator)