diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-06-05 20:55:29 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-05 22:07:21 -0700 |
| commit | a0fe6987b55b5326157b50e169b8d6b9ae26a1ae (patch) | |
| tree | 30bd5b4a9fef3d1435059bb2a32d4e8d9916195c /fb | |
| parent | 424b593c7872a703d3d0c942b7e8acc0770eb023 (diff) | |
Clean up after removal of screen parameters from region macros.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fb.h | 3 | ||||
| -rw-r--r-- | fb/fbglyph.c | 2 | ||||
| -rw-r--r-- | fb/fboverlay.c | 28 |
3 files changed, 12 insertions, 21 deletions
@@ -744,8 +744,7 @@ typedef struct { */ #define fbWindowEnabled(pWin) \ - RegionNotEmpty(\ - &(pWin)->drawable.pScreen->root->borderClip) + RegionNotEmpty(&(pWin)->drawable.pScreen->root->borderClip) #define fbDrawableEnabled(pDrawable) \ ((pDrawable)->type == DRAWABLE_PIXMAP ? \ diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 44fe80fc9..8208081e2 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -29,8 +29,6 @@ #include <X11/fonts/fontstruct.h> #include "dixfontstr.h" -#define dummyScreen screenInfo.screens[0] - Bool fbGlyphIn (RegionPtr pRegion, int x, diff --git a/fb/fboverlay.c b/fb/fboverlay.c index cda7fc793..7fca89c44 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -75,8 +75,7 @@ fbOverlayCreateWindow(WindowPtr pWin) */ if (!pWin->parent) { - RegionEmpty( - &pScrPriv->layer[i].u.run.region); + RegionEmpty(&pScrPriv->layer[i].u.run.region); } return TRUE; } @@ -182,30 +181,25 @@ fbOverlayUpdateLayerRegion (ScreenPtr pScreen, if (i == layer) { /* add new piece to this fb */ - RegionUnion( - &pScrPriv->layer[i].u.run.region, - &pScrPriv->layer[i].u.run.region, - prgn); + RegionUnion(&pScrPriv->layer[i].u.run.region, + &pScrPriv->layer[i].u.run.region, + prgn); } - else if (RegionNotEmpty( - &pScrPriv->layer[i].u.run.region)) + else if (RegionNotEmpty(&pScrPriv->layer[i].u.run.region)) { /* paint new piece with chroma key */ RegionNull(&rgnNew); - RegionIntersect( - &rgnNew, - prgn, - &pScrPriv->layer[i].u.run.region); + RegionIntersect(&rgnNew, prgn, + &pScrPriv->layer[i].u.run.region); (*pScrPriv->PaintKey) (&pScrPriv->layer[i].u.run.pixmap->drawable, &rgnNew, pScrPriv->layer[i].key, i); RegionUninit(&rgnNew); /* remove piece from other fbs */ - RegionSubtract( - &pScrPriv->layer[i].u.run.region, - &pScrPriv->layer[i].u.run.region, - prgn); + RegionSubtract(&pScrPriv->layer[i].u.run.region, + &pScrPriv->layer[i].u.run.region, + prgn); } } } @@ -219,7 +213,7 @@ fbOverlayCopyWindow(WindowPtr pWin, RegionPtr prgnSrc) { ScreenPtr pScreen = pWin->drawable.pScreen; - FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); + FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen); RegionRec rgnDst; int dx, dy; int i; |