projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace TRUE with GL_TRUE and FALSE with GL_FALSE where the type is
[freeglut]
/
src
/
freeglut_callbacks.c
diff --git
a/src/freeglut_callbacks.c
b/src/freeglut_callbacks.c
index
854ce50
..
2c3f436
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"
@@
-40,8
+38,10
@@
/*
* All of the callbacks setting methods can be generalized to this:
*/
/*
* 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;
/*
* Sets the Display callback for the current window
/*
* Sets the Display callback for the current window
@@
-49,10
+49,10
@@
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 );
SET_CALLBACK( Display );
- fgStructure.Window->State.Redisplay = TRUE;
+ fgStructure.Window->State.Redisplay = GL_TRUE;
}
/*
}
/*
@@
-66,7
+66,8
@@
void FGAPIENTRY glutReshapeFunc( void (* callback)( int, int ) )
/*
* Sets the Keyboard callback for the current window
*/
/*
* Sets the Keyboard callback for the current window
*/
-void FGAPIENTRY glutKeyboardFunc( void (* callback)( unsigned char, int, int ) )
+void FGAPIENTRY glutKeyboardFunc( void (* callback)
+ ( unsigned char, int, int ) )
{
SET_CALLBACK( Keyboard );
}
{
SET_CALLBACK( Keyboard );
}
@@
-91,16
+92,17
@@
void FGAPIENTRY glutIdleFunc( void (* callback)( void ) )
/*
* Sets the Timer callback for the current window
*/
/*
* 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 );
{
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;
timer->Callback = callback;
timer->ID = timerID;
@@
-113,14
+115,14
@@
void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
*/
static void fghVisibility( int status )
{
*/
static void fghVisibility( int status )
{
+ int glut_status = GLUT_VISIBLE;
+
freeglut_assert_ready;
freeglut_assert_ready;
- freeglut_return_if_fail( fgStructure.Window != NULL );
- freeglut_return_if_fail( fgStructure.Window->Callbacks.Visibility != NULL );
+ freeglut_return_if_fail( fgStructure.Window );
- 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 ) )
}
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
@@
-136,7
+138,8
@@
void FGAPIENTRY glutVisibilityFunc( void (* callback)( int ) )
/*
* Sets the keyboard key release callback for the current window
*/
/*
* Sets the keyboard key release callback for the current window
*/
-void FGAPIENTRY glutKeyboardUpFunc( void (* callback)( unsigned char, int, int ) )
+void FGAPIENTRY glutKeyboardUpFunc( void (* callback)
+ ( unsigned char, int, int ) )
{
SET_CALLBACK( KeyboardUp );
}
{
SET_CALLBACK( KeyboardUp );
}
@@
-152,7
+155,9
@@
void FGAPIENTRY glutSpecialUpFunc( void (* callback)( int, int, int ) )
/*
* Sets the joystick callback and polling rate for the current window
*/
/*
* Sets the joystick callback and polling rate for the current window
*/
-void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int ), int pollInterval )
+void FGAPIENTRY glutJoystickFunc( void (* callback)
+ ( unsigned int, int, int, int ),
+ int pollInterval )
{
SET_CALLBACK( Joystick );
fgStructure.Window->State.JoystickPollRate = pollInterval;
{
SET_CALLBACK( Joystick );
fgStructure.Window->State.JoystickPollRate = pollInterval;
@@
-173,6
+178,14
@@
void FGAPIENTRY glutMouseFunc( void (* callback)( int, int, int, int ) )
}
/*
}
/*
+ * Sets the mouse wheel callback for the current window
+ */
+void FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) )
+{
+ SET_CALLBACK( MouseWheel );
+}
+
+/*
* Sets the mouse motion callback for the current window (one or more buttons
* are pressed)
*/
* Sets the mouse motion callback for the current window (one or more buttons
* are pressed)
*/
@@
-214,9
+227,8
@@
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 )
+ fgStructure.Menu->Destroy = callback;
}
/*
}
/*