projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Converted the "Callbacks" structure (with named members holding individual
[freeglut]
/
src
/
freeglut_callbacks.c
diff --git
a/src/freeglut_callbacks.c
b/src/freeglut_callbacks.c
index
43ccc4b
..
dfabb90
100644
(file)
--- a/
src/freeglut_callbacks.c
+++ b/
src/freeglut_callbacks.c
@@
-29,8
+29,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-callbacks"
-
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
@@
-43,7
+41,8
@@
#define SET_CALLBACK(a) \
if( fgStructure.Window == NULL ) \
return; \
#define SET_CALLBACK(a) \
if( fgStructure.Window == NULL ) \
return; \
- fgStructure.Window->Callbacks.a = callback;
+ FETCH_WCB( ( *( fgStructure.Window ) ), a ) = callback;
+ /* fgStructure.Window->Callbacks.a = callback; */
/*
* Sets the Display callback for the current window
/*
* Sets the Display callback for the current window
@@
-51,8
+50,8
@@
void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
{
if( !callback )
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;
}
SET_CALLBACK( Display );
fgStructure.Window->State.Redisplay = TRUE;
}
@@
-102,9
+101,9
@@
void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
freeglut_assert_ready;
timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
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;
timer->Callback = callback;
timer->ID = timerID;
@@
-117,14
+116,25
@@
void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
*/
static void fghVisibility( int status )
{
*/
static void fghVisibility( int status )
{
+ FGCBVisibility vis;
+ int glut_status;
+
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window );
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 )
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 );
fgStructure.Window->Callbacks.Visibility( GLUT_NOT_VISIBLE );
else
fgStructure.Window->Callbacks.Visibility( GLUT_VISIBLE );
+ */
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
@@
-229,9
+239,9
@@
void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
/* A. Donev: Destruction callback for menus */
void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
{
/* 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;
}
/*
}
/*