diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /fb/fboverlay.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
Diffstat (limited to 'fb/fboverlay.c')
| -rw-r--r-- | fb/fboverlay.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 761cf0949..00521eef2 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2002/09/16 18:05:34 eich Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -179,7 +179,7 @@ fbOverlayUpdateLayerRegion (ScreenPtr pScreen, &pScrPriv->layer[i].u.run.region)) { /* paint new piece with chroma key */ - REGION_INIT (pScreen, &rgnNew, NullBox, 0); + REGION_NULL (pScreen, &rgnNew); REGION_INTERSECT (pScreen, &rgnNew, prgn, @@ -210,13 +210,10 @@ fbOverlayCopyWindow(WindowPtr pWin, FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); RegionRec rgnDst; int dx, dy; - WindowPtr pwinRoot; int i; RegionRec layerRgn[FB_OVERLAY_MAX]; PixmapPtr pPixmap; - pwinRoot = WindowTable[pWin->drawable.pScreen->myNum]; - dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; @@ -224,7 +221,7 @@ fbOverlayCopyWindow(WindowPtr pWin, * Clip to existing bits */ REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy); - REGION_INIT (pScreen, &rgnDst, NullBox, 0); + REGION_NULL (pScreen, &rgnDst); REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc); REGION_TRANSLATE(pScreen, &rgnDst, dx, dy); /* @@ -232,7 +229,7 @@ fbOverlayCopyWindow(WindowPtr pWin, */ for (i = 0; i < pScrPriv->nlayers; i++) { - REGION_INIT (pScreen, &layerRgn[i], NullBox, 0); + REGION_NULL (pScreen, &layerRgn[i]); REGION_INTERSECT(pScreen, &layerRgn[i], &rgnDst, &pScrPriv->layer[i].u.run.region); if (REGION_NOTEMPTY (pScreen, &layerRgn[i])) |