X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=854ce50dd551316352aea320f1369ae13303b3cd;hb=8756c552d99adeed03a7bdd7c8b0da8c77f5c475;hp=94463157ae7e9eff4a2bb9b03273e31bcde50738;hpb=3515ebeb3424bf675a8a10f04b61fb6924775e0c;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 9446315..854ce50 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -52,12 +52,7 @@ void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
 	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;
-
 }
 
 /*
@@ -90,10 +85,6 @@ void FGAPIENTRY glutSpecialFunc( void (* callback)( int, int, int ) )
 void FGAPIENTRY glutIdleFunc( void (* callback)( void ) )
 {
     freeglut_assert_ready;
-
-    /*
-     * The global idle callback pointer is stored in fgState structure
-     */
     fgState.IdleCallback = callback;
 }
 
@@ -106,40 +97,24 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
 
     freeglut_assert_ready;
 
-    /*
-     * Create a new freeglut timer hook structure
-     */
     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
-     */
     timer->Callback  = callback;
     timer->ID        = timerID;
-
-    /*
-     * When will the time out happen (in terms of window's timer)
-     */
     timer->TriggerTime = fgElapsedTime() + timeOut;
-
-    /*
-     * Have the new hook attached to the current window
-     */
     fgListAppend( &fgState.Timers, &timer->Node );
 }
 
 /*
  * 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 )
@@ -180,17 +155,8 @@ 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
-     */
     fgStructure.Window->State.JoystickPollRate = pollInterval;
 
-    /*
-     * Make sure the joystick polling routine gets called as early as possible:
-     */
     fgStructure.Window->State.JoystickLastPoll =
         fgElapsedTime() - fgStructure.Window->State.JoystickPollRate;
 
@@ -207,7 +173,8 @@ void FGAPIENTRY glutMouseFunc( void (* callback)( int, int, int, int ) )
 }
 
 /*
- * 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)
  */
 void FGAPIENTRY glutMotionFunc( void (* callback)( int, int ) )
 {
@@ -215,7 +182,8 @@ void FGAPIENTRY glutMotionFunc( void (* callback)( int, int ) )
 }
 
 /*
- * Sets the passive mouse motion callback for the current window (no mouse buttons are pressed)
+ * Sets the passive mouse motion callback for the current window (no mouse
+ * buttons are pressed)
  */
 void FGAPIENTRY glutPassiveMotionFunc( void (* callback)( int, int ) )
 {
@@ -246,7 +214,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;
 }
 
@@ -256,7 +225,6 @@ void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
 void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
 {
     freeglut_assert_ready;
-
     fgState.MenuStateCallback = callback;
 }
 
@@ -266,7 +234,6 @@ void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
 void FGAPIENTRY glutMenuStatusFunc( void (* callback)( int, int, int ) )
 {
     freeglut_assert_ready;
-
     fgState.MenuStatusCallback = callback;
 }