\r
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */\r
\r
-extern void fghInitialize( const char* displayName );\r
-extern void fghDeinitialiseInputDevices ( void );\r
-extern void fghCloseDisplay ( void );\r
+extern void fgPlatformInitialize( const char* displayName );\r
+extern void fgPlatformDeinitialiseInputDevices ( void );\r
+extern void fgPlatformCloseDisplay ( void );\r
\r
#if TARGET_HOST_POSIX_X11\r
\r
/*\r
* A call to this function should initialize all the display stuff...\r
*/\r
-static void fghInitialize( const char* displayName )\r
+void fgPlatformInitialize( const char* displayName )\r
{\r
fgDisplay.Display = XOpenDisplay( displayName );\r
\r
\r
#endif\r
\r
+\r
+void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )\r
+{\r
+#ifndef _WIN32_WCE\r
+ int i, j, argc = *pargc;\r
+\r
+ {\r
+ /* check if GLUT_FPS env var is set */\r
+ const char *fps = getenv( "GLUT_FPS" );\r
+\r
+ if( fps )\r
+ {\r
+ int interval;\r
+ sscanf( fps, "%d", &interval );\r
+\r
+ if( interval <= 0 )\r
+ fgState.FPSInterval = 5000; /* 5000 millisecond default */\r
+ else\r
+ fgState.FPSInterval = interval;\r
+ }\r
+ }\r
+\r
+ *pDisplayName = getenv( "DISPLAY" );\r
+\r
+ for( i = 1; i < argc; i++ )\r
+ {\r
+ if( strcmp( argv[ i ], "-display" ) == 0 )\r
+ {\r
+ if( ++i >= argc )\r
+ fgError( "-display parameter must be followed by display name" );\r
+\r
+ *pDisplayName = argv[ i ];\r
+\r
+ argv[ i - 1 ] = NULL;\r
+ argv[ i ] = NULL;\r
+ ( *pargc ) -= 2;\r
+ }\r
+ else if( strcmp( argv[ i ], "-geometry" ) == 0 )\r
+ {\r
+ if( ++i >= argc )\r
+ fgError( "-geometry parameter must be followed by window "\r
+ "geometry settings" );\r
+\r
+ *pGeometry = argv[ i ];\r
+\r
+ argv[ i - 1 ] = NULL;\r
+ argv[ i ] = NULL;\r
+ ( *pargc ) -= 2;\r
+ }\r
+ else if( strcmp( argv[ i ], "-direct" ) == 0)\r
+ {\r
+ if( fgState.DirectContext == GLUT_FORCE_INDIRECT_CONTEXT )\r
+ fgError( "parameters ambiguity, -direct and -indirect "\r
+ "cannot be both specified" );\r
+\r
+ fgState.DirectContext = GLUT_FORCE_DIRECT_CONTEXT;\r
+ argv[ i ] = NULL;\r
+ ( *pargc )--;\r
+ }\r
+ else if( strcmp( argv[ i ], "-indirect" ) == 0 )\r
+ {\r
+ if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )\r
+ fgError( "parameters ambiguity, -direct and -indirect "\r
+ "cannot be both specified" );\r
+\r
+ fgState.DirectContext = GLUT_FORCE_INDIRECT_CONTEXT;\r
+ argv[ i ] = NULL;\r
+ (*pargc)--;\r
+ }\r
+ else if( strcmp( argv[ i ], "-iconic" ) == 0 )\r
+ {\r
+ fgState.ForceIconic = GL_TRUE;\r
+ argv[ i ] = NULL;\r
+ ( *pargc )--;\r
+ }\r
+ else if( strcmp( argv[ i ], "-gldebug" ) == 0 )\r
+ {\r
+ fgState.GLDebugSwitch = GL_TRUE;\r
+ argv[ i ] = NULL;\r
+ ( *pargc )--;\r
+ }\r
+ else if( strcmp( argv[ i ], "-sync" ) == 0 )\r
+ {\r
+ fgState.XSyncSwitch = GL_TRUE;\r
+ argv[ i ] = NULL;\r
+ ( *pargc )--;\r
+ }\r
+ }\r
+\r
+ /* Compact {argv}. */\r
+ for( i = j = 1; i < *pargc; i++, j++ )\r
+ {\r
+ /* Guaranteed to end because there are "*pargc" arguments left */\r
+ while ( argv[ j ] == NULL )\r
+ j++;\r
+ if ( i != j )\r
+ argv[ i ] = argv[ j ];\r
+ }\r
+\r
+#endif /* _WIN32_WCE */\r
+\r
+}\r
+\r
+\r
void fghCloseInputDevices ( void )\r
{\r
if ( fgState.JoysticksInitialised )\r
\r
if ( fgState.InputDevsInitialised )\r
fgInputDeviceClose( );\r
-\r
- fgState.JoysticksInitialised = GL_FALSE;\r
- fgState.InputDevsInitialised = GL_FALSE;\r
}\r
\r
\r
#if TARGET_HOST_POSIX_X11\r
-static void fghDeinitialiseInputDevices ( void )\r
+void fgPlatformDeinitialiseInputDevices ( void )\r
{\r
fghCloseInputDevices ();\r
\r
}\r
\r
\r
-static void fghCloseDisplay ( void )\r
+void fgPlatformCloseDisplay ( void )\r
{\r
/*\r
* Make sure all X-client data we have created will be destroyed on\r
free( timer );\r
}\r
\r
- fghDeinitialiseInputDevices ();\r
+ fgPlatformDeinitialiseInputDevices ();\r
\r
fgState.MouseWheelTicks = 0;\r
\r
fgState.ProgramName = NULL;\r
}\r
\r
- fghCloseDisplay ();\r
+ fgPlatformCloseDisplay ();\r
\r
fgState.Initialised = GL_FALSE;\r
}\r
\r
-/*\r
- * Everything inside the following #ifndef is copied from the X sources.\r
- */\r
\r
#if TARGET_HOST_MS_WINDOWS\r
-\r
-/*\r
-\r
-Copyright 1985, 1986, 1987,1998 The Open Group\r
-\r
-Permission to use, copy, modify, distribute, and sell this software and its\r
-documentation for any purpose is hereby granted without fee, provided that\r
-the above copyright notice appear in all copies and that both that\r
-copyright notice and this permission notice appear in supporting\r
-documentation.\r
-\r
-The above copyright notice and this permission notice shall be included\r
-in all copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\r
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR\r
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\r
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\r
-OTHER DEALINGS IN THE SOFTWARE.\r
-\r
-Except as contained in this notice, the name of The Open Group shall\r
-not be used in advertising or otherwise to promote the sale, use or\r
-other dealings in this Software without prior written authorization\r
-from The Open Group.\r
-\r
-*/\r
-\r
#define NoValue 0x0000\r
#define XValue 0x0001\r
#define YValue 0x0002\r
#define XNegative 0x0010\r
#define YNegative 0x0020\r
\r
-/*\r
- * XParseGeometry parses strings of the form\r
- * "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where\r
- * width, height, xoffset, and yoffset are unsigned integers.\r
- * Example: "=80x24+300-49"\r
- * The equal sign is optional.\r
- * It returns a bitmask that indicates which of the four values\r
- * were actually found in the string. For each value found,\r
- * the corresponding argument is updated; for each value\r
- * not found, the corresponding argument is left unchanged.\r
- */\r
-\r
-static int\r
-ReadInteger(char *string, char **NextString)\r
-{\r
- register int Result = 0;\r
- int Sign = 1;\r
-\r
- if (*string == '+')\r
- string++;\r
- else if (*string == '-')\r
- {\r
- string++;\r
- Sign = -1;\r
- }\r
- for (; (*string >= '0') && (*string <= '9'); string++)\r
- {\r
- Result = (Result * 10) + (*string - '0');\r
- }\r
- *NextString = string;\r
- if (Sign >= 0)\r
- return Result;\r
- else\r
- return -Result;\r
-}\r
-\r
-static int XParseGeometry (\r
+extern int XParseGeometry (\r
const char *string,\r
int *x,\r
int *y,\r
unsigned int *width, /* RETURN */\r
- unsigned int *height) /* RETURN */\r
-{\r
- int mask = NoValue;\r
- register char *strind;\r
- unsigned int tempWidth = 0, tempHeight = 0;\r
- int tempX = 0, tempY = 0;\r
- char *nextCharacter;\r
-\r
- if ( (string == NULL) || (*string == '\0'))\r
- return mask;\r
- if (*string == '=')\r
- string++; /* ignore possible '=' at beg of geometry spec */\r
-\r
- strind = (char *)string;\r
- if (*strind != '+' && *strind != '-' && *strind != 'x') {\r
- tempWidth = ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- mask |= WidthValue;\r
- }\r
-\r
- if (*strind == 'x' || *strind == 'X') {\r
- strind++;\r
- tempHeight = ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- mask |= HeightValue;\r
- }\r
-\r
- if ((*strind == '+') || (*strind == '-')) {\r
- if (*strind == '-') {\r
- strind++;\r
- tempX = -ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- mask |= XNegative;\r
- }\r
- else\r
- {\r
- strind++;\r
- tempX = ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- }\r
- mask |= XValue;\r
- if ((*strind == '+') || (*strind == '-')) {\r
- if (*strind == '-') {\r
- strind++;\r
- tempY = -ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- mask |= YNegative;\r
- }\r
- else\r
- {\r
- strind++;\r
- tempY = ReadInteger(strind, &nextCharacter);\r
- if (strind == nextCharacter)\r
- return 0;\r
- strind = nextCharacter;\r
- }\r
- mask |= YValue;\r
- }\r
- }\r
-\r
- /* If strind isn't at the end of the string the it's an invalid\r
- geometry specification. */\r
-\r
- if (*strind != '\0') return 0;\r
-\r
- if (mask & XValue)\r
- *x = tempX;\r
- if (mask & YValue)\r
- *y = tempY;\r
- if (mask & WidthValue)\r
- *width = tempWidth;\r
- if (mask & HeightValue)\r
- *height = tempHeight;\r
- return mask;\r
-}\r
+ unsigned int *height); /* RETURN */\r
#endif\r
\r
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */\r
{\r
char* displayName = NULL;\r
char* geometry = NULL;\r
- int i, j, argc = *pargc;\r
-\r
if( fgState.Initialised )\r
fgError( "illegal glutInit() reinitialization attempt" );\r
\r
/* Get start time */\r
fgState.Time = fgSystemTime();\r
\r
- /* check if GLUT_FPS env var is set */\r
-#ifndef _WIN32_WCE\r
- {\r
- const char *fps = getenv( "GLUT_FPS" );\r
-\r
- if( fps )\r
- {\r
- int interval;\r
- sscanf( fps, "%d", &interval );\r
-\r
- if( interval <= 0 )\r
- fgState.FPSInterval = 5000; /* 5000 millisecond default */\r
- else\r
- fgState.FPSInterval = interval;\r
- }\r
- }\r
-\r
- displayName = getenv( "DISPLAY" );\r
-\r
- for( i = 1; i < argc; i++ )\r
- {\r
- if( strcmp( argv[ i ], "-display" ) == 0 )\r
- {\r
- if( ++i >= argc )\r
- fgError( "-display parameter must be followed by display name" );\r
-\r
- displayName = argv[ i ];\r
-\r
- argv[ i - 1 ] = NULL;\r
- argv[ i ] = NULL;\r
- ( *pargc ) -= 2;\r
- }\r
- else if( strcmp( argv[ i ], "-geometry" ) == 0 )\r
- {\r
- if( ++i >= argc )\r
- fgError( "-geometry parameter must be followed by window "\r
- "geometry settings" );\r
-\r
- geometry = argv[ i ];\r
-\r
- argv[ i - 1 ] = NULL;\r
- argv[ i ] = NULL;\r
- ( *pargc ) -= 2;\r
- }\r
- else if( strcmp( argv[ i ], "-direct" ) == 0)\r
- {\r
- if( fgState.DirectContext == GLUT_FORCE_INDIRECT_CONTEXT )\r
- fgError( "parameters ambiguity, -direct and -indirect "\r
- "cannot be both specified" );\r
-\r
- fgState.DirectContext = GLUT_FORCE_DIRECT_CONTEXT;\r
- argv[ i ] = NULL;\r
- ( *pargc )--;\r
- }\r
- else if( strcmp( argv[ i ], "-indirect" ) == 0 )\r
- {\r
- if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )\r
- fgError( "parameters ambiguity, -direct and -indirect "\r
- "cannot be both specified" );\r
-\r
- fgState.DirectContext = GLUT_FORCE_INDIRECT_CONTEXT;\r
- argv[ i ] = NULL;\r
- (*pargc)--;\r
- }\r
- else if( strcmp( argv[ i ], "-iconic" ) == 0 )\r
- {\r
- fgState.ForceIconic = GL_TRUE;\r
- argv[ i ] = NULL;\r
- ( *pargc )--;\r
- }\r
- else if( strcmp( argv[ i ], "-gldebug" ) == 0 )\r
- {\r
- fgState.GLDebugSwitch = GL_TRUE;\r
- argv[ i ] = NULL;\r
- ( *pargc )--;\r
- }\r
- else if( strcmp( argv[ i ], "-sync" ) == 0 )\r
- {\r
- fgState.XSyncSwitch = GL_TRUE;\r
- argv[ i ] = NULL;\r
- ( *pargc )--;\r
- }\r
- }\r
-\r
- /* Compact {argv}. */\r
- for( i = j = 1; i < *pargc; i++, j++ )\r
- {\r
- /* Guaranteed to end because there are "*pargc" arguments left */\r
- while ( argv[ j ] == NULL )\r
- j++;\r
- if ( i != j )\r
- argv[ i ] = argv[ j ];\r
- }\r
-\r
-#endif /* _WIN32_WCE */\r
+ fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );\r
\r
/*\r
* Have the display created now. If there wasn't a "-display"\r
* in the program arguments, we will use the DISPLAY environment\r
* variable for opening the X display (see code above):\r
*/\r
- fghInitialize( displayName );\r
+ fgPlatformInitialize( displayName );\r
\r
/*\r
* Geometry parsing deffered until here because we may need the screen\r
projects / freeglut / blobdiff