diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-08 14:10:51 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-13 17:13:48 -0700 |
| commit | e2929db7b737413cf93fbebdf4d15abdfebff05c (patch) | |
| tree | b32ddbf9c163f8eb814ebdaa4b22301b82af0906 /render | |
| parent | 95728ca09d45afc84c8d1828c09c6b6725f1a58d (diff) | |
dixChangeGC callers: Use ChangeGCVal instead of XID almost everywhere.
The exceptions are ProcChangeGC and CreateGC.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'render')
| -rw-r--r-- | render/mirect.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/render/mirect.c b/render/mirect.c index 0030eff62..38452ec39 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -45,7 +45,7 @@ miColorRects (PicturePtr pDst, ScreenPtr pScreen = pDst->pDrawable->pScreen; CARD32 pixel; GCPtr pGC; - CARD32 tmpval[5]; + ChangeGCVal tmpval[5]; RegionPtr pClip; unsigned long mask; @@ -54,14 +54,14 @@ miColorRects (PicturePtr pDst, pGC = GetScratchGC (pDst->pDrawable->depth, pScreen); if (!pGC) return; - tmpval[0] = GXcopy; - tmpval[1] = pixel; - tmpval[2] = pDst->subWindowMode; + tmpval[0].val = GXcopy; + tmpval[1].val = pixel; + tmpval[2].val = pDst->subWindowMode; mask = GCFunction | GCForeground | GCSubwindowMode; if (pClipPict->clientClipType == CT_REGION) { - tmpval[3] = pDst->clipOrigin.x - xoff; - tmpval[4] = pDst->clipOrigin.y - yoff; + tmpval[3].val = pDst->clipOrigin.x - xoff; + tmpval[4].val = pDst->clipOrigin.y - yoff; mask |= GCClipXOrigin|GCClipYOrigin; pClip = REGION_CREATE (pScreen, NULL, 1); @@ -70,7 +70,7 @@ miColorRects (PicturePtr pDst, (*pGC->funcs->ChangeClip) (pGC, CT_REGION, pClip, 0); } - dixChangeGC (NullClient, pGC, mask, tmpval, NULL); + dixChangeGC (NullClient, pGC, mask, NULL, tmpval); ValidateGC (pDst->pDrawable, pGC); if (xoff || yoff) { @@ -129,7 +129,8 @@ miCompositeRects (CARD8 op, int error; Pixel pixel; GCPtr pGC; - CARD32 tmpval[2]; + ChangeGCVal gcvals[2]; + XID tmpval[1]; rgbaFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8); if (!rgbaFormat) @@ -145,10 +146,10 @@ miCompositeRects (CARD8 op, pGC = GetScratchGC (rgbaFormat->depth, pScreen); if (!pGC) goto bail3; - tmpval[0] = GXcopy; - tmpval[1] = pixel; + gcvals[0].val = GXcopy; + gcvals[1].val = pixel; - dixChangeGC (NullClient, pGC, GCFunction | GCForeground, tmpval, NULL); + dixChangeGC (NullClient, pGC, GCFunction | GCForeground, NULL, gcvals); ValidateGC (&pPixmap->drawable, pGC); one.x = 0; one.y = 0; |