aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-02-15 11:45:14 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-02-15 11:45:14 +0100
commit24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch)
treeafec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/GCOps.c
parentb61934be2e9b4a8d3112270b0e691d47f99ba39f (diff)
parent586742b715a3e3451a4587439778c410a1970cdd (diff)
downloadnx-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/GCOps.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/GCOps.c32
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)
{