[mutter/wip/carlosg/input-refactors-pt1: 20/28] backends/x11: Drop all users of clutter_input_device_get_stage()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/input-refactors-pt1: 20/28] backends/x11: Drop all users of clutter_input_device_get_stage()
- Date: Fri, 23 Oct 2020 16:26:32 +0000 (UTC)
commit 4459e7d655478ffe8fcff220ef740b1c262b2daf
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jun 5 16:53:34 2020 +0200
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
src/backends/x11/meta-seat-x11.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c
index 39885230a0..8448cc743a 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]