X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_init.c;h=e25404f6596c6919e5276ea1ac3ec0cc77aa1e83;hb=d6ccf7c81bdad11e6902a258e8e21fdbe6b9f968;hp=58388f818f0e4ca6f49d24f883e437edcd4c621a;hpb=99532b98a9b24cbf41fdf83789f74fef2dbc8b6c;p=freeglut

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 58388f8..e25404f 100644
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -65,7 +65,7 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       GL_FALSE,              /* UseCurrentContext */
                       GL_FALSE,              /* GLDebugSwitch */
                       GL_FALSE,              /* XSyncSwitch */
-                      GL_TRUE,               /* IgnoreKeyRepeat */
+                      GL_FALSE,              /* IgnoreKeyRepeat */
                       0xffffffff,            /* Modifiers */
                       0,                     /* FPSInterval */
                       0,                     /* SwapCount */
@@ -76,6 +76,7 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       { { 0, 0 }, GL_FALSE },
 #endif
                       { NULL, NULL },         /* Timers */
+                      { NULL, NULL },         /* FreeTimers */
                       NULL,                   /* IdleCallback */
                       0,                      /* ActiveMenus */
                       NULL,                   /* MenuStateCallback */
@@ -84,8 +85,8 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       16,                     /* GameModeDepth */
                       72,                     /* GameModeRefresh */
                       GLUT_ACTION_EXIT,       /* ActionOnWindowClose */
-                      GLUT_EXEC_STATE_INIT    /* ExecState */
-                      NULL,                   /* ProgramName */
+                      GLUT_EXEC_STATE_INIT,   /* ExecState */
+                      NULL                    /* ProgramName */
 };
 
 
@@ -147,7 +148,7 @@ void fgInitialize( const char* displayName )
     ATOM atom;
 
     /*
-     * What we need to do is to initialize the fgDisplay global structure here...
+     * What we need to do is to initialize the fgDisplay global structure here.
      */
     fgDisplay.Instance = GetModuleHandle( NULL );
 
@@ -157,9 +158,14 @@ void fgInitialize( const char* displayName )
         ZeroMemory( &wc, sizeof(WNDCLASS) );
 
         /*
-         * Each of the windows should have its own device context...
+         * Each of the windows should have its own device context, and we
+         * want redraw events during Vertical and Horizontal Resizes by
+         * the user.
+         *
+         * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
+         * XXX future?  Dead-end idea?
          */
-        wc.style          = CS_OWNDC /* | CS_DBLCLKS */;
+        wc.style          = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
         wc.lpfnWndProc    = fgWindowProc;
         wc.cbClsExtra     = 0;
         wc.cbWndExtra     = 0;
@@ -199,6 +205,7 @@ void fgInitialize( const char* displayName )
 #endif
 
     fgJoystickInit( 0 );
+    fgJoystickInit( 1 );
 
     fgState.Initialised = GL_TRUE;
 }
@@ -230,9 +237,15 @@ void fgDeinitialize( void )
 
     fgDestroyStructure( );
 
-    while( timer = ( SFG_Timer * )fgState.Timers.First )
+    while( (timer = fgState.Timers.First) )
     {
-        fgListRemove ( &fgState.Timers, &timer->Node );
+        fgListRemove( &fgState.Timers, &timer->Node );
+        free( timer );
+    }
+
+    while( (timer = fgState.FreeTimers.First) )
+    {
+        fgListRemove( &fgState.FreeTimers, &timer->Node );
         free( timer );
     }
 
@@ -269,7 +282,9 @@ void fgDeinitialize( void )
 
     fgState.Time.Set = GL_FALSE;
 
-    fgState.Timers.First = fgState.Timers.Last = NULL;
+    fgListInit( &fgState.Timers );
+    fgListInit( &fgState.FreeTimers );
+
     fgState.IdleCallback = NULL;
     fgState.MenuStateCallback = ( FGCBMenuState )NULL;
     fgState.MenuStatusCallback = ( FGCBMenuStatus )NULL;
@@ -283,7 +298,7 @@ void fgDeinitialize( void )
         free( fgState.ProgramName );
         fgState.ProgramName = NULL;
     }
-    
+
 
 #if TARGET_HOST_UNIX_X11
 
@@ -306,7 +321,7 @@ void fgDeinitialize( void )
  * Everything inside the following #ifndef is copied from the X sources.
  */
 
-#ifndef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_WIN32
 
 /*
 
@@ -354,7 +369,7 @@ from The Open Group.
  *   It returns a bitmask that indicates which of the four values
  *   were actually found in the string.  For each value found,
  *   the corresponding argument is updated;  for each value
- *   not found, the corresponding argument is left unchanged. 
+ *   not found, the corresponding argument is left unchanged.
  */
 
 static int
@@ -362,7 +377,7 @@ ReadInteger(char *string, char **NextString)
 {
     register int Result = 0;
     int Sign = 1;
-    
+
     if (*string == '+')
         string++;
     else if (*string == '-')
@@ -376,13 +391,13 @@ ReadInteger(char *string, char **NextString)
     }
     *NextString = string;
     if (Sign >= 0)
-        return (Result);
+        return Result;
     else
