xserver: Branch 'master'

[Keith Packard]

 dix/window.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a
Author: Marko Macek <Marko.Macek at gmx.net>
Date:   Sat May 21 13:30:59 2011 +0100

    DIX: Set backgroundState correctly for root window
    
    When we change the root window's background to None, and we've run with
    -wr or -br for a forced solid background, make sure we also change the
    background state to BackgroundPixel, so we don't try to lookup either
    pScreen->whitePixel or pScreen->blackPixel as a pixmap.
    
    Signed-off-by: Marko Macek <Marko.Macek at gmx.net>
    Reviewed-by: Walter Harms <wharms at bfs.de>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/window.c b/dix/window.c
index cd28d05..5defe58 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -475,6 +475,7 @@ InitRootWindow(WindowPtr pWin)
         pWin->background.pixel = pScreen->whitePixel;
         backFlag |= CWBackPixmap;
     } else {
+        pWin->backgroundState = BackgroundPixel;
 	if (whiteRoot)
             pWin->background.pixel = pScreen->whitePixel;
         else
@@ -973,6 +974,7 @@ SetRootWindowBackground(WindowPtr pWin, ScreenPtr pScreen, Mask *index2)
     else if (party_like_its_1989)
 	MakeRootTile(pWin);
     else {
+        pWin->backgroundState = BackgroundPixel;
 	if (whiteRoot)
 	    pWin->background.pixel = pScreen->whitePixel;
 	else