aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-10 23:56:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:00 +0200
commit817c3c6fc4fc8461668851803bfa3db77b7f7e6f (patch)
treef085f93d372597f1862b1c16b96de28b2ed6e645
parentd3869aa537a5711b680b5462569c141eab8109e7 (diff)
downloadnx-libs-817c3c6fc4fc8461668851803bfa3db77b7f7e6f.tar.gz
nx-libs-817c3c6fc4fc8461668851803bfa3db77b7f7e6f.tar.bz2
nx-libs-817c3c6fc4fc8461668851803bfa3db77b7f7e6f.zip
NXwindow.c: simplify window background code
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXwindow.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index f2b10fe45..f67295c43 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -249,18 +249,14 @@ InitRootWindow(WindowPtr pWin)
pWin->optional->cursor = rootCursor;
rootCursor->refcnt++;
-#ifdef NXAGENT_SPLASH
- if (blackRoot)
- pWin->background.pixel = pScreen->blackPixel;
- else
- pWin->background.pixel = pScreen->whitePixel;
- backFlag |= CWBackPixel;
-#else
+#ifndef NXAGENT_SPLASH
if (!blackRoot && !whiteRoot) {
MakeRootTile(pWin);
backFlag |= CWBackPixmap;
}
- else {
+ else
+#else
+ {
if (blackRoot)
pWin->background.pixel = pScreen->blackPixel;
else