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.

1 files changed, 17 insertions, 17 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index a1eb08ad2..88f3da3a9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -148,7 +148,7 @@ int nxagentSynchronizeDrawable(DrawablePtr pDrawable, int wait, unsigned int bre
 
   pDrawable = nxagentSplitDrawable(pDrawable);
 
-  if (!nxagentLosslessTrap)
+  if (nxagentLosslessTrap == 0)
   {
     if (nxagentDrawableStatus(pDrawable) == Synchronized)
     {
@@ -171,15 +171,15 @@ int nxagentSynchronizeDrawable(DrawablePtr pDrawable, int wait, unsigned int bre
    * transferred in a single operation.
    */
 
-  nxagentFBTrap = True;
+  nxagentFBTrap = 1;
 
-  nxagentSplitTrap = True;
+  nxagentSplitTrap = 1;
 
   result = nxagentSynchronizeDrawableData(pDrawable, breakMask, owner);
 
-  nxagentSplitTrap = False;
+  nxagentSplitTrap = 0;
 
-  nxagentFBTrap = False;
+  nxagentFBTrap = 0;
 
   if (wait == DO_WAIT && nxagentSplitResource(pDrawable) != NULL)
   {
@@ -253,7 +253,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
      * compression turned off.
      */
 
-    if (nxagentLosslessTrap)
+    if (nxagentLosslessTrap == 1)
     {
       pGC = nxagentGetGraphicContext(pDrawable);
 
@@ -285,7 +285,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
 
       goto nxagentSynchronizeDrawableDataEnd;
     }
-    else if (nxagentReconnectTrap)
+    else if (nxagentReconnectTrap == 1)
     {
       /*
        * The pixmap data is not synchronized unless
@@ -298,7 +298,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
       {
         #ifdef TEST
 
-        if (nxagentReconnectTrap)
+        if (nxagentReconnectTrap == 1)
         {
           static int totalLength;
           static int totalReconnectedPixmaps;
@@ -586,11 +586,11 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
 
   saveTrap = nxagentGCTrap;
 
-  nxagentGCTrap = False;
+  nxagentGCTrap = 0;
 
-  nxagentFBTrap = True;
+  nxagentFBTrap = 1;
 
-  nxagentSplitTrap = True;
+  nxagentSplitTrap = 1;
 
   pGC = nxagentGetGraphicContext(pDrawable);
 
@@ -894,7 +894,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
 
         if (owner != NULL)
         {
-          if (nxagentOption(Shadow) &&
+          if (nxagentOption(Shadow) == 1 &&
                   (nxagentOption(XRatio) != DONT_SCALE ||
                       nxagentOption(YRatio) != DONT_SCALE))
           {
@@ -945,15 +945,15 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
 
 nxagentSynchronizeRegionStop:
 
-  nxagentSplitTrap = False;
+  nxagentSplitTrap = 0;
 
-  nxagentFBTrap = False;
+  nxagentFBTrap = 0;
 
   nxagentGCTrap = saveTrap;
 
   success = 1;
 
-  if (!nxagentOption(Shadow))
+  if (nxagentOption(Shadow) == 0)
   {
     if (nxagentSynchronization.abort == 1)
     {
@@ -1025,7 +1025,7 @@ nxagentSynchronizeRegionStop:
         w = RegionRects(&collectedUpdates)[i].x2 - RegionRects(&collectedUpdates)[i].x1;
         h = RegionRects(&collectedUpdates)[i].y2 - RegionRects(&collectedUpdates)[i].y1;
        
-        if (nxagentOption(Shadow) &&
+        if (nxagentOption(Shadow) == 1 &&
                 (nxagentOption(XRatio) != DONT_SCALE ||
                     nxagentOption(YRatio) != DONT_SCALE))
         {
@@ -2633,7 +2633,7 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable)
 
   saveTrap = nxagentGCTrap;
 
-  nxagentGCTrap = True;
+  nxagentGCTrap = 1;
 
   if (nxagentDrawableStatus(pDrawable) == Synchronized)
   {