summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
Diffstat (limited to 'dix')
-rw-r--r--dix/globals.c4
-rw-r--r--dix/window.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/dix/globals.c b/dix/globals.c
index 80a9ff504..60fd9a9ea 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -139,8 +139,8 @@ char *defaultCursorFont = COMPILEDCURSORFONT;
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */
CursorPtr rootCursor;
-Bool blackRoot=FALSE;
-Bool whiteRoot=FALSE;
+Bool party_like_its_1989 = FALSE;
+Bool whiteRoot = FALSE;
_X_EXPORT int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c
index b588f4466..6cba23d0b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -486,15 +486,14 @@ InitRootWindow(WindowPtr pWin)
rootCursor->refcnt++;
- if (!blackRoot && !whiteRoot) {
+ if (party_like_its_1989) {
MakeRootTile(pWin);
backFlag |= CWBackPixmap;
- }
- else {
- if (blackRoot)
- pWin->background.pixel = pScreen->blackPixel;
- else
+ } else {
+ if (whiteRoot)
pWin->background.pixel = pScreen->whitePixel;
+ else
+ pWin->background.pixel = pScreen->blackPixel;
backFlag |= CWBackPixel;
}