[X2Go-Commits] [nx-libs] 305/429: nxagent: make nxagentAlpha* Booleans

[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 a6d018bef8897ccac1b481e14d94f9436841b21a
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Mar 30 00:02:05 2021 +0200

    nxagent: make nxagentAlpha* Booleans
---
 nx-X11/programs/Xserver/hw/nxagent/Args.c     | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Image.c    | 6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Image.h    | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Render.c   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index b4f9e7c83..e134d3be2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1884,11 +1884,11 @@ N/A
         fprintf(stderr, "nxagentPostProcessArgs: WARNING! Using backward compatible alpha encoding.\n");
         #endif
 
-        nxagentAlphaCompat = 1;
+        nxagentAlphaCompat = True;
       }
       else
       {
-        nxagentAlphaCompat = 0;
+        nxagentAlphaCompat = False;
       }
 
       nxagentRemoteMajor = remoteMajor;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index ad278491e..c033bf70d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -87,8 +87,8 @@ int nxagentSplitThreshold = -1;
  * Set if images can use the alpha channel.
  */
 
-int nxagentAlphaEnabled = 0;
-int nxagentAlphaCompat  = 0;
+Bool nxagentAlphaEnabled = False;
+Bool nxagentAlphaCompat = False;
 
 /*
  * Used to reformat image when connecting to displays having different
@@ -418,7 +418,7 @@ FIXME: Here the split trap is always set and so the caching of the
      * send the alpha data in compressed form.
      */
 
-    if (nxagentAlphaCompat == 0)
+    if (!nxagentAlphaCompat)
     {
       NXSetUnpackAlpha(nxagentDisplay, resource, PACK_NONE, size, data, size);
     }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/nx-X11/programs/Xserver/hw/nxagent/Image.h
index 6e22fa9f6..5876f5152 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.h
@@ -61,8 +61,8 @@ extern int nxagentSplitThreshold;
  * can be sent in compressed form.
  */
 
-extern int nxagentAlphaEnabled;
-extern int nxagentAlphaCompat;
+extern Bool nxagentAlphaEnabled;
+extern Bool nxagentAlphaCompat;
 
 /*
  * Reset the visual and alpha cache
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index 5851eb05c..eed64f808 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -123,7 +123,7 @@ extern void nxagentRenderCreateConicalGradient(PicturePtr pPicture,
                                                xRenderColor *colors);
 
 #ifdef NXAGENT_SERVER
-extern int nxagentAlphaEnabled;
+extern Bool nxagentAlphaEnabled;
 #endif
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 98d7aef67..205940ed7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -703,7 +703,7 @@ int nxagentCreatePicture(PicturePtr pPicture, Mask mask)
 
   nxagentPicturePriv(pPicture) -> picture = id;
 
-  if (nxagentAlphaEnabled == 1 && pPicture -> pDrawable->depth == 32 &&
+  if (nxagentAlphaEnabled && pPicture -> pDrawable -> depth == 32 &&
           pPicture -> pFormat -> direct.alpha != 0)
   {
     if (pPicture -> pDrawable -> type == DRAWABLE_PIXMAP)
@@ -2431,7 +2431,7 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2)
               (void *) pPicture, nxagentPicture(pPicture));
   #endif
 
-  if (nxagentAlphaEnabled == 1 && pPicture -> pDrawable -> depth == 32 &&
+  if (nxagentAlphaEnabled && pPicture -> pDrawable -> depth == 32 &&
           pPicture -> pFormat -> direct.alpha != 0)
   {
     if (pPicture -> pDrawable -> type == DRAWABLE_PIXMAP)

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