summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorMarko Macek <Marko.Macek@gmx.net>2011-05-21 13:30:59 +0100
committerKeith Packard <keithp@keithp.com>2011-06-01 18:42:23 -0700
commitc5b72fd350bbdfd1facd0ddd5085f238c4cf252a (patch)
treed9479cc2610bcbc343a6afbdb0979151a2c4a3e5 /dix
parentdb228d3d07a6d831f53e4c05c878327ad4d045eb (diff)
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@gmx.net> Reviewed-by: Walter Harms <wharms@bfs.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/window.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/window.c b/dix/window.c
index cd28d054a..5defe5849 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