#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-callbacks"
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
* All of the callbacks setting methods can be generalized to this:
*/
-#define SET_CALLBACK(a) if( fgStructure.Window == NULL ) return;\
- fgStructure.Window->Callbacks.a = callback;
+#define SET_CALLBACK(a) \
+ if( fgStructure.Window == NULL ) \
+ return; \
+ SET_WCB( ( *( fgStructure.Window ) ), a, callback );
/*
* Sets the Display callback for the current window
void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
{
if( !callback )
- fgError ("Fatal error in program. NULL display callback not "
- "permitted in GLUT 3.0+ or freeglut 2.0.1+\n");
+ 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 = TRUE;
}
/*
/*
* Sets the Timer callback for the current window
*/
-void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), int timerID )
+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 );
}
/*
*/
static void fghVisibility( int status )
{
+ int glut_status = GLUT_VISIBLE;
+
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window );
- freeglut_return_if_fail( fgStructure.Window->Callbacks.Visibility );
- if( status == GLUT_HIDDEN || status == GLUT_FULLY_COVERED )
- fgStructure.Window->Callbacks.Visibility( GLUT_NOT_VISIBLE );
- else
- fgStructure.Window->Callbacks.Visibility( GLUT_VISIBLE );
+ if( ( GLUT_HIDDEN == status ) || ( GLUT_FULLY_COVERED == status ) )
+ glut_status = GLUT_NOT_VISIBLE;
+ INVOKE_WCB( *( fgStructure.Window ), Visibility, ( glut_status ) );
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
( unsigned int, int, int, int ),
int pollInterval )
{
+ if( !fgState.JoysticksInitialised )
+ {
+ fgJoystickInit( 0 );
+ fgJoystickInit( 1 );
+ fgState.JoysticksInitialised = GL_TRUE;
+ }
+
SET_CALLBACK( Joystick );
fgStructure.Window->State.JoystickPollRate = pollInterval;
/* A. Donev: Destruction callback for menus */
void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
{
- if( fgStructure.Menu == NULL )
- return;
- fgStructure.Menu->Destroy = callback;
+ if( fgStructure.Menu )
+ fgStructure.Menu->Destroy = callback;
}
/*