Blame SOURCES/0004-xkb-ignore-floating-slave-devices-when-updating-from.patch
|
 |
0b0bd3 |
From 70999994284ea2d1392a45dfa28fcbc99fd65818 Mon Sep 17 00:00:00 2001
|
|
|
0b0bd3 |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
0b0bd3 |
Date: Mon, 4 Aug 2014 10:07:41 +1000
|
|
|
0b0bd3 |
Subject: [PATCH 4/4] xkb: ignore floating slave devices when updating from
|
|
|
0b0bd3 |
master (#81885)
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
Introduced in 45fb3a934dc0db51584aba37c2f9d73deff9191d. When a device is
|
|
|
0b0bd3 |
enabled, the master's locked state is pushed to the slave. If the device is
|
|
|
0b0bd3 |
floating, no master exists and we triggered a NULL-pointer dereference
|
|
|
0b0bd3 |
in XkbPushLockedStateToSlaves.
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
X.Org Bug 81885 <http://bugs.freedesktop.org/show_bug.cgi?id=81885>
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
0b0bd3 |
---
|
|
|
0b0bd3 |
dix/devices.c | 2 +-
|
|
|
0b0bd3 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
diff --git a/dix/devices.c b/dix/devices.c
|
|
|
0b0bd3 |
index 4692251..b389c7c 100644
|
|
|
0b0bd3 |
--- a/dix/devices.c
|
|
|
0b0bd3 |
+++ b/dix/devices.c
|
|
|
0b0bd3 |
@@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
|
|
|
0b0bd3 |
XISendDeviceHierarchyEvent(flags);
|
|
|
0b0bd3 |
}
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
- if (!IsMaster(dev))
|
|
|
0b0bd3 |
+ if (!IsMaster(dev) && !IsFloating(dev))
|
|
|
0b0bd3 |
XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0);
|
|
|
0b0bd3 |
RecalculateMasterButtons(dev);
|
|
|
0b0bd3 |
|
|
|
0b0bd3 |
--
|
|
|
0b0bd3 |
1.9.3
|
|
|
0b0bd3 |
|