diff options
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/panoramiXprocs.c | 9 | ||||
| -rw-r--r-- | Xext/shape.c | 14 | ||||
| -rw-r--r-- | Xext/xace.c | 3 |
3 files changed, 6 insertions, 20 deletions
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 457e071a1..3cd2969ac 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -620,8 +620,7 @@ int PanoramiXTranslateCoords(ClientPtr client) * borderSize */ && (!wBoundingShape(pWin) || - RegionContainsPoint( - wBoundingShape(pWin), + RegionContainsPoint(wBoundingShape(pWin), x - pWin->drawable.x, y - pWin->drawable.y, &box)) ) @@ -1136,10 +1135,9 @@ int PanoramiXCopyArea(ClientPtr client) } if(pGC->graphicsExposures) { - ScreenPtr pScreen = pDst->pScreen; Bool overlap; RegionValidate(&totalReg, &overlap); - (*pScreen->SendGraphicsExpose)( + (*pDst->pScreen->SendGraphicsExpose)( client, &totalReg, stuff->dstDrawable, X_CopyArea, 0); RegionUninit(&totalReg); } @@ -1242,10 +1240,9 @@ int PanoramiXCopyPlane(ClientPtr client) } if(pGC->graphicsExposures) { - ScreenPtr pScreen = pdstDraw->pScreen; Bool overlap; RegionValidate(&totalReg, &overlap); - (*pScreen->SendGraphicsExpose)( + (*pdstDraw->pScreen->SendGraphicsExpose)( client, &totalReg, stuff->dstDrawable, X_CopyPlane, 0); RegionUninit(&totalReg); } diff --git a/Xext/shape.c b/Xext/shape.c index fb5b9a76c..33c0cb3e5 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -150,8 +150,6 @@ RegionOperate ( int xoff, int yoff, CreateDftPtr create) { - ScreenPtr pScreen = pWin->drawable.pScreen; - if (srcRgn && (xoff || yoff)) RegionTranslate(srcRgn, xoff, yoff); if (!pWin->parent) @@ -220,7 +218,7 @@ RegionOperate ( } if (srcRgn) RegionDestroy(srcRgn); - (*pScreen->SetShape) (pWin, kind); + (*pWin->drawable.pScreen->SetShape) (pWin, kind); SendShapeNotify (pWin, kind); return Success; } @@ -281,7 +279,6 @@ static int ProcShapeRectangles (ClientPtr client) { WindowPtr pWin; - ScreenPtr pScreen; REQUEST(xShapeRectanglesReq); xRectangle *prects; int nrects, ctype, rc; @@ -314,7 +311,6 @@ ProcShapeRectangles (ClientPtr client) client->errorValue = stuff->ordering; return BadValue; } - pScreen = pWin->drawable.pScreen; nrects = ((stuff->length << 2) - sizeof(xShapeRectanglesReq)); if (nrects & 4) return BadLength; @@ -489,7 +485,6 @@ static int ProcShapeCombine (ClientPtr client) { WindowPtr pSrcWin, pDestWin; - ScreenPtr pScreen; REQUEST(xShapeCombineReq); RegionPtr srcRgn; RegionPtr *destRgn; @@ -519,7 +514,6 @@ ProcShapeCombine (ClientPtr client) client->errorValue = stuff->destKind; return BadValue; } - pScreen = pDestWin->drawable.pScreen; rc = dixLookupWindow(&pSrcWin, stuff->src, client, DixGetAttrAccess); if (rc != Success) @@ -541,7 +535,7 @@ ProcShapeCombine (ClientPtr client) client->errorValue = stuff->srcKind; return BadValue; } - if (pSrcWin->drawable.pScreen != pScreen) + if (pSrcWin->drawable.pScreen != pDestWin->drawable.pScreen) { return BadMatch; } @@ -614,7 +608,6 @@ static int ProcShapeOffset (ClientPtr client) { WindowPtr pWin; - ScreenPtr pScreen; REQUEST(xShapeOffsetReq); RegionPtr srcRgn; int rc; @@ -638,11 +631,10 @@ ProcShapeOffset (ClientPtr client) client->errorValue = stuff->destKind; return BadValue; } - pScreen = pWin->drawable.pScreen; if (srcRgn) { RegionTranslate(srcRgn, stuff->xOff, stuff->yOff); - (*pScreen->SetShape) (pWin, stuff->destKind); + (*pWin->drawable.pScreen->SetShape) (pWin, stuff->destKind); } SendShapeNotify (pWin, (int)stuff->destKind); return Success; diff --git a/Xext/xace.c b/Xext/xace.c index 07e3da516..94b5b37c0 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -243,14 +243,11 @@ XaceCensorImage( unsigned int format, char *pBuf) { - ScreenPtr pScreen; RegionRec imageRegion; /* region representing x,y,w,h */ RegionRec censorRegion; /* region to obliterate */ BoxRec imageBox; int nRects; - pScreen = pDraw->pScreen; - imageBox.x1 = x; imageBox.y1 = y; imageBox.x2 = x + w; |