X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2FCommon%2Ffreeglut_init.c;h=bb0c0971dff978b4349557a2877c5b5eb92527e9;hb=1ede9f68f98e29ddd07bd466310967e716bfac92;hp=0c3e6974fa138438090259fc184252452b3adb91;hpb=1e8083fc365a6e05ed3b6b3be467af41d13085d0;p=freeglut diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c index 0c3e697..bb0c097 100644 --- a/src/Common/freeglut_init.c +++ b/src/Common/freeglut_init.c @@ -73,9 +73,9 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */ 0, /* ActiveMenus */ NULL, /* MenuStateCallback */ NULL, /* MenuStatusCallback */ - { 640, 480, GL_TRUE }, /* GameModeSize */ - 16, /* GameModeDepth */ - 72, /* GameModeRefresh */ + { -1, -1, GL_TRUE }, /* GameModeSize */ + -1, /* GameModeDepth */ + -1, /* GameModeRefresh */ GLUT_ACTION_EXIT, /* ActionOnWindowClose */ GLUT_EXEC_STATE_INIT, /* ExecState */ NULL, /* ProgramName */ @@ -286,10 +286,10 @@ void fgDeinitialize( void ) fgState.KeyRepeat = GLUT_KEY_REPEAT_ON; fgState.Modifiers = INVALID_MODIFIERS; - fgState.GameModeSize.X = 640; - fgState.GameModeSize.Y = 480; - fgState.GameModeDepth = 16; - fgState.GameModeRefresh = 72; + fgState.GameModeSize.X = -1; + fgState.GameModeSize.Y = -1; + fgState.GameModeDepth = -1; + fgState.GameModeRefresh = -1; fgListInit( &fgState.Timers ); fgListInit( &fgState.FreeTimers ); @@ -315,9 +315,8 @@ void fgDeinitialize( void ) /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ - #if !TARGET_HOST_POSIX_X11 -#include "Common/xparsegeometry_repl.h" +# include "../Common/xparsegeometry_repl.h" #endif /* @@ -499,7 +498,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode ) configuration is conformant or not */ break ; - case 6 : /* "depth": Number of bits of precsion in the depth buffer */ + case 6 : /* "depth": Number of bits of precision in the depth buffer */ glut_state_flag |= GLUT_DEPTH ; /* Somebody fix this for me! */ break ; @@ -619,8 +618,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode ) break ; case 35 : /* "borderless": windows should not have borders */ -#if TARGET_HOST_POSIX_X11 -#endif + glut_state_flag |= GLUT_BORDERLESS; break ; case 36 : /* "aux": some number of aux buffers */ @@ -646,7 +644,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode ) void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion ) { - /* We will make use of these valuse when creating a new OpenGL context... */ + /* We will make use of these value when creating a new OpenGL context... */ fgState.MajorVersion = majorVersion; fgState.MinorVersion = minorVersion; } @@ -684,4 +682,4 @@ void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_l fgState.WarningFunc = vfgWarning; } -/*** END OF FILE ***/ +/*** END OF FILE ***/ \ No newline at end of file