From cda19b1d226d565f1ca4327aeae827c621b3dfd6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 3 Jun 2011 08:18:04 +0200 Subject: xserver xkeyboard-config mesa git update 3 Jun 2011 --- xorg-server/dix/main.c | 2 -- xorg-server/dix/window.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server/dix') diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index bc958b896..955b7ea9e 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -139,8 +139,6 @@ int main(int argc, char *argv[], char *envp[]) InitRegions(); - pixman_disable_out_of_bounds_workaround(); - CheckUserParameters(argc, argv, envp); CheckUserAuthorization(); diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index cd28d054a..5defe5849 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/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 -- cgit v1.2.3