brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: Swap the numbers for the middle and right buttons

Browse Source 
The ordering of the evdev button numbers is the opposite of the
order in Clutter (the middle button is 3 instead of 2) so we need to
manually map the button numbers when creating a ClutterButtonEvent.

https://bugzilla.gnome.org/show_bug.cgi?id=680255
This commit is contained in:
Neil Roberts 2012-07-19 15:20:42 +01:00 committed by Emmanuele Bassi
parent df0ab34499
commit 99a7406d01
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -245,7 +245,7 @@ notify_button (ClutterEventSource *source,
gint button_nr; gint button_nr;
static gint maskmap[8] = static gint maskmap[8] =
{ {
CLUTTER_BUTTON1_MASK, CLUTTER_BUTTON2_MASK, CLUTTER_BUTTON3_MASK, CLUTTER_BUTTON1_MASK, CLUTTER_BUTTON3_MASK, CLUTTER_BUTTON2_MASK,
CLUTTER_BUTTON4_MASK, CLUTTER_BUTTON5_MASK, 0, 0, 0 CLUTTER_BUTTON4_MASK, CLUTTER_BUTTON5_MASK, 0, 0, 0
}; };
@ -255,7 +255,28 @@ notify_button (ClutterEventSource *source,
if (!stage) if (!stage)
return; return;
button_nr = button - BTN_LEFT + 1; /* The evdev button numbers don't map sequentially to clutter button
* numbers (the right and middle mouse buttons are in the opposite
* order) so we'll map them directly with a switch statement */
switch (button)
{
case BTN_LEFT:
button_nr = CLUTTER_BUTTON_PRIMARY;
break;
case BTN_RIGHT:
button_nr = CLUTTER_BUTTON_SECONDARY;
break;
case BTN_MIDDLE:
button_nr = CLUTTER_BUTTON_MIDDLE;
break;
default:
button_nr = button - BTN_MOUSE + 1;
break;
}
if (G_UNLIKELY (button_nr < 1 || button_nr > 8)) if (G_UNLIKELY (button_nr < 1 || button_nr > 8))
{ {
g_warning ("Unhandled button event 0x%x", button); g_warning ("Unhandled button event 0x%x", button);