diff options
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/GCOps.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/GCOps.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 0617e73ac..beb9ef05f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -80,7 +80,7 @@ static int nxagentSaveGCTrap; { \ nxagentSaveGCTrap = nxagentGCTrap;\ \ - nxagentGCTrap = True; \ + nxagentGCTrap = 1; \ } #define RESET_GC_TRAP() \ @@ -696,7 +696,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, } - if (nxagentGCTrap || nxagentShmTrap) + if (nxagentGCTrap == 1 || nxagentShmTrap == 1) { if (pSrcDrawable -> type == DRAWABLE_PIXMAP && pDstDrawable -> type == DRAWABLE_PIXMAP) @@ -730,7 +730,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, * to the check in Image.c, this is of little use. */ - if (!nxagentOption(IgnoreVisibility) && pDstDrawable -> type == DRAWABLE_WINDOW && + if (nxagentOption(IgnoreVisibility) == 0 && pDstDrawable -> type == DRAWABLE_WINDOW && (nxagentWindowIsVisible((WindowPtr) pDstDrawable) == 0 || (nxagentDefaultWindowIsVisible() == 0 && nxagentCompositeEnable == 0))) { @@ -934,7 +934,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, (void *) pDstDrawable, srcx, srcy, dstx, dsty, width, height); #endif - if (nxagentGCTrap || nxagentShmTrap) + if (nxagentGCTrap == 1 || nxagentShmTrap == 1) { if (pSrcDrawable -> type == DRAWABLE_PIXMAP && pDstDrawable -> type == DRAWABLE_PIXMAP) @@ -1118,7 +1118,7 @@ void nxagentPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, (void *) pDrawable, (void *) pGC, nPoints); #endif - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1175,7 +1175,7 @@ void nxagentPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, void nxagentPolyLines(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints, xPoint *pPoints) { - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1248,7 +1248,7 @@ void nxagentPolySegment(DrawablePtr pDrawable, GCPtr pGC, #endif - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1325,7 +1325,7 @@ void nxagentPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, #endif - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1390,7 +1390,7 @@ void nxagentPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, void nxagentPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs) { - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1449,7 +1449,7 @@ void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, { xPoint *newPoints = NULL; - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1571,7 +1571,7 @@ void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, #endif - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1719,7 +1719,7 @@ void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, void nxagentPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs) { - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1798,7 +1798,7 @@ int nxagentPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, width = XTextWidth(nxagentFontStruct(pGC->font), string, count); - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1871,7 +1871,7 @@ int nxagentPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, width = XTextWidth16(nxagentFontStruct(pGC->font), (XChar2b *)string, count); - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1930,7 +1930,7 @@ int nxagentPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, void nxagentImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, char *string) { - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -1987,7 +1987,7 @@ void nxagentImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *string) { - if (nxagentGCTrap) + if (nxagentGCTrap == 1) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { |