version relookee en ivy

11 files changed, 42 insertions, 85 deletions

diff --git a/src/Makefile b/src/Makefile
index c61c797..2ae8a26 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,32 +1,32 @@
 XTINC =-I/usr/X11R6/include
 XTLIB =-L/usr/X11R6/lib 
 CC=gcc -g -DDEBUG
-OBJ = busloop.o timer.o bussocket.o bus.o 
-GOBJ = busloop.o timer.o bussocket.o gbus.o
-XTOBJ = busxtloop.o bussocket.o bus.o
+OBJ = ivyloop.o timer.o ivysocket.o ivy.o 
+GOBJ = ivyloop.o timer.o ivysocket.o givy.o
+XTOBJ = ivyxtloop.o ivysocket.o ivy.o
 
-all: libbus.a libgbus.a libxtbus.a testbus testxtbus
+all: libivy.a libgivy.a libxtivy.a testivy testxtivy
 
-gbus.o: bus.c
-	$(CC) -DGNU_REGEXP -c $(CFLAGS) -o gbus.o bus.c
+givy.o: ivy.c
+	$(CC) -DGNU_REGEXP -c $(CFLAGS) -o givy.o ivy.c
 
 
-testbus: testbus.o $(OBJ)
-	$(CC) -o testbus testbus.o $(OBJ)
+testivy: testivy.o $(OBJ)
+	$(CC) -o testivy testivy.o $(OBJ)
  
-testxtbus.o : testbus.c
-	$(CC) -c testbus.c -o testxtbus.o $(XTINC) -DXTMAINLOOP
+testxtivy.o : testivy.c
+	$(CC) -c testivy.c -o testxtivy.o $(XTINC) -DXTMAINLOOP
 
-testxtbus: testxtbus.o $(XTOBJ)
-	$(CC) -o testxtbus testxtbus.o $(XTOBJ) $(XTLIB) -lXt -lX11
+testxtivy: testxtivy.o $(XTOBJ)
+	$(CC) -o testxtivy testxtivy.o $(XTOBJ) $(XTLIB) -lXt -lX11
 
-libbus.a: $(OBJ)
-	ar q libbus.a $(OBJ)
+libivy.a: $(OBJ)
+	ar q libivy.a $(OBJ)
 
-libgbus.a: $(GOBJ)
-	ar q libgbus.a $(GOBJ)
+libgivy.a: $(GOBJ)
+	ar q libgivy.a $(GOBJ)
 
-libxtbus.a: $(XTOBJ)
-	ar q libxtbus.a $(XTOBJ)
+libxtivy.a: $(XTOBJ)
+	ar q libxtivy.a $(XTOBJ)
 
 
diff --git a/src/buschannel.h b/src/buschannel.h
deleted file mode 100644
index 2d05ff4..0000000
--- a/src/buschannel.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _BUSCHANNEL_H
-#define _BUSCHANNEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-/* general Handle */
-
-#ifdef WIN32
-#include <windows.h>
-#define HANDLE SOCKET
-#else
-#define HANDLE int
-#endif
-
-typedef struct _channel *Channel;
-/* callback declenche par la gestion de boucle  sur evenement exception sur le canal */
-typedef void (*ChannelHandleDelete)( void *data );
-/* callback declenche par la gestion de boucle sur donnees pretes sur le canal */
-typedef void (*ChannelHandleRead)( Channel channel, HANDLE fd, void *data);
-
-/* fonction appele par le bus pour initialisation */
-typedef void (*ChannelInit)(void);
-						
-/* fonction appele par le bus pour mise en place des callback sur le canal */
-typedef Channel (*ChannelSetUp)(
-						HANDLE fd,
-						void *data,
-						ChannelHandleDelete handle_delete,
-						ChannelHandleRead handle_read
-						);
-/* fonction appele par le bus pour fermeture du canal */
-typedef void (*ChannelClose)( Channel channel );
-
-/* mise en place des fonction de gestion des canaux */
-void BusSetChannelManagement( ChannelInit init_chan, ChannelSetUp setup_chan, ChannelClose close_chan );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/bus.c b/src/ivy.c
index aa1c897..08cfef1 100644
--- a/src/bus.c
+++ b/src/ivy.c
@@ -12,10 +12,10 @@
 
 #include <fcntl.h>
 
