Desktop mode should only disable mode switching, not gamma ramp
support.
This commit is contained in:
parent
76fdbf038b
commit
cc0b7efead
|
@ -108,12 +108,10 @@ void X11DRV_XF86VM_Init(void)
|
||||||
{
|
{
|
||||||
int nmodes, i;
|
int nmodes, i;
|
||||||
Bool ok;
|
Bool ok;
|
||||||
|
Bool in_desktop_mode = (root_window != DefaultRootWindow(gdi_display));
|
||||||
|
|
||||||
if (xf86vm_major) return; /* already initialized? */
|
if (xf86vm_major) return; /* already initialized? */
|
||||||
|
|
||||||
/* if in desktop mode, don't use XVidMode */
|
|
||||||
if (root_window != DefaultRootWindow(gdi_display)) return;
|
|
||||||
|
|
||||||
if (!usexvidmode) return;
|
if (!usexvidmode) return;
|
||||||
|
|
||||||
/* see if XVidMode is available */
|
/* see if XVidMode is available */
|
||||||
|
@ -138,11 +136,14 @@ void X11DRV_XF86VM_Init(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* retrieve modes */
|
/* retrieve modes */
|
||||||
ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &modes);
|
if (!in_desktop_mode) ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &modes);
|
||||||
}
|
}
|
||||||
wine_tsx11_unlock();
|
wine_tsx11_unlock();
|
||||||
if (!ok) return;
|
if (!ok) return;
|
||||||
|
|
||||||
|
/* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */
|
||||||
|
if (in_desktop_mode) return;
|
||||||
|
|
||||||
TRACE("XVidMode modes: count=%d\n", nmodes);
|
TRACE("XVidMode modes: count=%d\n", nmodes);
|
||||||
|
|
||||||
xf86vm_mode_count = nmodes;
|
xf86vm_mode_count = nmodes;
|
||||||
|
|
Loading…
Reference in New Issue