diff options
author | fcolin | 2005-05-26 14:37:35 +0000 |
---|---|---|
committer | fcolin | 2005-05-26 14:37:35 +0000 |
commit | fbc04d171cd11ec16b9141dda95699323762a00b (patch) | |
tree | f2452251df738bc7d1995c636fd06e82e8f90c10 /src/ivyglutloop.c | |
parent | deaa6a5ec82c1d158caf360fd12672f72d7dae5b (diff) | |
download | ivy-c-fbc04d171cd11ec16b9141dda95699323762a00b.zip ivy-c-fbc04d171cd11ec16b9141dda95699323762a00b.tar.gz ivy-c-fbc04d171cd11ec16b9141dda95699323762a00b.tar.bz2 ivy-c-fbc04d171cd11ec16b9141dda95699323762a00b.tar.xz |
passage du separateur de message a \0
suppression des fonctions IvyChannel dynamique on se repose sur le linker
modif des adresses mails
Diffstat (limited to 'src/ivyglutloop.c')
-rwxr-xr-x | src/ivyglutloop.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/ivyglutloop.c b/src/ivyglutloop.c index a777a30..95430e5 100755 --- a/src/ivyglutloop.c +++ b/src/ivyglutloop.c @@ -6,8 +6,8 @@ * * Main loop based on GLUT ( OpenGL ) Toolkit * - * Authors: François-Régis Colin <colin@cenatoulouse.dgac.fr> - * Stéphane Chatty <chatty@cenatoulouse.dgac.fr> + * Authors: François-Régis Colin <colin@cena.fr> + * Stéphane Chatty <chatty@cena.fr> * * $Id$ * @@ -53,12 +53,9 @@ struct _channel { static int channel_initialized = 0; -ChannelInit channel_init = IvyGlutChannelInit; -ChannelSetUp channel_setup = IvyGlutChannelSetUp; -ChannelClose channel_close = IvyGlutChannelClose; -void IvyGlutChannelInit(void) +void IvyChannelInit(void) { if ( channel_initialized ) return; @@ -69,8 +66,11 @@ void IvyGlutChannelInit(void) #endif channel_initialized = 1; } - -void IvyGlutChannelClose( Channel channel ) +void IvyChannelStop(void) +{ + channel_initialized = 0; +} +void IvyChannelClose( Channel channel ) { if ( channel->handle_delete ) @@ -98,7 +98,7 @@ static void IvyGlutHandleChannelDelete( int source, GLUTInputId id, void *data ) (*channel->handle_delete)(channel->data); } -Channel IvyGlutChannelSetUp(HANDLE fd, void *data, +Channel IvyChannelOpen(HANDLE fd, void *data, ChannelHandleDelete handle_delete, ChannelHandleRead handle_read ) @@ -122,10 +122,8 @@ Channel IvyGlutChannelSetUp(HANDLE fd, void *data, return channel; } - -void -IvyStop () +extern void IvyMainLoop(void(*hook)(void)) { - /* To be implemented */ + glutMainLoop(); } |