aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Display.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:35:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:35:08 +0200
commit7392dd6a9b550538a5b7f2aa5204c805c15a9d6a (patch)
treee2f5a8fc5b50ed8eeeb018ffb7051f888b7dd5f1 /nx-X11/programs/Xserver/hw/nxagent/Display.c
parentc478ba2937b6a7e6c55b615ddeac3ca525f6a743 (diff)
parent450760bcafc8d2a708b9f6087f3c0c2cdab046a8 (diff)
downloadnx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.gz
nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.bz2
nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.zip
Merge branch 'uli42-pr/cleanup_wmisrunning' into 3.6.x
Attributes GH PR #728: https://github.com/ArcticaProject/nx-libs/pull/728
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 3ca3db2a3..448969d44 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -2492,12 +2492,10 @@ static int nxagentInitAndCheckVisuals(int flexibility)
long viMask;
int i, n;
- int matched;
- int compatible;
+ bool matched;
+ bool compatible = true;
int viNumList;
- compatible = 1;
-
viMask = VisualScreenMask;
viTemplate.screen = DefaultScreen(nxagentDisplay);
viTemplate.depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
@@ -2507,7 +2505,7 @@ static int nxagentInitAndCheckVisuals(int flexibility)
for (i = 0; i < nxagentNumVisuals; i++)
{
- matched = 0;
+ matched = false;
for (n = 0; n < viNumList; n++)
{
@@ -2528,7 +2526,7 @@ FIXME: Should the visual be ignored in this case?
#endif
}
- matched = 1;
+ matched = true;
nxagentVisualHasBeenIgnored[i] = FALSE;
@@ -2538,7 +2536,7 @@ FIXME: Should the visual be ignored in this case?
}
}
- if (matched == 0)
+ if (!matched)
{
if (nxagentVisuals[i].class == DirectColor)
{
@@ -2564,7 +2562,7 @@ FIXME: Should the visual be ignored in this case?
fprintf(stderr, "\tbits_per_rgb = %d\n", nxagentVisuals[i].bits_per_rgb);
#endif
- compatible = 0;
+ compatible = false;
break;
}
@@ -2573,7 +2571,7 @@ FIXME: Should the visual be ignored in this case?
XFree(viList);
- if (compatible == 1)
+ if (compatible)
{
#ifdef TEST
fprintf(stderr, "nxagentInitAndCheckVisuals: New visuals match with old visuals.\n");