#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-callbacks"
-
#include "../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; \
+ FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+ /* fgStructure.Window->Callbacks.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;
freeglut_assert_ready;
timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
- if (!timer)
- fgError ("Fatal error: "
- "Memory allocation failure in glutTimerFunc()\n");
+ if( !timer )
+ fgError( "Fatal error: "
+ "Memory allocation failure in glutTimerFunc()\n" );
timer->Callback = callback;
timer->ID = timerID;
*/
static void fghVisibility( int status )
{
+ FGCBVisibility vis;
+ int glut_status;
+
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window );
- freeglut_return_if_fail( fgStructure.Window->Callbacks.Visibility );
+ vis = FETCH_WCB( ( *( fgStructure.Window ) ), Visibility );
+ freeglut_return_if_fail( vis );
+ /* Callbacks.Visibility ); */
if( status == GLUT_HIDDEN || status == GLUT_FULLY_COVERED )
+ glut_status = GLUT_NOT_VISIBLE;
+ else
+ glut_status = GLUT_VISIBLE;
+ vis( glut_status );
+ /*
fgStructure.Window->Callbacks.Visibility( GLUT_NOT_VISIBLE );
else
fgStructure.Window->Callbacks.Visibility( GLUT_VISIBLE );
+ */
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
/* A. Donev: Destruction callback for menus */
void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
{
- if( fgStructure.Menu == NULL )
- return;
- fgStructure.Menu->Destroy = callback;
+ if( fgStructure.Menu == NULL )
+ return;
+ fgStructure.Menu->Destroy = callback;
}
/*