[X2Go-Commits] [nx-libs] 164/219: NXwindow.c: simplify window background code

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:47 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit c610d706b44a48fbae633ead3e241ce57c31ccc6
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Aug 10 23:56:22 2019 +0200

    NXwindow.c: simplify window background code
---
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 12 ++++--------
 1 file 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list