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 /mi/miarc.c | |
| 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 'mi/miarc.c')
| -rw-r--r-- | mi/miarc.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/mi/miarc.c b/mi/miarc.c index f2959c77b..bdcbdf140 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1036,16 +1036,16 @@ miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) if (!pGCTo) return; { - CARD32 gcvals[6]; - gcvals[0] = GXcopy; - gcvals[1] = 1; - gcvals[2] = 0; - gcvals[3] = pGC->lineWidth; - gcvals[4] = pGC->capStyle; - gcvals[5] = pGC->joinStyle; + ChangeGCVal gcvals[6]; + gcvals[0].val = GXcopy; + gcvals[1].val = 1; + gcvals[2].val = 0; + gcvals[3].val = pGC->lineWidth; + gcvals[4].val = pGC->capStyle; + gcvals[5].val = pGC->joinStyle; dixChangeGC(NullClient, pGCTo, GCFunction | GCForeground | GCBackground | GCLineWidth | - GCCapStyle | GCJoinStyle, gcvals, NULL); + GCCapStyle | GCJoinStyle, NULL, gcvals); } /* allocate a 1 bit deep pixmap of the appropriate size, and @@ -1085,11 +1085,14 @@ miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) iphase >= 0; iphase--) { + ChangeGCVal gcval; if (iphase == 1) { - dixChangeGC (NullClient, pGC, GCForeground, &bg, NULL); + gcval.val = bg; + dixChangeGC (NullClient, pGC, GCForeground, NULL, &gcval); ValidateGC (pDraw, pGC); } else if (pGC->lineStyle == LineDoubleDash) { - dixChangeGC (NullClient, pGC, GCForeground, &fg, NULL); + gcval.val = fg; + dixChangeGC (NullClient, pGC, GCForeground, NULL, &gcval); ValidateGC (pDraw, pGC); } for (i = 0; i < polyArcs[iphase].narcs; i++) { |