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 /dix/dixfonts.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 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 332fb9728..01123c3a9 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1166,7 +1166,7 @@ badAlloc: #define TextEltHeader 2 #define FontShiftSize 5 -static XID clearGC[] = { CT_NONE }; +static ChangeGCVal clearGC[] = { { .ptr = NullPixmap } }; #define clearGCmask (GCClipMask) int @@ -1261,7 +1261,9 @@ doPolyText(ClientPtr client, PTclosurePtr c) { if (pFont != c->pGC->font && c->pDraw) { - dixChangeGC(NullClient, c->pGC, GCFont, &fid, NULL); + ChangeGCVal val; + val.ptr = pFont; + dixChangeGC(NullClient, c->pGC, GCFont, NULL, &val); ValidateGC(c->pDraw, c->pGC); if (c->reqType == X_PolyText8) c->polyText = (PolyTextPtr) c->pGC->ops->PolyText8; @@ -1404,7 +1406,9 @@ bail: /* Step 4 */ if (pFont != origGC->font) { - dixChangeGC(NullClient, origGC, GCFont, &fid, NULL); + ChangeGCVal val; + val.ptr = pFont; + dixChangeGC(NullClient, origGC, GCFont, NULL, &val); ValidateGC(c->pDraw, origGC); } @@ -1423,7 +1427,7 @@ bail: if (c->slept) { ClientWakeup(c->client); - dixChangeGC(NullClient, c->pGC, clearGCmask, clearGC, NULL); + dixChangeGC(NullClient, c->pGC, clearGCmask, NULL, clearGC); /* Unreference the font from the scratch GC */ CloseFont(c->pGC->font, (Font)0); @@ -1580,7 +1584,7 @@ bail: if (c->slept) { ClientWakeup(c->client); - dixChangeGC(NullClient, c->pGC, clearGCmask, clearGC, NULL); + dixChangeGC(NullClient, c->pGC, clearGCmask, NULL, clearGC); /* Unreference the font from the scratch GC */ CloseFont(c->pGC->font, (Font)0); |