[X11DRV] XVidMode change...

[Lionel Ulmer]

Changelog:
 - Desktop mode should only disable mode switching, not gamma ramp support

-- 
		 Lionel Ulmer - http://www.bbrox.org/
-------------- next part --------------
Index: dlls/x11drv/xvidmode.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xvidmode.c,v
retrieving revision 1.20
diff -u -r1.20 xvidmode.c
--- dlls/x11drv/xvidmode.c	16 Jun 2003 01:21:31 -0000	1.20
+++ dlls/x11drv/xvidmode.c	12 Jul 2003 20:51:27 -0000
@@ -108,12 +108,10 @@
 {
   int nmodes, i;
   Bool ok;
+  Bool in_desktop_mode = (root_window != DefaultRootWindow(gdi_display));
 
   if (xf86vm_major) return; /* already initialized? */
 
-  /* if in desktop mode, don't use XVidMode */
-  if (root_window != DefaultRootWindow(gdi_display)) return;
-
   if (!usexvidmode) return;
 
   /* see if XVidMode is available */
@@ -138,11 +136,14 @@
 #endif
 
       /* 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();
   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);
 
   xf86vm_mode_count = nmodes;