From 1ecb7aaf2adedad1996cd26176ef5802113e3ad9 Mon Sep 17 00:00:00 2001
From: Chase Douglas <chase.douglas@ubuntu.com>
Date: Sat, 11 Feb 2012 07:58:38 -0800
Subject: Focus event button state must show the logical buttons, not physical
 buttons

Similar to the fix in fcda98c48610fd507ca0b89c6006a5497d9dc1c9. This
ensures we show the correct logical state of the buttons in device focus
events too.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Xi/exevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 1ecc3ba5a..de7d50a3a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -2215,7 +2215,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
 
     for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
         if (BitIsOn(mouse->button->down, i))
-            SetBit(&xi2event[1], i);
+            SetBit(&xi2event[1], mouse->button->map[i]);
 
     if (dev->key)
     {
-- 
cgit v1.2.3