From fcda98c48610fd507ca0b89c6006a5497d9dc1c9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 16 Dec 2011 12:41:08 +1000 Subject: [PATCH] dix: button state must show the logical buttons, not physical buttons If the device is mapped 3 2 1, a click on physical button 1 sends a button 3 press, but the state was set for button 1. Fix this, the state must be set for that button's logical mapping. https://bugzilla.gnome.org/show_bug.cgi?id=655928 Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- dix/inpututils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/inpututils.c b/dix/inpututils.c index 8cd4d5921..e1a11a170 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -672,7 +672,7 @@ void event_set_state(DeviceIntPtr mouse, DeviceIntPtr kbd, DeviceEvent *event) for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++) if (BitIsOn(mouse->button->down, i)) - SetBit(event->buttons, i); + SetBit(event->buttons, mouse->button->map[i]); if (kbd && kbd->key) {