diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2020-06-05 16:53:34 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-10-23 18:48:19 +0000 |
| commit | e3644acbbff7edd2a49e7ad7cf5f043114cd9b49 (patch) | |
| tree | fa2552db52ed06fb19eb12bce32f3a363e9b569f | |
| parent | 9598eedd042f4cba9bc28d7c99917b54ac731242 (diff) | |
| download | mutter-e3644acbbff7edd2a49e7ad7cf5f043114cd9b49.tar.gz | |
backends/x11: Drop all users of clutter_input_device_get_stage()
And clutter_input_device_get_pointer_stage().
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
| -rw-r--r-- | src/backends/x11/meta-seat-x11.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c index 39885230a..8448cc743 100644 --- a/src/backends/x11/meta-seat-x11.c +++ b/src/backends/x11/meta-seat-x11.c @@ -1851,7 +1851,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, /* 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 && - clutter_input_device_get_pointer_stage (device) == NULL && stage != NULL) _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) */ if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL && - clutter_input_device_get_pointer_stage (device) == NULL && stage != NULL) _clutter_input_device_set_stage (device, stage); @@ -2127,8 +2125,7 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, XIDeviceEvent *xev = (XIDeviceEvent *) xi_event; device = g_hash_table_lookup (seat->devices_by_id, 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 */ case XI_TouchEnd: @@ -2258,14 +2255,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, } 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.stage = stage; |