[clutter] evdev: Move additional pointer buttons after the old 4-7 scrolling ones



commit 83b738c0e7060b4526fdbd306fcc255f71c064fa
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Nov 16 15:26:56 2015 +0100

    evdev: Move additional pointer buttons after the old 4-7 scrolling ones
    
    On X11 those were skipped, so additional pointer buttons would come up
    as button >= 8 events. Do here the same, so we remain compatible across
    backends.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=758237

 clutter/evdev/clutter-device-manager-evdev.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index ffb535a..ac5ea93 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -585,11 +585,12 @@ notify_button (ClutterInputDevice *input_device,
       break;
 
     default:
-      button_nr = button - BTN_MOUSE + 1;
+      /* For compatibility reasons, all additional buttons go after the old 4-7 scroll ones */
+      button_nr = button - (BTN_LEFT - 1) + 4;
       break;
     }
 
-  if (G_UNLIKELY (button_nr < 1 || button_nr > 8))
+  if (button_nr < 1 || button_nr > 12)
     {
       g_warning ("Unhandled button event 0x%x", button);
       return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]