diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-06 21:39:43 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-12 18:09:55 -0700 |
| commit | 65cedf39054cf3a1e695e84ac228cce9e8d48097 (patch) | |
| tree | 9a0b41cf70562a6e9e06263486f2fcf1552da46a /mi/miglblt.c | |
| parent | afcbbd6dfea51c5b0adca0d720edc02ba0c2dc16 (diff) | |
Kill DoChangeGC in favor of dixChangeGC.
This doesn't change any behavior, but it isn't clear whether NullClient
is correct in all cases. As ajax says,
> For most of these changes, I think it's correct to use NullClient,
> since they are server-initiated changes and should not fail for (eg)
> xace reasons. ... At any rate, you're certainly not changing any
> semantics by leaving them all as NullClient, so this patch can't be
> more wrong than before.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi/miglblt.c')
| -rw-r--r-- | mi/miglblt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mi/miglblt.c b/mi/miglblt.c index ea199dc8c..22a170aa0 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -138,7 +138,7 @@ miPolyGlyphBlt( gcvals[1] = 1; gcvals[2] = 0; - DoChangeGC(pGCtmp, GCFunction|GCForeground|GCBackground, gcvals, 0); + dixChangeGC(NullClient, pGCtmp, GCFunction|GCForeground|GCBackground, gcvals, NULL); nbyLine = BitmapBytePad(width); pbits = malloc(height*nbyLine); @@ -237,13 +237,13 @@ miImageGlyphBlt( gcvals[0] = GXcopy; gcvals[1] = pGC->bgPixel; gcvals[2] = FillSolid; - DoChangeGC(pGC, GCFunction|GCForeground|GCFillStyle, gcvals, 0); + dixChangeGC(NullClient, pGC, GCFunction|GCForeground|GCFillStyle, gcvals, NULL); ValidateGC(pDrawable, pGC); (*pGC->ops->PolyFillRect)(pDrawable, pGC, 1, &backrect); /* put down the glyphs */ gcvals[0] = oldFG; - DoChangeGC(pGC, GCForeground, gcvals, 0); + dixChangeGC(NullClient, pGC, GCForeground, gcvals, NULL); ValidateGC(pDrawable, pGC); (*pGC->ops->PolyGlyphBlt)(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase); @@ -252,7 +252,7 @@ miImageGlyphBlt( gcvals[0] = oldAlu; gcvals[1] = oldFG; gcvals[2] = oldFS; - DoChangeGC(pGC, GCFunction|GCForeground|GCFillStyle, gcvals, 0); + dixChangeGC(NullClient, pGC, GCFunction|GCForeground|GCFillStyle, gcvals, NULL); ValidateGC(pDrawable, pGC); } |