diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2021-07-16 16:09:34 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-07-16 16:09:34 +0000 |
commit | a236494ea7f31848b4a459dad41330f225137832 (patch) | |
tree | e0aa650b27401ce21bad0dc2789789df3f538cb2 /clutter/wayland/clutter-input-device-wayland.c | |
parent | c577315acbb6917b1f28cfc8d09defd44e0d4d77 (diff) | |
parent | 8f0fa2ec8697fa188cc8ccc6aca5c7076aea2eb6 (diff) | |
download | clutter-a236494ea7f31848b4a459dad41330f225137832.tar.gz |
Merge branch 'bugzilla-783791' into 'master'
wayland: Fix incorrect button mask in clutter_wayland_handle_button
See merge request GNOME/clutter!15
Diffstat (limited to 'clutter/wayland/clutter-input-device-wayland.c')
-rw-r--r-- | clutter/wayland/clutter-input-device-wayland.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c index 3dab22070..168a6839b 100644 --- a/clutter/wayland/clutter-input-device-wayland.c +++ b/clutter/wayland/clutter-input-device-wayland.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include <unistd.h> +#include <linux/input.h> #include <sys/mman.h> #include <wayland-util.h> #include <wayland-client.h> @@ -129,18 +130,18 @@ clutter_wayland_handle_button (void *data, /* evdev button codes */ switch (button) { - case 272: - event->button.button = 1; + case BTN_LEFT: + event->button.button = CLUTTER_BUTTON_PRIMARY; modifier_mask = CLUTTER_BUTTON1_MASK; break; - case 273: - event->button.button = 3; - modifier_mask = CLUTTER_BUTTON2_MASK; - break; - case 274: - event->button.button = 2; + case BTN_RIGHT: + event->button.button = CLUTTER_BUTTON_SECONDARY; modifier_mask = CLUTTER_BUTTON3_MASK; break; + case BTN_MIDDLE: + event->button.button = CLUTTER_BUTTON_MIDDLE; + modifier_mask = CLUTTER_BUTTON2_MASK; + break; } if (modifier_mask) |