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 /miext | |
| 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 'miext')
| -rw-r--r-- | miext/cw/cw.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); |