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

When using Xinerama, XVidMode always works on screen 0. Otherwise use the real X11 screen.

Browse source
This commit is contained in:
Sam Lantinga 2012-10-06 11:23:47 -07:00
parent c123ff043b
commit ed51c5f966
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -573,7 +573,12 @@ X11_InitModes(_THIS)
#endif #endif
use_vidmode) { use_vidmode) {
displaydata->use_vidmode = use_vidmode; displaydata->use_vidmode = use_vidmode;
XF86VidModeGetModeInfo(data->display, screen, &modedata->vm_mode); if (displaydata->use_xinerama) {
displaydata->vidmode_screen = 0;
} else {
displaydata->vidmode_screen = screen;
}
XF86VidModeGetModeInfo(data->display, displaydata->vidmode_screen, &modedata->vm_mode);
} }
#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */ #endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
@ -674,7 +679,7 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
#if SDL_VIDEO_DRIVER_X11_XVIDMODE #if SDL_VIDEO_DRIVER_X11_XVIDMODE
if (data->use_vidmode && if (data->use_vidmode &&
XF86VidModeGetAllModeLines(display, data->screen, &nmodes, &modes)) { XF86VidModeGetAllModeLines(display, data->vidmode_screen, &nmodes, &modes)) {
int i; int i;
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
@ -767,7 +772,7 @@ X11_SetDisplayMode(_THIS, SDL_VideoDisplay * sdl_display, SDL_DisplayMode * mode
#if SDL_VIDEO_DRIVER_X11_XVIDMODE #if SDL_VIDEO_DRIVER_X11_XVIDMODE
if (data->use_vidmode) { if (data->use_vidmode) {
XF86VidModeSwitchToMode(display, data->screen, &modedata->vm_mode); XF86VidModeSwitchToMode(display, data->vidmode_screen, &modedata->vm_mode);
} }
#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */ #endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */

4
src/video/x11/SDL_x11modes.h
View file

@ -45,6 +45,10 @@ typedef struct
RROutput xrandr_output; RROutput xrandr_output;
#endif #endif
#if SDL_VIDEO_DRIVER_X11_XVIDMODE
int vidmode_screen;
#endif
} SDL_DisplayData; } SDL_DisplayData;
typedef struct typedef struct