diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-15 14:06:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-05 10:29:17 +1000 |
| commit | bf2059b07a97e5e579c13c2c9d49707093427dc2 (patch) | |
| tree | e3cbdca56622ae4844c6aa6e75d8c3d76b2368e7 /dix | |
| parent | 73de54210446e9eca81b96ea6775ee5ea1a31d75 (diff) | |
input: Only release SD buttons for explicit floating/reattachment (#36146)
Grabbing an SD device temporary floats the device but we must not release
the buttons. Introduced in
commit 9d23459415b84606ee4f38bb2d19054c432c8552
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 25 11:08:19 2011 +1000
dix: release all buttons and keys before reattaching a device (#34182)
X.Org Bug 36146 <http://bugs.freedesktop.org/show_bug.cgi?id=36146>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c index 3f46ad6fb..7968c7357 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2365,7 +2365,7 @@ RecalculateMasterButtons(DeviceIntPtr slave) * Generate release events for all keys/button currently down on this * device. */ -static void +void ReleaseButtonsAndKeys(DeviceIntPtr dev) { EventListPtr eventlist = InitEventList(GetMaximumEventsNum()); @@ -2434,8 +2434,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) free(dev->spriteInfo->sprite); } - ReleaseButtonsAndKeys(dev); - oldmaster = GetMaster(dev, MASTER_ATTACHED); dev->master = master; |