diff -urN SDL-1.2.10.orig/src/video/x11/SDL_x11modes.c SDL-1.2.10/src/video/x11/SDL_x11modes.c --- SDL-1.2.10.orig/src/video/x11/SDL_x11modes.c 2006-05-07 00:47:58.000000000 -0300 +++ SDL-1.2.10/src/video/x11/SDL_x11modes.c 2006-05-26 23:55:29.000000000 -0300 @@ -629,7 +629,9 @@ #if SDL_VIDEO_DRIVER_X11_VIDMODE /* XVidMode */ if ( !use_xrandr && +#if SDL_VIDEO_DRIVER_X11_XINERAMA (!use_xinerama || xinerama_info.screen_number == 0) && +#endif CheckVidMode(this, &vm_major, &vm_minor) && SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) ) { @@ -901,6 +903,7 @@ screen_h = DisplayHeight(SDL_Display, SDL_Screen); #if SDL_VIDEO_DRIVER_X11_VIDMODE +#if SDL_VIDEO_DRIVER_X11_XINERAMA if ( use_xinerama && window_w <= xinerama_info.width && window_h <= xinerama_info.height ) { @@ -908,6 +911,7 @@ y = xinerama_info.y_org; } #endif +#endif if ( currently_fullscreen ) { /* Switch resolution and cover it with the FSwindow */ move_cursor_to(this, x, y); @@ -963,6 +967,7 @@ X11_GrabInputNoLock(this, SDL_GRAB_OFF); #if SDL_VIDEO_DRIVER_X11_VIDMODE +#if SDL_VIDEO_DRIVER_X11_XINERAMA if ( use_xinerama && window_w <= xinerama_info.width && window_h <= xinerama_info.height ) { @@ -970,6 +975,7 @@ y = xinerama_info.y_org; } #endif +#endif /* Map the fullscreen window to blank the screen */ screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen); diff -urN SDL-1.2.10.orig/src/video/x11/SDL_x11video.c SDL-1.2.10/src/video/x11/SDL_x11video.c --- SDL-1.2.10.orig/src/video/x11/SDL_x11video.c 2006-05-08 03:43:14.000000000 -0300 +++ SDL-1.2.10/src/video/x11/SDL_x11video.c 2006-05-26 23:55:32.000000000 -0300 @@ -330,11 +330,13 @@ XDestroyWindow(SDL_Display, FSwindow); #if SDL_VIDEO_DRIVER_X11_VIDMODE +#if SDL_VIDEO_DRIVER_X11_XINERAMA if ( use_xinerama ) { x = xinerama_info.x_org; y = xinerama_info.y_org; } #endif +#endif xattr.override_redirect = True; xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0; xattr.border_pixel = 0;