diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-15 10:07:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-11 14:27:36 +1000 |
| commit | 20fb07f436f7d4a0f330b2067a93a5a4829fccf5 (patch) | |
| tree | bd792a68e16770fd02208b9d334bbfeea24be330 /hw/xfree86/common/xf86Xinput.c | |
| parent | 8670c46bdfdade64e63119d2ebbd5ef63b6fa2c3 (diff) | |
input: remove DDX event list handling
The current approach to event posting required the DDX to request the event
list (allocated by the DIX) and then pass that list into QueuePointerEvent
and friends.
Remove this step and use the DIX event list directly. This means that
QueuePointerEvent is not reentrant but it wasn't before anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 9827661d6..e7e1ce1f0 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -99,8 +99,6 @@ return; \ } -InternalEvent* xf86Events = NULL; - static int xf86InputDevicePostInit(DeviceIntPtr dev); @@ -1049,7 +1047,7 @@ xf86PostMotionEventM(DeviceIntPtr device, } #endif - QueuePointerEvents(xf86Events, device, MotionNotify, 0, flags, mask); + QueuePointerEvents(device, MotionNotify, 0, flags, mask); } void @@ -1094,8 +1092,7 @@ xf86PostProximityEventM(DeviceIntPtr device, int is_in, const ValuatorMask *mask) { - QueueProximityEvents(xf86Events, device, - is_in ? ProximityIn : ProximityOut, mask); + QueueProximityEvents(device, is_in ? ProximityIn : ProximityOut, mask); } void @@ -1166,7 +1163,7 @@ xf86PostButtonEventM(DeviceIntPtr device, } #endif - QueuePointerEvents(xf86Events, device, + QueuePointerEvents(device, is_down ? ButtonPress : ButtonRelease, button, flags, mask); } @@ -1233,7 +1230,7 @@ xf86PostKeyEventM(DeviceIntPtr device, } #endif - QueueKeyboardEvents(xf86Events, device, + QueueKeyboardEvents(device, is_down ? KeyPress : KeyRelease, key_code, mask); } |