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

backends/x11: Drop all users of clutter_input_device_get_stage()

Browse Source 
And clutter_input_device_get_pointer_stage().

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
This commit is contained in:
Carlos Garnacho 2020-06-05 16:53:34 +02:00 committed by Jonas Ådahl
parent 9598eedd04
commit e3644acbbf
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/x11/meta-seat-x11.c
View File

@ -1851,7 +1851,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
/* Set the stage for core events coming out of nowhere (see bug #684509) */ /* Set the stage for core events coming out of nowhere (see bug #684509) */
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL && if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL &&
clutter_input_device_get_pointer_stage (device) == NULL &&
stage != NULL) stage != NULL)
_clutter_input_device_set_stage (device, stage); _clutter_input_device_set_stage (device, stage);
@ -2048,7 +2047,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
/* Set the stage for core events coming out of nowhere (see bug #684509) */ /* Set the stage for core events coming out of nowhere (see bug #684509) */
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL && if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL &&
clutter_input_device_get_pointer_stage (device) == NULL &&
stage != NULL) stage != NULL)
_clutter_input_device_set_stage (device, stage); _clutter_input_device_set_stage (device, stage);
@ -2127,8 +2125,7 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event; XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
device = g_hash_table_lookup (seat->devices_by_id, device = g_hash_table_lookup (seat->devices_by_id,
GINT_TO_POINTER (xev->deviceid)); GINT_TO_POINTER (xev->deviceid));
if (!_clutter_input_device_get_stage (device)) _clutter_input_device_set_stage (device, stage);
_clutter_input_device_set_stage (device, stage);
} }
/* Fall through */ /* Fall through */
case XI_TouchEnd: case XI_TouchEnd:
@ -2258,14 +2255,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
} }
else else
{ {
if (device->stage == NULL)
{
g_debug ("Discarding Leave for ButtonRelease "
"event off-stage");
retval = FALSE;
break;
}
event->crossing.type = event->type = CLUTTER_LEAVE; event->crossing.type = event->type = CLUTTER_LEAVE;
event->crossing.stage = stage; event->crossing.stage = stage;