Windows patches (Eero Pajarre)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@89 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
2cbefc0703
commit
fe2a9753bb
@ -255,12 +255,41 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
|
||||
|
||||
/*
|
||||
* Enumerate the available display modes
|
||||
* Try to get a complete match
|
||||
*/
|
||||
while( EnumDisplaySettings( NULL, displayModes, &devMode ) == TRUE )
|
||||
{
|
||||
/*
|
||||
* Does the enumerated display mode match the user's preferences?
|
||||
*/
|
||||
if( fghCheckDisplayMode( devMode.dmPelsWidth, devMode.dmPelsHeight,
|
||||
devMode.dmBitsPerPel, devMode.dmDisplayFrequency ) )
|
||||
{
|
||||
/*
|
||||
* OKi, we've found a matching display mode, remember its number and break
|
||||
*/
|
||||
mode = displayModes;
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Switch to the next display mode, if any
|
||||
*/
|
||||
displayModes++;
|
||||
}
|
||||
|
||||
if( mode == 0xffffffff )
|
||||
{
|
||||
/* then try without Display Frequency */
|
||||
displayModes=0;
|
||||
|
||||
/*
|
||||
* Enumerate the available display modes
|
||||
*/
|
||||
while( EnumDisplaySettings( NULL, displayModes, &devMode ) == TRUE )
|
||||
{
|
||||
/* then try without Display Frequency */
|
||||
|
||||
if( fghCheckDisplayMode( devMode.dmPelsWidth, devMode.dmPelsHeight,
|
||||
devMode.dmBitsPerPel, fgState.GameModeRefresh))
|
||||
{
|
||||
@ -276,6 +305,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
|
||||
*/
|
||||
displayModes++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Did we find a matching display mode?
|
||||
|
@ -364,7 +364,8 @@ int FGAPIENTRY glutGet( GLenum eWhat )
|
||||
/*
|
||||
* ...then we've got to correct the results we've just received...
|
||||
*/
|
||||
if ( fgStructure.Window->Parent == NULL )
|
||||
if (fgStructure.GameMode != fgStructure.Window &&
|
||||
fgStructure.Window->Parent == NULL )
|
||||
{
|
||||
winRect.left += GetSystemMetrics( SM_CXSIZEFRAME );
|
||||
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
|
||||
|
Reference in New Issue
Block a user