encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a hint to enable the screensaver by default

This commit is contained in:
Sam Lantinga 2014-02-28 14:23:41 -08:00
parent ac32352f09
commit e56bbe3f71
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/SDL_hints.h
View File

@ -128,6 +128,17 @@ extern "C" {
*/ */
#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" #define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC"
/**
* \brief A variable controlling whether the screensaver is enabled.
*
* This variable can be set to the following values:
* "0" - Disable screensaver
* "1" - Enable screensaver
*
* By default SDL will disable the screensaver.
*/
#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER"
/** /**
* \brief A variable controlling whether the X11 VidMode extension should be used. * \brief A variable controlling whether the X11 VidMode extension should be used.
* *

12
src/video/SDL_video.c
View File

@ -421,8 +421,10 @@ int
SDL_VideoInit(const char *driver_name) SDL_VideoInit(const char *driver_name)
{ {
SDL_VideoDevice *video; SDL_VideoDevice *video;
const char *hint;
int index; int index;
int i; int i;
SDL_bool allow_screensaver;
/* Check to make sure we don't overwrite '_this' */ /* Check to make sure we don't overwrite '_this' */
if (_this != NULL) { if (_this != NULL) {
@ -510,7 +512,15 @@ SDL_VideoInit(const char *driver_name)
joystick, or passively watching a movie. Things that use SDL but joystick, or passively watching a movie. Things that use SDL but
function more like a normal desktop app should explicitly reenable the function more like a normal desktop app should explicitly reenable the
screensaver. */ screensaver. */
SDL_DisableScreenSaver(); hint = SDL_GetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER);
if (hint) {
allow_screensaver = SDL_atoi(hint) ? SDL_TRUE : SDL_FALSE;
} else {
allow_screensaver = SDL_FALSE;
}
if (!allow_screensaver) {
SDL_DisableScreenSaver();
}
/* If we don't use a screen keyboard, turn on text input by default, /* If we don't use a screen keyboard, turn on text input by default,
otherwise programs that expect to get text events without enabling otherwise programs that expect to get text events without enabling