xserver: Branch 'server-1.10-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Jun 1 19:41:08 PDT 2011
dix/window.c | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 5752cc473648bf73f9ca71b7ccffc03b23e9195b
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>
(cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a)
diff --git a/dix/window.c b/dix/window.c
index 9be7064..41306b3 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -474,6 +474,7 @@ InitRootWindow(WindowPtr pWin)
pWin->background.pixel = pScreen->whitePixel;
backFlag |= CWBackPixmap;
} else {
+ pWin->backgroundState = BackgroundPixel;
if (whiteRoot)
pWin->background.pixel = pScreen->whitePixel;
else
@@ -972,6 +973,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
More information about the xorg-commit
mailing list