X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=705c3d64bc5f0e6b745f27e3accc912b5616857d;hb=9c3c848ff232b56793bef2d91d29283ff80326b4;hp=2c3f436b61a2e295d3ae5d414a1c2f646d0421d0;hpb=074fe7a4ceb20811af83f735d5db74d69d11442c;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 2c3f436..705c3d6 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 
@@ -41,7 +41,7 @@
 #define SET_CALLBACK(a)              \
     if( fgStructure.Window == NULL ) \
         return;                      \
-    FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+    SET_WCB( ( *( fgStructure.Window ) ), a, callback );
 
 /*
  * Sets the Display callback for the current window
@@ -52,7 +52,6 @@ void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
         fgError( "Fatal error in program.  NULL display callback not "
                  "permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
     SET_CALLBACK( Display );
-    fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -95,19 +94,32 @@ void FGAPIENTRY glutIdleFunc( void (* callback)( void ) )
 void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
                                int timerID )
 {
-    SFG_Timer* timer;
+    SFG_Timer *timer, *node;
 
     freeglut_assert_ready;
 
-    timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
-    if( !timer )
-        fgError( "Fatal error: "
-                 "Memory allocation failure in glutTimerFunc()\n" );
+    if( (timer = fgState.FreeTimers.Last) )
+    {
+        fgListRemove( &fgState.FreeTimers, &timer->Node );
+    }
+    else
+    {
+        if( ! (timer = malloc(sizeof(SFG_Timer))) )
+            fgError( "Fatal error: "
+                     "Memory allocation failure in glutTimerFunc()\n" );
+    }
 
     timer->Callback  = callback;
     timer->ID        = timerID;
     timer->TriggerTime = fgElapsedTime() + timeOut;
-    fgListAppend( &fgState.Timers, &timer->Node );
+
+    for( node = fgState.Timers.First; node; node = node->Node.Next )
+    {
+        if( node->TriggerTime > timer->TriggerTime )
+            break;
+    }
+
+    fgListInsert( &fgState.Timers, &node->Node, &timer->Node );
 }
 
 /*