diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-02 17:20:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-23 17:52:40 +1000 |
| commit | 763848d3ab84b4e33a0254120c44b5a1877c819d (patch) | |
| tree | 5215ee6c1c042aa6f505ebd27fb2f59b9d9cbf25 /xkb/xkbAccessX.c | |
| parent | 0b4066c116e07918a13dc6b4159df7ac9eb92b4b (diff) | |
Input: change processing API to InternalEvents.
Don't pass xEvent* and count through to processing, pass a single
InternalEvent.
Custom handlers are disabled for the time being. And for extra fun,
XKB's pointer motion emulation is disabled. But stick an error in there so
that we get reminded should we forget about it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkbAccessX.c')
| -rw-r--r-- | xkb/xkbAccessX.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 618a18c72..524bb5392 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -684,16 +684,15 @@ Bool ignoreKeyEvent = FALSE; extern int xkbDevicePrivateIndex; extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); void -ProcessPointerEvent( register xEvent * xE, - register DeviceIntPtr mouse, - int count) +ProcessPointerEvent( InternalEvent *ev, + DeviceIntPtr mouse) { DeviceIntPtr dev = GetPairedDevice(mouse); XkbSrvInfoPtr xkbi = dev->key->xkbInfo; unsigned changed = 0; ProcessInputProc backupproc; xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse); -DeviceEvent *event = (DeviceEvent*)xE; +DeviceEvent *event = (DeviceEvent*)ev; xkbi->shiftKeyCount = 0; xkbi->lastPtrEventTime= event->time; @@ -723,7 +722,7 @@ DeviceEvent *event = (DeviceEvent*)xE; */ UNWRAP_PROCESS_INPUT_PROC(mouse, xkbPrivPtr, backupproc); - mouse->public.processInputProc(xE, mouse, count); + mouse->public.processInputProc(ev, mouse); COND_WRAP_PROCESS_INPUT_PROC(mouse, xkbPrivPtr, backupproc, xkbUnwrapProc); |