diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-28 13:34:18 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-28 13:34:18 -0400 |
| commit | 8b548657204000e18c7a38706a0071ae2f93159f (patch) | |
| tree | d27bfac8684053439bad7d911c8fe4ad0c758995 /Xi/grabdevb.c | |
| parent | 5c03d131815cfe2f78792277ab8352e69e830196 (diff) | |
xace: add hooks + new access codes: XKB extension.
Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
Diffstat (limited to 'Xi/grabdevb.c')
| -rw-r--r-- | Xi/grabdevb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index 7eb542232..c2661e85b 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -62,6 +62,7 @@ SOFTWARE. #include <X11/extensions/XIproto.h> #include "exevents.h" #include "exglobals.h" +#include "xace.h" #include "grabdev.h" #include "grabdevb.h" @@ -127,8 +128,12 @@ ProcXGrabDeviceButton(ClientPtr client) return ret; if (mdev->key == NULL) return BadMatch; - } else - mdev = (DeviceIntPtr) LookupKeyboardDevice(); + } else { + mdev = inputInfo.keyboard; + ret = XaceHook(XACE_DEVICE_ACCESS, client, mdev, DixReadAccess); + if (ret != Success) + return ret; + } class = (XEventClass *) (&stuff[1]); /* first word of values */ |