-        return (-Result);
+        return -Result;
 }
 
 static int XParseGeometry (
-    _Xconst char *string,
+    const char *string,
     int *x,
     int *y,
     unsigned int *width,    /* RETURN */
@@ -394,15 +409,16 @@ static int XParseGeometry (
     int tempX = 0, tempY = 0;
     char *nextCharacter;
 
-    if ( (string == NULL) || (*string == '\0')) return(mask);
+    if ( (string == NULL) || (*string == '\0'))
+      return mask;
     if (*string == '=')
         string++;  /* ignore possible '=' at beg of geometry spec */
 
     strind = (char *)string;
     if (*strind != '+' && *strind != '-' && *strind != 'x') {
         tempWidth = ReadInteger(strind, &nextCharacter);
-        if (strind == nextCharacter) 
-            return (0);
+        if (strind == nextCharacter)
+            return 0;
         strind = nextCharacter;
         mask |= WidthValue;
     }
@@ -411,7 +427,7 @@ static int XParseGeometry (
         strind++;
         tempHeight = ReadInteger(strind, &nextCharacter);
         if (strind == nextCharacter)
-            return (0);
+            return 0;
         strind = nextCharacter;
         mask |= HeightValue;
     }
@@ -421,7 +437,7 @@ static int XParseGeometry (
             strind++;
             tempX = -ReadInteger(strind, &nextCharacter);
             if (strind == nextCharacter)
-                return (0);
+                return 0;
             strind = nextCharacter;
             mask |= XNegative;
         }
@@ -430,7 +446,7 @@ static int XParseGeometry (
             strind++;
             tempX = ReadInteger(strind, &nextCharacter);
             if (strind == nextCharacter)
-                return(0);
+                return 0;
             strind = nextCharacter;
         }
         mask |= XValue;
@@ -439,7 +455,7 @@ static int XParseGeometry (
                 strind++;
                 tempY = -ReadInteger(strind, &nextCharacter);
                 if (strind == nextCharacter)
-                    return(0);
+                    return 0;
                 strind = nextCharacter;
                 mask |= YNegative;
             }
@@ -448,7 +464,7 @@ static int XParseGeometry (
                 strind++;
                 tempY = ReadInteger(strind, &nextCharacter);
                 if (strind == nextCharacter)
-                    return(0);
+                    return 0;
                 strind = nextCharacter;
             }
             mask |= YValue;
@@ -458,7 +474,7 @@ static int XParseGeometry (
     /* If strind isn't at the end of the string the it's an invalid
        geometry specification. */
 
-    if (*strind != '\0') return (0);
+    if (*strind != '\0') return 0;
 
     if (mask & XValue)
         *x = tempX;
@@ -468,7 +484,7 @@ static int XParseGeometry (
         *width = tempWidth;
     if (mask & HeightValue)
         *height = tempHeight;
-    return (mask);
+    return mask;
 }
 #endif
 
@@ -485,7 +501,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     int i, j, argc = *pargc;
 
     if( fgState.Initialised )
-        fgError( "illegal glutInit() reinitialization attemp" );
+        fgError( "illegal glutInit() reinitialization attempt" );
 
     if (pargc && *pargc && argv && *argv && **argv)
     {
@@ -504,9 +520,13 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         const char *fps = getenv( "GLUT_FPS" );
         if( fps )
         {
-            sscanf( fps, "%d", &fgState.FPSInterval );
-            if( fgState.FPSInterval <= 0 )
-                fgState.FPSInterval = 5000;  /* 5000 milliseconds */
+            int interval;
+            sscanf( fps, "%d", &interval );
+
+            if( interval <= 0 )
+                fgState.FPSInterval = 5000;  /* 5000 millisecond default */
+            else
+                fgState.FPSInterval = interval;
         }
     }
 
@@ -593,15 +613,9 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     }
 
     /*
-     * Have the display created now. As I am too lazy to implement
-     * the program arguments parsing, we will have the DISPLAY
-     * environment variable used for opening the X display:
-     *
-     * XXX The above comment is rather unclear.  We have just
-     * XXX completed parsing of the program arguments for GLUT
-     * XXX parameters.  We obviously canNOT parse the application-
-     * XXX specific parameters.  Can someone re-write the above
-     * XXX more clearly?
+     * Have the display created now. If there wasn't a "-display"
+     * in the program arguments, we will use the DISPLAY environment
+     * variable for opening the X display (see code above):
      */
     fgInitialize( displayName );
 
@@ -699,12 +713,12 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
      * delimited by blanks or tabs.
      */
     char *token ;
-    int len = strlen ( displayMode ) ;
-    char *buffer = (char *)malloc ( (len+1) * sizeof(char) ) ;
-    memcpy ( buffer, displayMode, len ) ;
-    buffer[len] = '\0' ;
+    int len = strlen ( displayMode );
+    char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
+    memcpy ( buffer, displayMode, len );
+    buffer[len] = '\0';
 
-    token = strtok ( buffer, " \t" ) ;
+    token = strtok ( buffer, " \t" );
     while ( token )
     {
         /*
@@ -856,14 +870,14 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
 
         case 28 :  /* Unrecognized */
             printf ( "WARNING - Display string token not recognized:  %s\n",
-                     token ) ;
+                     token );
             break ;
         }
 
-        token = strtok ( NULL, " \t" ) ;
+        token = strtok ( NULL, " \t" );
     }
 
-    free ( buffer ) ;
+    free ( buffer );
 
     /*
      * We will make use of this value when creating a new OpenGL context...