aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-03-30 00:02:05 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:36 +0200
commita6d018bef8897ccac1b481e14d94f9436841b21a (patch)
treeebe3b92a6042e0a6aa3929046eefad6d5ed60ba7 /nx-X11/programs/Xserver
parentaf5cf2659c4cc7c009ed7fa0fbb1a58e210e6453 (diff)
downloadnx-libs-a6d018bef8897ccac1b481e14d94f9436841b21a.tar.gz
nx-libs-a6d018bef8897ccac1b481e14d94f9436841b21a.tar.bz2
nx-libs-a6d018bef8897ccac1b481e14d94f9436841b21a.zip
nxagent: make nxagentAlpha* Booleans
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.h4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXrender.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c4
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)