From e2929db7b737413cf93fbebdf4d15abdfebff05c Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 8 May 2010 14:10:51 -0700 Subject: dixChangeGC callers: Use ChangeGCVal instead of XID almost everywhere. The exceptions are ProcChangeGC and CreateGC. Signed-off-by: Jamey Sharp Reviewed-by: Keith Packard --- miext/cw/cw.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'miext') diff --git a/miext/cw/cw.c b/miext/cw/cw.c index 1959c8b73..c3bcdc8cb 100644 --- a/miext/cw/cw.c +++ b/miext/cw/cw.c @@ -188,7 +188,7 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) if (pDrawable->serialNumber != pPriv->serialNumber || (pPriv->stateChanges & (GCClipXOrigin|GCClipYOrigin|GCClipMask))) { - XID vals[2]; + ChangeGCVal vals[2]; RegionPtr pCompositeClip; pCompositeClip = REGION_CREATE (pScreen, NULL, 0); @@ -202,10 +202,10 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) (*pBackingGC->funcs->ChangeClip) (pBackingGC, CT_REGION, (pointer) pCompositeClip, 0); - vals[0] = x_off - pDrawable->x; - vals[1] = y_off - pDrawable->y; + vals[0].val = x_off - pDrawable->x; + vals[1].val = y_off - pDrawable->y; dixChangeGC(NullClient, pBackingGC, - (GCClipXOrigin | GCClipYOrigin), vals, NULL); + (GCClipXOrigin | GCClipYOrigin), NULL, vals); pPriv->serialNumber = pDrawable->serialNumber; /* @@ -223,11 +223,11 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) if ((pGC->patOrg.x + x_off) != pBackingGC->patOrg.x || (pGC->patOrg.y + y_off) != pBackingGC->patOrg.y) { - XID vals[2]; - vals[0] = pGC->patOrg.x + x_off; - vals[1] = pGC->patOrg.y + y_off; + ChangeGCVal vals[2]; + vals[0].val = pGC->patOrg.x + x_off; + vals[1].val = pGC->patOrg.y + y_off; dixChangeGC(NullClient, pBackingGC, - (GCTileStipXOrigin | GCTileStipYOrigin), vals, NULL); + (GCTileStipXOrigin | GCTileStipYOrigin), NULL, vals); } ValidateGC(pBackingDrawable, pBackingGC); -- cgit v1.2.3