From fcfd7f4b3184493a103113fa2b8690941f018e59 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 21 Feb 2009 08:09:40 +1000 Subject: [PATCH] dix: don't apply button mappings to SDs, or the device's MD. Only ever change the button map on the device we actually care about, not the attached SDs, not the current MD of the device. Signed-off-by: Peter Hutterer --- dix/inpututils.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dix/inpututils.c b/dix/inpututils.c index 366a897..07a2383 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -119,24 +119,6 @@ ApplyPointerMapping(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client) return ret; do_butmap_change(dev, map, len, client); - /* Change any attached masters/slaves. */ - if (dev->isMaster) { - for (tmp = inputInfo.devices; tmp; tmp = tmp->next) { - if (!tmp->isMaster && tmp->u.master == dev) - if (check_butmap_change(tmp, map, len, NULL, client) == Success) - do_butmap_change(tmp, map, len, client); - } - } - else { - for (tmp = inputInfo.devices; tmp; tmp = tmp->next) { - if (tmp->isMaster && tmp->u.lastSlave == dev) { - /* If this fails, expect the results to be weird. */ - if (check_butmap_change(tmp, map, len, NULL, client) == Success) - do_butmap_change(tmp, map, len, client); - } - } - } - return Success; } -- 1.6.0.6