summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
Diffstat (limited to 'mi')
-rw-r--r--mi/micopy.c4
-rw-r--r--mi/miexpose.c2
-rw-r--r--mi/migc.c4
-rw-r--r--mi/mioverlay.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/mi/micopy.c b/mi/micopy.c
index 652c6207e..2fb40f5f6 100644
--- a/mi/micopy.c
+++ b/mi/micopy.c
@@ -192,7 +192,7 @@ miDoCopy (DrawablePtr pSrcDrawable,
/* Compute source clip region */
if (pSrcDrawable->type == DRAWABLE_PIXMAP)
{
- if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE))
+ if ((pSrcDrawable == pDstDrawable) && !pGC->clientClip)
prgnSrcClip = miGetCompositeClip(pGC);
else
fastSrc = TRUE;
@@ -215,7 +215,7 @@ miDoCopy (DrawablePtr pSrcDrawable,
fastSrc = TRUE;
}
else if ((pSrcDrawable == pDstDrawable) &&
- (pGC->clientClipType == CT_NONE))
+ !pGC->clientClip)
{
prgnSrcClip = miGetCompositeClip(pGC);
}
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 0f1ebe59c..ce02b1341 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -251,7 +251,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
RegionIntersect(&rgnExposed, &rgnExposed, prgnDstClip);
/* intersect with client clip region. */
- if (pGC->clientClipType == CT_REGION)
+ if (pGC->clientClip)
RegionIntersect(&rgnExposed, &rgnExposed, pGC->clientClip);
/*
diff --git a/mi/migc.c b/mi/migc.c
index dce1f3070..bf9cf5a06 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -88,7 +88,7 @@ miComputeCompositeClip( GCPtr pGC, DrawablePtr pDrawable)
* regions. (this wins especially if many clients clip by children
* and have no client clip.)
*/
- if (pGC->clientClipType == CT_NONE)
+ if (!pGC->clientClip)
{
if (freeCompClip)
RegionDestroy(pGC->pCompositeClip);
@@ -155,7 +155,7 @@ miComputeCompositeClip( GCPtr pGC, DrawablePtr pDrawable)
pGC->pCompositeClip = RegionCreate(&pixbounds, 1);
}
- if (pGC->clientClipType == CT_REGION)
+ if (pGC->clientClip)
{
if(pDrawable->x || pDrawable->y) {
RegionTranslate(pGC->clientClip,
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 766c5e7f7..fe2063db7 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1745,7 +1745,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
freeTmpClip = FALSE;
}
freeCompClip = pGC->freeCompClip;
- if (pGC->clientClipType == CT_NONE) {
+ if (!pGC->clientClip) {
if (freeCompClip)
RegionDestroy(pGC->pCompositeClip);
pGC->pCompositeClip = pregWin;