Mercurial > sdl-ios-xcode
changeset 4318:34a0a589b9c4 SDL-1.2
Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 10 Oct 2009 15:06:04 +0000 |
| parents | 719faf118c38 |
| children | edefeb52a627 |
| files | WhatsNew docs.html src/video/x11/SDL_x11modes.c |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/WhatsNew Sat Oct 10 14:59:32 2009 +0000 +++ b/WhatsNew Sat Oct 10 15:06:04 2009 +0000 @@ -8,6 +8,9 @@ SDL_reinterpret_cast(type, expression) SDL_static_cast(type, expression) + Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for + SDL_VIDEO_FULLSCREEN_HEAD on X11. + Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal up/down events for Caps-Lock and Num-Lock keys.
--- a/docs.html Sat Oct 10 14:59:32 2009 +0000 +++ b/docs.html Sat Oct 10 15:06:04 2009 +0000 @@ -93,7 +93,10 @@ SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) returns the correct value with GLX_SGI_swap_control. </P> <P> - The SDL_VIDEO_FULLSCREEN_HEAD environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen. + Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11. +</P> +<P> + The SDL_VIDEO_FULLSCREEN_DISPLAY environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen. </P> <P> Added the SDL_VIDEO_FBCON_ROTATION environment variable to control output orientation on the framebuffer console.
--- a/src/video/x11/SDL_x11modes.c Sat Oct 10 14:59:32 2009 +0000 +++ b/src/video/x11/SDL_x11modes.c Sat Oct 10 15:06:04 2009 +0000 @@ -548,7 +548,10 @@ int w, h; SDL_NAME(XineramaScreenInfo) *xinerama; - const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD"); + const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY"); + if ( !variable ) { + variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD"); + } if ( variable ) { desired = SDL_atoi(variable); }