diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/GC.c | |
parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/GC.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/GC.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index 2facc7227..2fac2f100 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -385,7 +385,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask) else { if (nxagentDrawableStatus((DrawablePtr) pGC -> tile.pixmap) == NotSynchronized && - !nxagentGCTrap) + nxagentGCTrap == 0) { /* * If the tile is corrupted and is not too @@ -437,7 +437,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask) if (mask & GCStipple) { if (nxagentDrawableStatus((DrawablePtr) pGC -> stipple) == NotSynchronized && - !nxagentGCTrap) + nxagentGCTrap == 0) { #ifdef TEST fprintf(stderr, "nxagentChangeGC: WARNING! Synchronizing GC at [%p] due the stipple at [%p].\n", @@ -535,7 +535,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask) { mask &= ~GCDashList; - if (!nxagentGCTrap) + if (nxagentGCTrap == 0) { XSetDashes(nxagentDisplay, nxagentGC(pGC), pGC->dashOffset, (char *)pGC->dash, pGC->numInDashList); @@ -549,7 +549,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask) changeFlag += nxagentTestGC(values.arc_mode, arc_mode); } - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { #ifdef TEST fprintf(stderr, "nxagentChangeGC: Skipping change of GC at [%p] on the real X server.\n", @@ -668,7 +668,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) { case CT_NONE: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { XSetClipMask(nxagentDisplay, nxagentGC(pGC), None); } @@ -677,7 +677,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_REGION: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { nRects = RegionNumRects((RegionPtr)pValue); size = nRects * sizeof(*pRects); @@ -701,7 +701,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_PIXMAP: { - if (!nxagentGCTrap) + if (nxagentGCTrap == 0) { XSetClipMask(nxagentDisplay, nxagentGC(pGC), nxagentPixmap((PixmapPtr)pValue)); @@ -719,7 +719,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_UNSORTED: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC->clipOrg.x, pGC->clipOrg.y, @@ -730,7 +730,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_YSORTED: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC->clipOrg.x, pGC->clipOrg.y, @@ -741,7 +741,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_YXSORTED: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC->clipOrg.x, pGC->clipOrg.y, @@ -752,7 +752,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) } case CT_YXBANDED: { - if (clipsMatch == 0 && !nxagentGCTrap) + if (clipsMatch == 0 && nxagentGCTrap == 0) { XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC->clipOrg.x, pGC->clipOrg.y, @@ -809,7 +809,7 @@ void nxagentDestroyClip(GCPtr pGC) nxagentDestroyClipHelper(pGC); - if (!nxagentGCTrap) + if (nxagentGCTrap == 0) { XSetClipMask(nxagentDisplay, nxagentGC(pGC), None); } @@ -1453,7 +1453,7 @@ GCPtr nxagentGetScratchGC(unsigned depth, ScreenPtr pScreen) nxagentSaveGCTrap = nxagentGCTrap; - nxagentGCTrap = False; + nxagentGCTrap = 0; pGC = GetScratchGC(depth, pScreen); |