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

input-device-xi2: Calculate the correct state for button events

Browse Source 
The state that the X server sends for button events, by specification,
contains the button state before the event. We need to synthesize in
the result of the event in order to determine what the current button
state is.

https://bugzilla.gnome.org/show_bug.cgi?id=712322
This commit is contained in:
Jasper St. Pierre 2013-11-12 15:10:22 -05:00
parent 0fda81feab
commit c2b0b9aace
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
clutter/x11/clutter-input-device-xi2.c
View File

@ -95,6 +95,26 @@ clutter_input_device_xi2_init (ClutterInputDeviceXI2 *self)
{ {
} }
static ClutterModifierType
get_modifier_for_button (int i)
{
switch (i)
{
case 1:
return CLUTTER_BUTTON1_MASK;
case 2:
return CLUTTER_BUTTON2_MASK;
case 3:
return CLUTTER_BUTTON3_MASK;
case 4:
return CLUTTER_BUTTON4_MASK;
case 5:
return CLUTTER_BUTTON5_MASK;
default:
return 0;
}
}
void void
_clutter_input_device_xi2_translate_state (ClutterEvent *event, _clutter_input_device_xi2_translate_state (ClutterEvent *event,
XIModifierState *modifiers_state, XIModifierState *modifiers_state,
@ -125,34 +145,27 @@ _clutter_input_device_xi2_translate_state (ClutterEvent *event,
if (!XIMaskIsSet (buttons_state->mask, i)) if (!XIMaskIsSet (buttons_state->mask, i))
continue; continue;
switch (i) button |= get_modifier_for_button (i);
{
case 1:
button |= CLUTTER_BUTTON1_MASK;
break;
case 2:
button |= CLUTTER_BUTTON2_MASK;
break;
case 3:
button |= CLUTTER_BUTTON3_MASK;
break;
case 4:
button |= CLUTTER_BUTTON4_MASK;
break;
case 5:
button |= CLUTTER_BUTTON5_MASK;
break;
default:
break;
}
} }
} }
/* The XIButtonState sent in the event specifies the
* state of the buttons before the event. In order to
* get the current state of the buttons, we need to
* filter out the current button.
*/
switch (event->type)
{
case CLUTTER_BUTTON_PRESS:
button |= (get_modifier_for_button (event->button.button));
break;
case CLUTTER_BUTTON_RELEASE:
button &= ~(get_modifier_for_button (event->button.button));
break;
default:
break;
}
effective = button | base | latched | locked; effective = button | base | latched | locked;
if (group_state) if (group_state)
effective |= (group_state->effective) << 13; effective |= (group_state->effective) << 13;