# HG changeset patch # User Sam Lantinga # Date 1150781223 0 # Node ID 43ba677b4f6207ba4620fc7f297fdc6409d3855c # Parent 109bdfe06b3119d2cecc48318b9d95466e6ebe0a Fixed bug #241 diff -r 109bdfe06b31 -r 43ba677b4f62 src/video/x11/SDL_x11modes.c --- a/src/video/x11/SDL_x11modes.c Tue Jun 20 05:23:22 2006 +0000 +++ b/src/video/x11/SDL_x11modes.c Tue Jun 20 05:27:03 2006 +0000 @@ -737,14 +737,15 @@ screen_w = DisplayWidth(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 && window_w <= xinerama[this->current_display].width && window_h <= xinerama[this->current_display].height) { x = xinerama[this->current_display].x_org; y = xinerama[this->current_display].y_org; } -#endif +#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ + if (currently_fullscreen) { /* Switch resolution and cover it with the FSwindow */ move_cursor_to(this, x, y); @@ -801,14 +802,15 @@ /* Ungrab the input so that we can move the mouse around */ X11_GrabInputNoLock(this, SDL_GRAB_OFF); -#if SDL_VIDEO_DRIVER_X11_VIDMODE +#if SDL_VIDEO_DRIVER_X11_XINERAMA if (use_xinerama && window_w <= xinerama[this->current_display].width && window_h <= xinerama[this->current_display].height) { x = xinerama[this->current_display].x_org; y = xinerama[this->current_display].y_org; } -#endif +#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ + /* Map the fullscreen window to blank the screen */ screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen); diff -r 109bdfe06b31 -r 43ba677b4f62 src/video/x11/SDL_x11video.c --- a/src/video/x11/SDL_x11video.c Tue Jun 20 05:23:22 2006 +0000 +++ b/src/video/x11/SDL_x11video.c Tue Jun 20 05:27:03 2006 +0000 @@ -341,7 +341,7 @@ if (FSwindow) XDestroyWindow(SDL_Display, FSwindow); -#if SDL_VIDEO_DRIVER_X11_VIDMODE +#if SDL_VIDEO_DRIVER_X11_XINERAMA if (use_xinerama) { x = xinerama[this->current_display].x_org; y = xinerama[this->current_display].y_org;