diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-06 21:56:10 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-12 18:10:01 -0700 |
| commit | 04bad1b8a118a83064316d6e4327234aee19361e (patch) | |
| tree | db53939c7cf34aa3eb3b31e6af7d32c0b31af64c /mi/midispcur.c | |
| parent | 65cedf39054cf3a1e695e84ac228cce9e8d48097 (diff) | |
Kill ChangeGC 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.
The call in CreateGC is particularly questionable.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'mi/midispcur.c')
| -rw-r--r-- | mi/midispcur.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index a107949e9..11547dbd9 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -306,7 +306,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor) 0, 0, pCursor->bits->width, pCursor->bits->height, 0, XYPixmap, (char *)pCursor->bits->source); gcvals[0] = GXand; - ChangeGC (pGC, GCFunction, gcvals); + dixChangeGC (NullClient, pGC, GCFunction, gcvals, NULL); ValidateGC ((DrawablePtr)pPriv->sourceBits, pGC); (*pGC->ops->PutImage) ((DrawablePtr)pPriv->sourceBits, pGC, 1, 0, 0, pCursor->bits->width, pCursor->bits->height, @@ -314,13 +314,13 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor) /* mask bits -- pCursor->mask & ~pCursor->source */ gcvals[0] = GXcopy; - ChangeGC (pGC, GCFunction, gcvals); + dixChangeGC (NullClient, pGC, GCFunction, gcvals, NULL); ValidateGC ((DrawablePtr)pPriv->maskBits, pGC); (*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1, 0, 0, pCursor->bits->width, pCursor->bits->height, 0, XYPixmap, (char *)pCursor->bits->mask); gcvals[0] = GXandInverted; - ChangeGC (pGC, GCFunction, gcvals); + dixChangeGC (NullClient, pGC, GCFunction, gcvals, NULL); ValidateGC ((DrawablePtr)pPriv->maskBits, pGC); (*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1, 0, 0, pCursor->bits->width, pCursor->bits->height, |