[PATCH] dix: when shutting down slave devices, shut down xtest devices last

Peter Hutterer peter.hutterer at who-t.net
Thu Jan 24 17:47:32 PST 2013

XTest devices are the first ones in the list, being initialised together
with the master devices. If we disable the devices in-order and a device has
a button down when being disabled, the XTest device is checked for a
required button release (xkbAccessX.c's ProcessPointerEvent). This fails if
the device is already NULL.

Instead of putting the check there, disable the devices in the reverse order
they are initialised. Disable physical slaves first, then xtest devices,
then the master devices.

Testcase: shut down server with a button still held down on a physical

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
 dix/devices.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dix/devices.c b/dix/devices.c
index 3c7d480..37c67ad 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -517,6 +517,10 @@ DisableAllDevices(void)
     DeviceIntPtr dev, tmp;
     nt_list_for_each_entry_safe(dev, tmp, inputInfo.devices, next) {
+        if (!IsXTestDevice(dev, NULL) && !IsMaster(dev))
+            DisableDevice(dev, FALSE);
+    }
+    nt_list_for_each_entry_safe(dev, tmp, inputInfo.devices, next) {
         if (!IsMaster(dev))
             DisableDevice(dev, FALSE);

More information about the xorg-devel mailing list