-#include "buschannel.h"
-#include "bussocket.h"
+#include "ivychannel.h"
+#include "ivysocket.h"
 #include "list.h"
-#include "bus.h"
+#include "ivy.h"
 
 #define VERSION 3
 
diff --git a/src/bus.h b/src/ivy.h
index 1f0154a..7b450d0 100644
--- a/src/bus.h
+++ b/src/ivy.h
@@ -1,5 +1,5 @@
-#ifndef _BUS_H
-#define _BUS_H
+#ifndef _IVY_H
+#define _IVY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,4 +71,4 @@ void SendDirectMsg( BusClientPtr app, int id, char *msg );
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/busloop.c b/src/ivyloop.c
index 346a505..e02800c 100644
--- a/src/busloop.c
+++ b/src/ivyloop.c
@@ -21,8 +21,8 @@
 
 
 #include "list.h"
-#include "buschannel.h"
-#include "busloop.h"
+#include "ivychannel.h"
+#include "ivyloop.h"
 #include "timer.h"
 
 struct _channel {
diff --git a/src/busloop.h b/src/ivyloop.h
index 1eab8b6..1eb7166 100644
--- a/src/busloop.h
+++ b/src/ivyloop.h
@@ -1,11 +1,11 @@
-#ifndef _BUSLOOP_H
-#define _BUSLOOP_H
+#ifndef _IVYLOOP_H
+#define _IVYLOOP_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "buschannel.h"
+#include "ivychannel.h"
 
 /* general Handle */
 
diff --git a/src/bussocket.c b/src/ivysocket.c
index ca5ec08..04e44bf 100644
--- a/src/bussocket.c
+++ b/src/ivysocket.c
@@ -22,8 +22,8 @@
 #endif
 
 #include "list.h"
-#include "buschannel.h"
-#include "bussocket.h"
+#include "ivychannel.h"
+#include "ivysocket.h"
 
 static  ChannelInit channel_init = NULL;
 static  ChannelSetUp channel_setup = NULL;
diff --git a/src/bussocket.h b/src/ivysocket.h
index 956aa1a..2258caf 100644
--- a/src/bussocket.h
+++ b/src/ivysocket.h
@@ -1,5 +1,5 @@
-#ifndef _BUSSOCKET_H
-#define _BUSSOCKET_H
+#ifndef _IVYSOCKET_H
+#define _IVYSOCKET_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/busxtloop.c b/src/ivyxtloop.c
index fcaa10e..e2620aa 100644
--- a/src/busxtloop.c
+++ b/src/ivyxtloop.c
@@ -22,8 +22,8 @@
 
 #include <X11/Intrinsic.h>
 
-#include "buschannel.h"
-#include "busxtloop.h"
+#include "ivychannel.h"
+#include "ivyxtloop.h"
 
 struct _channel {
 	XtInputId id_read;
diff --git a/src/busxtloop.h b/src/ivyxtloop.h
index 8f48460..17e053f 100644
--- a/src/busxtloop.h
+++ b/src/ivyxtloop.h
@@ -1,5 +1,5 @@
-#ifndef _BUSXTLOOP_H
-#define _BUSXTLOOP_H
+#ifndef _IVYXTLOOP_H
+#define _IVYXTLOOP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,7 +18,7 @@ extern "C" {
 #define HANDLE int
 #endif
 
-#include "buschannel.h"
+#include "ivychannel.h"
 
 extern void BusXtChannelInit(void);
 
diff --git a/src/testbus.c b/src/testivy.c
index ae10eea..eee0a5e 100644
--- a/src/testbus.c
+++ b/src/testivy.c
@@ -7,12 +7,12 @@
 #include <unistd.h>
 #endif
 #ifdef XTMAINLOOP
-#include "busxtloop.h"
+#include "ivyxtloop.h"
 #else
-#include "busloop.h"
+#include "ivyloop.h"
 #endif
-#include "bussocket.h"
-#include "bus.h"
+#include "ivysocket.h"
+#include "ivy.h"
 #include "timer.h"
 #ifdef XTMAINLOOP
 #include <X11/Intrinsic.h>