[X2Go-Commits] [nx-libs] 303/429: nxagent: make nxagentCompositeEnable a Boolean

[git-admin at x2go.org]

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 3823b0a5b65bcfd4d38d9db9c481ef119781549e
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Mar 29 23:51:01 2021 +0200

    nxagent: make nxagentCompositeEnable a Boolean
    
    there's no need for that variable to be tri-state
---
 nx-X11/programs/Xserver/hw/nxagent/Composite.c | 12 +++++-------
 nx-X11/programs/Xserver/hw/nxagent/Composite.h |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Image.c     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixels.h    |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
index 7cecd3490..9e14a82bb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
@@ -47,7 +47,7 @@
  * Set if the composite extension is supported by the remote display.
  */
 
-int nxagentCompositeEnable = UNDEFINED;
+Bool nxagentCompositeEnable = False;
 
 void nxagentCompositeExtensionInit(void)
 {
@@ -55,7 +55,7 @@ void nxagentCompositeExtensionInit(void)
    * Set the flag only if the initialization completes.
    */
 
-  nxagentCompositeEnable = 0;
+  nxagentCompositeEnable = False;
 
   if (nxagentOption(Composite))
   {
@@ -96,7 +96,7 @@ void nxagentCompositeExtensionInit(void)
       fprintf(stderr, "nxagentCompositeExtensionInit: Enabling the use of the composite extension.\n");
       #endif
 
-      nxagentCompositeEnable = 1;
+      nxagentCompositeEnable = True;
     }
     #ifdef TEST
     else
@@ -115,8 +115,7 @@ void nxagentCompositeExtensionInit(void)
 
 void nxagentRedirectDefaultWindows(void)
 {
-  if (nxagentOption(Rootless) ||
-          nxagentCompositeEnable == 0)
+  if (nxagentOption(Rootless) || !nxagentCompositeEnable)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentRedirectDefaultWindows: Not redirecting default "
@@ -154,8 +153,7 @@ void nxagentRedirectDefaultWindows(void)
 
 void nxagentRedirectWindow(WindowPtr pWin)
 {
-  if (!nxagentOption(Rootless) ||
-          nxagentCompositeEnable == 0)
+  if (!nxagentOption(Rootless) || !nxagentCompositeEnable)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentRedirectWindow: Not redirecting window id [%ld] "
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.h b/nx-X11/programs/Xserver/hw/nxagent/Composite.h
index abe2551bf..02f08f878 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.h
@@ -31,7 +31,7 @@
  * its use is enabled.
  */
 
-extern int nxagentCompositeEnable;
+extern Bool nxagentCompositeEnable;
 
 /*
  * Query the composite extension on the
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index 57b7c2b57..bac9947f0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -700,7 +700,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
 
   if (!nxagentOption(IgnoreVisibility) && pDstDrawable -> type == DRAWABLE_WINDOW &&
           (!nxagentWindowIsVisible((WindowPtr) pDstDrawable) ||
-              (!nxagentDefaultWindowIsVisible() && nxagentCompositeEnable == 0)))
+              (!nxagentDefaultWindowIsVisible() && !nxagentCompositeEnable)))
   {
     #ifdef TEST
     fprintf(stderr, "nxagentCopyArea: Prevented operation on fully obscured window at [%p].\n",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 8c828df20..ad278491e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -526,7 +526,7 @@ void nxagentPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
 
   if (!nxagentOption(IgnoreVisibility) && pDrawable -> type == DRAWABLE_WINDOW &&
           (!nxagentWindowIsVisible((WindowPtr) pDrawable) ||
-              (!nxagentDefaultWindowIsVisible() && nxagentCompositeEnable == 0)))
+              (!nxagentDefaultWindowIsVisible() && !nxagentCompositeEnable)))
   {
 
     #ifdef TEST
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
index cf5e50c04..f2b43b0fc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
@@ -174,7 +174,7 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
 
 #define NXAGENT_SHOULD_SYNCHRONIZE_WINDOW(pDrawable)  \
     (nxagentWindowIsVisible((WindowPtr) pDrawable) && \
-        (nxagentDefaultWindowIsVisible() || nxagentCompositeEnable == 1))
+        (nxagentDefaultWindowIsVisible() || nxagentCompositeEnable))
 
 #define MINIMUM_PIXMAP_USAGE_COUNTER 2
 

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