# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1306994068 25200
# Node ID d4fde4ea232f56b7df00cdf409fe5bf7150943f4
# Parent  5625f8498d99d7b78c38ff7325c709e943656552
7050250 xsetroot crashes Xorg server

diff -r 5625f8498d99 -r d4fde4ea232f open-src/xserver/xorg/7050250.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/7050250.patch	Wed Jun 01 22:54:28 2011 -0700
@@ -0,0 +1,42 @@
+From 5752cc473648bf73f9ca71b7ccffc03b23e9195b Mon Sep 17 00:00:00 2001
+From: Marko Macek <Marko.Macek@gmx.net>
+Date: Sat, 21 May 2011 13:30:59 +0100
+Subject: [PATCH 1/2] 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>
+(cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a)
+---
+ dix/window.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+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
+-- 
+1.7.3.2
+
diff -r 5625f8498d99 -r d4fde4ea232f open-src/xserver/xorg/patch-list
--- a/open-src/xserver/xorg/patch-list	Wed Jun 01 16:55:00 2011 -0700
+++ b/open-src/xserver/xorg/patch-list	Wed Jun 01 22:54:28 2011 -0700
@@ -1,3 +1,4 @@
+7050250.patch,-p1
 oslog-race.patch,-p1
 sun-paths.patch,-p1
 sun-extramodes.patch,-p1