Three tidying-up changes to the code of freeglut_callbacks.c;

[freeglut] / src / freeglut_callbacks.c

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index b741a0c..1cfecc5 100644 (file)
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -48,7 +48,16 @@
  */
 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");
     SET_CALLBACK( Display );
+
+    /*
+     * Force a redisplay with the new callback
+     */
+    fgStructure.Window->State.Redisplay = TRUE;
+
 }
 
 /*
@@ -100,7 +109,10 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
     /*
      * Create a new freeglut timer hook structure
      */
-    timer = calloc( sizeof(SFG_Timer), 1 );
+    timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
+    if (!timer)
+       fgError ("Fatal error: "
+           "Memory allocation failure in glutTimerFunc()\n");
 
     /*
      * Remember the callback address and timer hook's ID
@@ -121,13 +133,11 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
 
 /*
  * Sets the Visibility callback for the current window.
- *
- * I had to peer to GLUT sources to clean up the mess.
- * Can anyone please explain me what is going on here?!?
  */
 static void fghVisibility( int status )
 {
-    freeglut_assert_ready; freeglut_return_if_fail( fgStructure.Window != NULL );
+    freeglut_assert_ready;
+    freeglut_return_if_fail( fgStructure.Window != NULL );
     freeglut_return_if_fail( fgStructure.Window->Callbacks.Visibility != NULL );
 
     if( status == GLUT_HIDDEN  || status == GLUT_FULLY_COVERED )
@@ -168,9 +178,6 @@ void FGAPIENTRY glutSpecialUpFunc( void (* callback)( int, int, int ) )
 void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int ), int pollInterval )
 {
     SET_CALLBACK( Joystick );
-
-    freeglut_return_if_fail( fgStructure.Window != NULL );
-
     /*
      * Do not forget setting the joystick poll rate
      */
@@ -234,7 +241,8 @@ void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) )
 /* A. Donev: Destruction callback for menus */
 void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
 {
-   if( fgStructure.Menu == NULL ) return;
+   if( fgStructure.Menu == NULL )
+       return;
    fgStructure.Menu->Destroy = callback;
 }