joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2024-12-11 21:14:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #241

Browse Source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401858
This commit is contained in:
Sam Lantinga 2006-06-20 05:25:04 +00:00
parent dd7009690f
commit d565a14593
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/x11/SDL_x11modes.c
View File

@ -629,7 +629,9 @@ int X11_GetVideoModes(_THIS)
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_VIDMODE
/* XVidMode */ /* XVidMode */
if ( !use_xrandr && if ( !use_xrandr &&
#if SDL_VIDEO_DRIVER_X11_XINERAMA
(!use_xinerama || xinerama_info.screen_number == 0) && (!use_xinerama || xinerama_info.screen_number == 0) &&
#endif
CheckVidMode(this, &vm_major, &vm_minor) && CheckVidMode(this, &vm_major, &vm_minor) &&
SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) ) SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
{ {
@ -900,14 +902,15 @@ int X11_ResizeFullScreen(_THIS)
screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_w = DisplayWidth(SDL_Display, SDL_Screen);
screen_h = DisplayHeight(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen);
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_XINERAMA
if ( use_xinerama && if ( use_xinerama &&
window_w <= xinerama_info.width && window_w <= xinerama_info.width &&
window_h <= xinerama_info.height ) { window_h <= xinerama_info.height ) {
x = xinerama_info.x_org; x = xinerama_info.x_org;
y = xinerama_info.y_org; y = xinerama_info.y_org;
} }
#endif #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
if ( currently_fullscreen ) { if ( currently_fullscreen ) {
/* Switch resolution and cover it with the FSwindow */ /* Switch resolution and cover it with the FSwindow */
move_cursor_to(this, x, y); move_cursor_to(this, x, y);
@ -962,14 +965,15 @@ int X11_EnterFullScreen(_THIS)
/* Ungrab the input so that we can move the mouse around */ /* Ungrab the input so that we can move the mouse around */
X11_GrabInputNoLock(this, SDL_GRAB_OFF); X11_GrabInputNoLock(this, SDL_GRAB_OFF);
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_XINERAMA
if ( use_xinerama && if ( use_xinerama &&
window_w <= xinerama_info.width && window_w <= xinerama_info.width &&
window_h <= xinerama_info.height ) { window_h <= xinerama_info.height ) {
x = xinerama_info.x_org; x = xinerama_info.x_org;
y = xinerama_info.y_org; y = xinerama_info.y_org;
} }
#endif #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
/* Map the fullscreen window to blank the screen */ /* Map the fullscreen window to blank the screen */
screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_w = DisplayWidth(SDL_Display, SDL_Screen);
screen_h = DisplayHeight(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen);

2
src/video/x11/SDL_x11video.c
View File

@ -329,7 +329,7 @@ static void create_aux_windows(_THIS)
if(FSwindow) if(FSwindow)
XDestroyWindow(SDL_Display, FSwindow); XDestroyWindow(SDL_Display, FSwindow);
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_XINERAMA
if ( use_xinerama ) { if ( use_xinerama ) {
x = xinerama_info.x_org; x = xinerama_info.x_org;
y = xinerama_info.y_org; y = xinerama_info.y_org;