diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2012-09-21 14:05:37 +0200 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2012-09-24 17:08:24 +0100 |
| commit | 35faaf604cbc1592f6d7320d19c283c890b17194 (patch) | |
| tree | 089b7101e1294647e240971059114056465dd27d | |
| parent | a6abf86e945eab43e8b3dd0a66cf2638b9bb525e (diff) | |
| download | clutter-35faaf604cbc1592f6d7320d19c283c890b17194.tar.gz | |
x11: set the stage for core events with no associated stage
When the last touch has been released the stage on the
corresponding master device (eg. the virtual core pointer) is set
to NULL and no mouse events can be delivered until an ENTER event
has occurred and the stage pointer restored.
This is due to the fact that the master devices can send both
touch events and mouse events, forwarding events coming from the
attached slave devices.
To restore delivery of mouse events we need to ensure that the
stage is set on each ButtonPress, ButtonRelease and Motion event
coming from master devices.
https://bugzilla.gnome.org/show_bug.cgi?id=684509
| -rw-r--r-- | clutter/x11/clutter-device-manager-xi2.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index 2c1facdad..4250644fb 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/x11/clutter-device-manager-xi2.c @@ -832,6 +832,17 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, { XIDeviceEvent *xev = (XIDeviceEvent *) xi_event; + source_device = g_hash_table_lookup (manager_xi2->devices_by_id, + GINT_TO_POINTER (xev->sourceid)); + device = g_hash_table_lookup (manager_xi2->devices_by_id, + GINT_TO_POINTER (xev->deviceid)); + + /* Set the stage for core events coming out of nowhere (see bug #684509) */ + if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER && + clutter_input_device_get_pointer_stage (device) == NULL && + stage != NULL) + _clutter_input_device_set_stage (device, stage); + switch (xev->detail) { case 4: @@ -862,12 +873,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, _clutter_input_device_xi2_translate_state (&xev->mods, &xev->buttons); - source_device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->sourceid)); clutter_event_set_source_device (event, source_device); - - device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->deviceid)); clutter_event_set_device (event, device); event->scroll.axes = translate_axes (event->scroll.device, @@ -915,12 +921,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, _clutter_input_device_xi2_translate_state (&xev->mods, &xev->buttons); - source_device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->sourceid)); clutter_event_set_source_device (event, source_device); - - device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->deviceid)); clutter_event_set_device (event, device); event->button.axes = translate_axes (event->button.device, @@ -977,6 +978,14 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, source_device = g_hash_table_lookup (manager_xi2->devices_by_id, GINT_TO_POINTER (xev->sourceid)); + device = g_hash_table_lookup (manager_xi2->devices_by_id, + GINT_TO_POINTER (xev->deviceid)); + + /* Set the stage for core events coming out of nowhere (see bug #684509) */ + if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER && + clutter_input_device_get_pointer_stage (device) == NULL && + stage != NULL) + _clutter_input_device_set_stage (device, stage); if (scroll_valuators_changed (source_device, &xev->valuators, @@ -995,9 +1004,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, clutter_event_set_scroll_delta (event, delta_x, delta_y); clutter_event_set_source_device (event, source_device); - - device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->deviceid)); clutter_event_set_device (event, device); CLUTTER_NOTE (EVENT, @@ -1025,9 +1031,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator, &xev->buttons); clutter_event_set_source_device (event, source_device); - - device = g_hash_table_lookup (manager_xi2->devices_by_id, - GINT_TO_POINTER (xev->deviceid)); clutter_event_set_device (event, device); event->motion.axes = translate_axes (event->motion.device, |