diff options
| author | Keith Packard <keithp@keithp.com> | 2008-08-06 15:26:24 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-03-09 13:08:09 -0700 |
| commit | f8dd80d13bb5313a11b38b280f8ad3e22f0a6300 (patch) | |
| tree | e0aea0e92304c050bb9eda0b7e4b71ad1d242e90 /dix/events.c | |
| parent | 0d9a42dc0380d1583889b6b6521bd5a2451735d4 (diff) | |
Replace dixLookupResource by dixLookupResourceBy{Type,Class}
dixLookupResource attempted to automatically detect whether the caller
wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
RT_NONE. Instead of trying to make the guess better, this patch just reverts
the unification and creates separate functions for each operation.
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dix/events.c b/dix/events.c index 8c9623bb4..fa6c46996 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4307,7 +4307,7 @@ ProcGrabPointer(ClientPtr client) cursor = NullCursor; else { - rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) { @@ -4408,8 +4408,8 @@ ProcChangeActivePointerGrab(ClientPtr client) newCursor = NullCursor; else { - int rc = dixLookupResource((pointer *)&newCursor, stuff->cursor, - RT_CURSOR, client, DixUseAccess); + int rc = dixLookupResourceByType((pointer *)&newCursor, stuff->cursor, + RT_CURSOR, client, DixUseAccess); if (rc != Success) { client->errorValue = stuff->cursor; @@ -5013,7 +5013,7 @@ ProcGrabButton(ClientPtr client) cursor = NullCursor; else { - rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) if (!cursor) @@ -5263,7 +5263,7 @@ ProcRecolorCursor(ClientPtr client) REQUEST(xRecolorCursorReq); REQUEST_SIZE_MATCH(xRecolorCursorReq); - rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR, + rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR, client, DixWriteAccess); if (rc != Success) { |