[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winshadgdi.c, 1.1.4.1.2.13, 1.1.4.1.2.14

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv14546

Modified Files:
      Tag: CYGWIN
	winshadgdi.c 
Log Message:
Turn back on the manually minimizing and restoring of our window when using the ShadowGDI engine in fullscreen mode.  We perform the restoring or minimizing manually for ShadowGDI in fullscreen modes so that this engine will perform just like ShadowDD and ShadowDDNL in fullscreen mode; if we do not do this then our fullscreen window will appear in the z-order when it is deactivated and it can be uncovered by resizing or minimizing another window that is on top of it, which is not how the DirectDraw engines work.  (Harold L Hunt II - CodeWeavers)

Index: winshadgdi.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winshadgdi.c,v
retrieving revision 1.1.4.1.2.13
retrieving revision 1.1.4.1.2.14
diff -u -d -r1.1.4.1.2.13 -r1.1.4.1.2.14
--- a/winshadgdi.c	10 Apr 2004 06:18:29 -0000	1.1.4.1.2.13
+++ b/winshadgdi.c	14 Apr 2004 00:00:25 -0000	1.1.4.1.2.14
@@ -898,17 +898,21 @@
 static Bool
 winActivateAppShadowGDI (ScreenPtr pScreen)
 {
-  /*
-   * 2004/04/10 - Harold - We don't seem to ned to do anything here
-   * since our window should be z-ordered correctly in fullscreen mode.
-   */
-  return TRUE;
-
-#if 0
   winScreenPriv(pScreen);
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
 
   /*
+   * 2004/04/12 - Harold - We perform the restoring or minimizing
+   * manually for ShadowGDI in fullscreen modes so that this engine
+   * will perform just like ShadowDD and ShadowDDNL in fullscreen mode;
+   * if we do not do this then our fullscreen window will appear in the
+   * z-order when it is deactivated and it can be uncovered by resizing
+   * or minimizing another window that is on top of it, which is not how
+   * the DirectDraw engines work.  Therefore we keep this code here to
+   * make sure that all engines work the same in fullscreen mode.
+   */
+
+  /*
    * Are we active?
    * Are we fullscreen?
    */
@@ -930,7 +934,6 @@
        */
       ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
     }
-#endif
 
   return TRUE;
 }