X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_init.c;h=b72c74fc1483847b3e00be95e982f647c82164c5;hb=ba0b3e4f7c57925fea4b418356a283a3d8135f2d;hp=0b6e29d9f119069d402206ad17195441c6189547;hpb=05a61612c9b96b61ca9917def47eb59b7bd195c8;p=freeglut

diff --git a/src/fg_init.c b/src/fg_init.c
index 0b6e29d..b72c74f 100644
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_init.c
+ * fg_init.c
  *
  * Various freeglut initialization functions.
  *
@@ -87,6 +87,8 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
                       GL_FALSE,               /* SkipStaleMotion */
+                      GL_FALSE,               /* StrokeFontDrawJoinDots */
+                      GL_FALSE,               /* AllowNegativeWindowPosition */
                       1,                      /* OpenGL context MajorVersion */
                       0,                      /* OpenGL context MinorVersion */
                       0,                      /* OpenGL ContextFlags */
@@ -110,7 +112,7 @@ void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName
     int i, j, argc = *pargc;
 
     {
-	    /* check if GLUT_FPS env var is set */
+        /* check if GLUT_FPS env var is set */
         const char *fps = getenv( "GLUT_FPS" );
 
         if( fps )
@@ -229,7 +231,7 @@ void fgDeinitialize( void )
         return;
     }
 
-	/* If we're in game mode, we want to leave game mode */
+    /* If we're in game mode, we want to leave game mode */
     if( fgStructure.GameModeWindow ) {
         glutLeaveGameMode();
     }
@@ -237,7 +239,7 @@ void fgDeinitialize( void )
     /* If there was a menu created, destroy the rendering context */
     if( fgStructure.MenuContext )
     {
-		fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
+        fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
         free( fgStructure.MenuContext );
         fgStructure.MenuContext = NULL;
     }
@@ -256,9 +258,9 @@ void fgDeinitialize( void )
         free( timer );
     }
 
-	fgPlatformDeinitialiseInputDevices ();
+    fgPlatformDeinitialiseInputDevices ();
 
-	fgState.MouseWheelTicks = 0;
+    fgState.MouseWheelTicks = 0;
 
     fgState.MajorVersion = 1;
     fgState.MinorVersion = 0;
@@ -310,7 +312,7 @@ void fgDeinitialize( void )
         fgState.ProgramName = NULL;
     }
 
-	fgPlatformCloseDisplay ();
+    fgPlatformCloseDisplay ();
 
     fgState.Initialised = GL_FALSE;
 }
@@ -342,7 +344,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
 
     fgCreateStructure( );
 
-	fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
+    fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
 
     /*
      * Have the display created now. If there wasn't a "-display"
@@ -356,7 +358,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
      * size.
      */
 
-    if (geometry )
+    if ( geometry )
     {
         unsigned int parsedWidth, parsedHeight;
         int mask = XParseGeometry( geometry,
@@ -369,10 +371,10 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         if( (mask & (WidthValue|HeightValue)) == (WidthValue|HeightValue) )
             fgState.Size.Use = GL_TRUE;
 
-        if( mask & XNegative )
+        if( ( mask & XNegative ) && !fgState.AllowNegativeWindowPosition )
             fgState.Position.X += fgDisplay.ScreenWidth - fgState.Size.X;
 
-        if( mask & YNegative )
+        if( ( mask & YNegative ) && !fgState.AllowNegativeWindowPosition )
             fgState.Position.Y += fgDisplay.ScreenHeight - fgState.Size.Y;
 
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
@@ -396,7 +398,7 @@ void FGAPIENTRY glutInitWindowPosition( int x, int y )
     fgState.Position.X = x;
     fgState.Position.Y = y;
 
-    if( ( x >= 0 ) && ( y >= 0 ) )
+    if( ( ( x >= 0 ) && ( y >= 0 ) ) || fgState.AllowNegativeWindowPosition )
         fgState.Position.Use = GL_TRUE;
     else
         fgState.Position.Use = GL_FALSE;