diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-28 08:02:00 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-28 08:02:00 -0400 |
commit | 5c03d131815cfe2f78792277ab8352e69e830196 (patch) | |
tree | d321abc400033fce3978558ce9186d89febcdbef /hw/dmx/input | |
parent | 27612748e0ec20f3a23839f0a12e39f598dd722c (diff) |
xace: add new hooks + access controls: XInput extension.
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
Diffstat (limited to 'hw/dmx/input')
-rw-r--r-- | hw/dmx/input/dmxeq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index 3e98fb799..dff0b4423 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -82,7 +82,6 @@ #ifdef XINPUT #include <X11/extensions/XIproto.h> #define EXTENSION_PROC_ARGS void * -#include "extinit.h" /* For LookupDeviceIntRec */ #endif #if DMX_EQ_DEBUG @@ -217,8 +216,9 @@ static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e) { deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)xe; int id = ev->deviceid & DEVICE_BITS; - DeviceIntPtr pDevice = LookupDeviceIntRec(id); + DeviceIntPtr pDevice; + dixLookupDevice(&pDevice, id, serverClient, DixUnknownAccess); if (!pDevice) { dmxLog(dmxError, "dmxeqProcessInputEvents: id %d not found\n", id); return; |