xserver: Branch 'master'

[Adam Jackson]

 composite/compoverlay.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1731882341c191b4ffd78e0c1fd9297c636e0401
Author: Havoc Pennington <hp at pobox.com>
Date:   Fri Mar 27 12:30:37 2009 -0400

    Set bg pixmap of composite overlay window to None (#20912)
    
    Otherwise it's impossible to get the COW without a white
    flash on the screen, because it's on top, mapped immediately,
    and unaffected by composite redirection. This makes
    initial login ugly when it doesn't need to be.

diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index 94e5b03..68b4f12 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -125,13 +125,13 @@ compCreateOverlayWindow (ScreenPtr pScreen)
     CompScreenPtr   cs = GetCompScreen(pScreen);
     WindowPtr	    pRoot = WindowTable[pScreen->myNum];
     WindowPtr	    pWin;
-    XID		    overrideRedirect = TRUE;
+    XID		    attrs[] = { None, TRUE }; /* backPixmap, overrideRedirect */
     int		    result;
 
     pWin = cs->pOverlayWin = 
 	CreateWindow (cs->overlayWid, pRoot,
 		      0, 0, pScreen->width, pScreen->height, 0, 
-		      InputOutput, CWOverrideRedirect, &overrideRedirect,
+		      InputOutput, CWBackPixmap | CWOverrideRedirect, &attrs[0],
 		      pRoot->drawable.depth, 
 		      serverClient, pScreen->rootVisual, &result);
     if (pWin == NULL)