X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_gamemode.c;h=e590385e0796c535c2da36f28d6cae65ec5a03c5;hb=4cb147e54debc316cb9c142159873ad24e0359ad;hp=137f1ea54e6bb5a6e5553ff76d7bdda657689043;hpb=d4846df601fa224353c65fa332f603a85735b5d8;p=freeglut diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c index 137f1ea..e590385 100644 --- a/src/freeglut_gamemode.c +++ b/src/freeglut_gamemode.c @@ -40,64 +40,122 @@ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ -static int xrandr_resize(int xsz, int ysz, int just_checking) +#if TARGET_HOST_POSIX_X11 +static int xrandr_resize(int xsz, int ysz, int rate, int just_checking) { - int res = -1; - #ifdef HAVE_X11_EXTENSIONS_XRANDR_H - int event_base, error_base; - Status st; - XRRScreenConfiguration *xrr_config; - XRRScreenSize *ssizes; - Rotation rot; - int i, ssizes_count, curr; - Time timestamp, cfg_timestamp; + int event_base, error_base, ver_major, ver_minor, use_rate; + XRRScreenConfiguration *xrr_config = 0; + Status result = -1; /* must check at runtime for the availability of the extension */ if(!XRRQueryExtension(fgDisplay.Display, &event_base, &error_base)) { return -1; } - if(!(xrr_config = XRRGetScreenInfo(fgDisplay.Display, fgDisplay.RootWindow))) { - fgWarning("XRRGetScreenInfo failed"); - return -1; - } - ssizes = XRRConfigSizes(xrr_config, &ssizes_count); - curr = XRRConfigCurrentConfiguration(xrr_config, &rot); - timestamp = XRRConfigTimes(xrr_config, &cfg_timestamp); - - if(xsz == ssizes[curr].width && ysz == ssizes[curr].height) { - /* no need to switch, we're already in the requested mode */ - res = 0; - goto done; - } + XRRQueryVersion(fgDisplay.Display, &ver_major, &ver_minor); + + /* we only heed the rate if we CAN actually use it (Xrandr >= 1.1) and + * the user actually cares about it (rate > 0) + */ + use_rate = rate > 0 && ver_major >= 1 && ver_minor >= 1; + + /* this loop is only so that the whole thing will be repeated if someone + * else changes video mode between our query the current information and + * the attempt to change it. + */ + do { + XRRScreenSize *ssizes; + short *rates; + Rotation rot; + int i, ssizes_count, rates_count, curr, res_idx = -1; + Time timestamp, cfg_timestamp; + + if(xrr_config) { + XRRFreeScreenConfigInfo(xrr_config); + } - for(i=0; i= 1 && RANDR_MINOR >= 1 + if(rate <= 0) { + fgState.GameModeRefresh = XRRConfigCurrentRate(xrr_config); + } + + if(use_rate) { + rate = fgState.GameModeRefresh; + + /* for the selected resolution, let's find out if there is + * a matching refresh rate available. + */ + rates = XRRConfigRates(xrr_config, res_idx, &rates_count); + + for(i=0; i= 1 && RANDR_MINOR >= 1 + if(use_rate) + result = XRRSetScreenConfigAndRate(fgDisplay.Display, xrr_config, + fgDisplay.RootWindow, res_idx, rot, rate, timestamp); + else +#endif + result = XRRSetScreenConfig(fgDisplay.Display, xrr_config, + fgDisplay.RootWindow, res_idx, rot, timestamp); + + } while(result == RRSetConfigInvalidTime); + + if(xrr_config) { + XRRFreeScreenConfigInfo(xrr_config); } - if((st = XRRSetScreenConfig(fgDisplay.Display, xrr_config, fgDisplay.RootWindow, - i, rot, timestamp)) != 0) { - fgWarning("XRRSetScreenConfig failed"); - goto done; + if(result == 0) { + return 0; } - res = 0; -done: - XRRFreeScreenConfigInfo(xrr_config); -#endif - return res; +#endif /* HAVE_X11_EXTENSIONS_XRANDR_H */ + return -1; } - +#endif /* TARGET_HOST_POSIX_X11 */ /* * Remembers the current visual settings, so that @@ -108,6 +166,18 @@ static void fghRememberState( void ) #if TARGET_HOST_POSIX_X11 int event_base, error_base; + /* + * Remember the current pointer location before going fullscreen + * for restoring it later: + */ + Window junk_window; + unsigned int junk_mask; + + XQueryPointer(fgDisplay.Display, fgDisplay.RootWindow, + &junk_window, &junk_window, + &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, + &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, &junk_mask); + # ifdef HAVE_X11_EXTENSIONS_XRANDR_H if(XRRQueryExtension(fgDisplay.Display, &event_base, &error_base)) { XRRScreenConfiguration *xrr_config; @@ -121,9 +191,17 @@ static void fghRememberState( void ) fgDisplay.prev_xsz = ssizes[curr].width; fgDisplay.prev_ysz = ssizes[curr].height; + fgDisplay.prev_refresh = -1; + +# if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1 + if(fgState.GameModeRefresh != -1) { + fgDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config); + } +# endif + fgDisplay.prev_size_valid = 1; + XRRFreeScreenConfigInfo(xrr_config); - return; } } # endif @@ -148,21 +226,6 @@ static void fghRememberState( void ) &fgDisplay.DisplayViewPortY ) ) fgWarning( "XF86VidModeGetViewPort failed" ); - /* - * Remember the current pointer location before going fullscreen - * for restoring it later: - */ - { - Window junk_window; - unsigned int mask; - - XQueryPointer( - fgDisplay.Display, fgDisplay.RootWindow, - &junk_window, &junk_window, - &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, - &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, &mask - ); - } /* Query the current display settings: */ fgDisplay.DisplayModeValid = @@ -174,7 +237,7 @@ static void fghRememberState( void ) ); if( !fgDisplay.DisplayModeValid ) - fgWarning( "XF86VidModeGetModeLine failed" ); + fgWarning( "XF86VidModeGetModeLine failed" ); # endif #elif TARGET_HOST_MS_WINDOWS @@ -202,24 +265,28 @@ static void fghRememberState( void ) static void fghRestoreState( void ) { #if TARGET_HOST_POSIX_X11 + /* Restore the remembered pointer position: */ + XWarpPointer( + fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0, + fgDisplay.DisplayPointerX, fgDisplay.DisplayPointerY + ); + # ifdef HAVE_X11_EXTENSIONS_XRANDR_H if(fgDisplay.prev_size_valid) { - if(xrandr_resize(fgDisplay.prev_xsz, fgDisplay.prev_ysz, 0) != -1) { + if(xrandr_resize(fgDisplay.prev_xsz, fgDisplay.prev_ysz, fgDisplay.prev_refresh, 0) != -1) { fgDisplay.prev_size_valid = 0; +# ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H + fgDisplay.DisplayModeValid = 0; +# endif return; } } # endif -# ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H - /* Restore the remembered pointer position: */ - XWarpPointer( - fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0, - fgDisplay.DisplayPointerX, fgDisplay.DisplayPointerY - ); +# ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H /* * This highly depends on the XFree86 extensions, * not approved as X Consortium standards @@ -265,7 +332,7 @@ static void fghRestoreState( void ) fgDisplay.Screen, fgDisplay.DisplayViewPortX, fgDisplay.DisplayViewPortY ) ) - fgWarning( "HAVE_X11_EXTENSIONS_XF86VMODE_H failed" ); + fgWarning( "XF86VidModeSetViewPort failed" ); /* @@ -275,6 +342,11 @@ static void fghRestoreState( void ) */ XFlush( fgDisplay.Display ); + fgDisplay.DisplayModeValid = 0; +# ifdef HAVE_X11_EXTENSIONS_XRANDR_H + fgDisplay.prev_size_valid = 0; +# endif + break; } } @@ -351,7 +423,8 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) /* first try to use XRandR, then fallback to XF86VidMode */ # ifdef HAVE_X11_EXTENSIONS_XRANDR_H - if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y, haveToTest) != -1) { + if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y, + fgState.GameModeRefresh, haveToTest) != -1) { return GL_TRUE; } # endif @@ -364,7 +437,7 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) # ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H /* - * This is also used by applcations which check modes by calling + * This is also used by applications which check modes by calling * glutGameModeGet(GLUT_GAME_MODE_POSSIBLE), so allow the check: */ if( haveToTest || fgDisplay.DisplayModeValid ) @@ -372,6 +445,42 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) XF86VidModeModeInfo** displayModes; int i, displayModesCount; + /* If we don't have a valid modeline in the display structure, which + * can happen if this is called from glutGameModeGet instead of + * glutEnterGameMode, then we need to query the current mode, to make + * unspecified settings to default to their current values. + */ + if(!fgDisplay.DisplayModeValid) { + if(!XF86VidModeGetModeLine(fgDisplay.Display, fgDisplay.Screen, + &fgDisplay.DisplayModeClock, &fgDisplay.DisplayMode)) { + return success; + } + } + + if (fgState.GameModeSize.X == -1) + { + fgState.GameModeSize.X = fgDisplay.DisplayMode.hdisplay; + } + if (fgState.GameModeSize.Y == -1) + { + fgState.GameModeSize.Y = fgDisplay.DisplayMode.vdisplay; + } + if (fgState.GameModeDepth == -1) + { + /* can't get color depth from this, nor can we change it, do nothing + * TODO: get with XGetVisualInfo()? but then how to set? + */ + } + if (fgState.GameModeRefresh == -1) + { + /* Compute the displays refresh rate, dotclock comes in kHz. */ + int refresh = ( fgDisplay.DisplayModeClock * 1000 ) / + ( fgDisplay.DisplayMode.htotal * fgDisplay.DisplayMode.vtotal ); + + fgState.GameModeRefresh = refresh; + } + + /* query all possible display modes */ if( !XF86VidModeGetAllModeLines( fgDisplay.Display, fgDisplay.Screen, @@ -404,20 +513,14 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) XFree( displayModes ); } -# else - - /* - * XXX warning fghChangeDisplayMode: missing XFree86 video mode extensions, - * XXX game mode will not change screen resolution when activated - */ - success = GL_TRUE; - # endif + #elif TARGET_HOST_MS_WINDOWS DEVMODE devMode; char *fggmstr = NULL; + char displayMode[300]; success = GL_FALSE; @@ -450,12 +553,15 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) case DISP_CHANGE_SUCCESSFUL: success = GL_TRUE; - /* update vars in case if windows switched to proper mode */ - EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); - fgState.GameModeSize.X = devMode.dmPelsWidth; - fgState.GameModeSize.Y = devMode.dmPelsHeight; - fgState.GameModeDepth = devMode.dmBitsPerPel; - fgState.GameModeRefresh = devMode.dmDisplayFrequency; + if (!haveToTest) + { + /* update vars in case if windows switched to proper mode */ + EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); + fgState.GameModeSize.X = devMode.dmPelsWidth; + fgState.GameModeSize.Y = devMode.dmPelsHeight; + fgState.GameModeDepth = devMode.dmBitsPerPel; + fgState.GameModeRefresh = devMode.dmDisplayFrequency; + } break; case DISP_CHANGE_RESTART: fggmstr = "The computer must be restarted for the graphics mode to work."; @@ -478,8 +584,14 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) } if ( !success ) - fgWarning(fggmstr); /* I'd rather get info whats going on in my program than wonder about */ - /* magic happenings behind my back, its lib for devels at last ;) */ + { + /* I'd rather get info whats going on in my program than wonder about */ + /* magic happenings behind my back, its lib for devels at last ;) */ + + /* append display mode to error to make things more informative */ + sprintf(displayMode,"%s Problem with requested mode: %ix%i:%i@%i", fggmstr, devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmDisplayFrequency); + fgWarning(displayMode); + } #endif return success; @@ -516,11 +628,14 @@ void FGAPIENTRY glutGameModeString( const char* string ) string ); - /* Hopefully it worked, and if not, we still have the default values */ - if ( width > 0 ) fgState.GameModeSize.X = width; - if ( height > 0 ) fgState.GameModeSize.Y = height; - if ( depth > 0 ) fgState.GameModeDepth = depth; - if ( refresh > 0 ) fgState.GameModeRefresh = refresh; + /* All values not specified are now set to -1, which means those + * aspects of the current display mode are not changed in + * fghChangeDisplayMode() above. + */ + fgState.GameModeSize.X = width; + fgState.GameModeSize.Y = height; + fgState.GameModeDepth = depth; + fgState.GameModeRefresh = refresh; } @@ -560,7 +675,6 @@ int FGAPIENTRY glutEnterGameMode( void ) * the window before we can grab the pointer into it: */ XSync( fgDisplay.Display, False ); - /* * Grab the pointer to confine it into the window after the calls to * XWrapPointer() which ensure that the pointer really enters the window. @@ -578,7 +692,6 @@ int FGAPIENTRY glutEnterGameMode( void ) GrabModeAsync, GrabModeAsync, fgStructure.GameModeWindow->Window.Handle, None, CurrentTime) ) usleep( 100 ); - /* * Change input focus to the new window. This will exit the application * if the new window is not viewable yet, see the XGrabPointer loop above.