aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Drawable.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/GCOps.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixels.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 2b81a55f5..ca1b09dd3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -2309,7 +2309,7 @@ void nxagentCorruptedRegionOnWindow(void *p0, XID x, void *p2)
* The window is not visible.
*/
- if (nxagentWindowIsVisible(pWin) == 0)
+ if (!nxagentWindowIsVisible(pWin))
{
return;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index ee56e9abf..57b7c2b57 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -699,8 +699,8 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
*/
if (!nxagentOption(IgnoreVisibility) && pDstDrawable -> type == DRAWABLE_WINDOW &&
- (nxagentWindowIsVisible((WindowPtr) pDstDrawable) == 0 ||
- (nxagentDefaultWindowIsVisible() == 0 && nxagentCompositeEnable == 0)))
+ (!nxagentWindowIsVisible((WindowPtr) pDstDrawable) ||
+ (!nxagentDefaultWindowIsVisible() && nxagentCompositeEnable == 0)))
{
#ifdef TEST
fprintf(stderr, "nxagentCopyArea: Prevented operation on fully obscured window at [%p].\n",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index eb4085ef3..8c828df20 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -525,8 +525,8 @@ void nxagentPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
*/
if (!nxagentOption(IgnoreVisibility) && pDrawable -> type == DRAWABLE_WINDOW &&
- (nxagentWindowIsVisible((WindowPtr) pDrawable) == 0 ||
- (nxagentDefaultWindowIsVisible() == 0 && nxagentCompositeEnable == 0)))
+ (!nxagentWindowIsVisible((WindowPtr) pDrawable) ||
+ (!nxagentDefaultWindowIsVisible() && nxagentCompositeEnable == 0)))
{
#ifdef TEST
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
index 7426acab2..cf5e50c04 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
@@ -173,8 +173,8 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
*/
#define NXAGENT_SHOULD_SYNCHRONIZE_WINDOW(pDrawable) \
- (nxagentWindowIsVisible((WindowPtr) pDrawable) == 1 && \
- (nxagentDefaultWindowIsVisible() == 1 || nxagentCompositeEnable == 1))
+ (nxagentWindowIsVisible((WindowPtr) pDrawable) && \
+ (nxagentDefaultWindowIsVisible() || nxagentCompositeEnable == 1))
#define MINIMUM_PIXMAP_USAGE_COUNTER 2