pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed detection of display bounds after a mode switch when Xinerama is enabled.

Browse source
This commit is contained in:
Sam Lantinga 2012-09-28 11:51:16 -07:00
parent a6fdbb6213
commit 49cba901a5
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/video/x11/SDL_x11modes.c
View file

@ -637,6 +637,16 @@ get_real_resolution(Display * display, SDL_DisplayData * data, int *w, int *h,
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
if (data->use_xinerama) { if (data->use_xinerama) {
int screencount;
XineramaScreenInfo *xinerama;
/* Update the current screen layout information */
xinerama = XineramaQueryScreens(display, &screencount);
if (xinerama && data->screen < screencount) {
data->xinerama_info = xinerama[data->screen];
}
if (xinerama) XFree(xinerama);
*w = data->xinerama_info.width; *w = data->xinerama_info.width;
*h = data->xinerama_info.height; *h = data->xinerama_info.height;
*rate = 0; *rate = 0;
@ -789,21 +799,20 @@ X11_QuitModes(_THIS)
int int
X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect) X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect)
{ {
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
SDL_DisplayData *data = (SDL_DisplayData *) sdl_display->driverdata; SDL_DisplayData *data = (SDL_DisplayData *) sdl_display->driverdata;
int real_rate;
#if SDL_VIDEO_DRIVER_X11_XINERAMA
if (data && data->use_xinerama) {
rect->x = data->xinerama_info.x_org;
rect->y = data->xinerama_info.y_org;
rect->w = data->xinerama_info.width;
rect->h = data->xinerama_info.height;
return 0;
}
#endif
rect->x = 0; rect->x = 0;
rect->y = 0; rect->y = 0;
rect->w = sdl_display->current_mode.w; get_real_resolution(display, data, &rect->w, &rect->h, &real_rate);
rect->h = sdl_display->current_mode.h;
#if SDL_VIDEO_DRIVER_X11_XINERAMA
if (data->use_xinerama) {
rect->x = data->xinerama_info.x_org;
rect->y = data->xinerama_info.y_org;
}
#endif
return 0; return 0;
} }