diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
| commit | faae65fb3693fd1020e740e00f9038607bc4a430 (patch) | |
| tree | 8ee59a2342f6320f9e8dc3e714b118e106f8d64d /nx-X11/programs/Xserver/hw/nxagent/Split.c | |
| parent | d545afdf3967b0305c1215bb9f8a545b81fc24e8 (diff) | |
| parent | b44ecc0f897a5d03445aafc120e54b6475699254 (diff) | |
| download | nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.gz nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.bz2 nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.zip | |
Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x
Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Split.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 850056c21..2e2b130fe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -612,7 +612,7 @@ void nxagentValidateSplit(DrawablePtr pDrawable, RegionPtr pRegion) RegionIntersect(&tmpRegion, pResource -> region, pRegion); - if (RegionNil(&tmpRegion) == 0) + if (!RegionNil(&tmpRegion)) { #ifdef TEST fprintf(stderr, "nxagentValidateSplit: Marking the overlapping commits as invalid " @@ -829,11 +829,11 @@ static Bool nxagentWaitSplitPredicate(Display *disp, XEvent *event, XPointer ptr event -> xclient.format == 32); } -int nxagentWaitSplitEvent(int resource) +Bool nxagentWaitSplitEvent(int resource) { XEvent event; - int split = 0; + Bool split = 0; /* * Don't flush the link. We only want to query the NX transport to @@ -890,7 +890,7 @@ int nxagentWaitSplitEvent(int resource) { nxagentHandleStartSplitEvent(resource); - split = 1; + split = True; break; } @@ -1074,7 +1074,7 @@ void nxagentHandleEndSplitEvent(int resource) if (pResource -> drawable != NULL && pResource -> region != NullRegion) { - if (RegionNil(pResource -> region) == 0) + if (!RegionNil(pResource -> region)) { RegionSubtract( nxagentCorruptedRegion(pResource -> drawable), |