[mutter/wip/carlosg/input-thread: 57/133] backends/x11: Drop users of clutter_input_device_set_stage()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/input-thread: 57/133] backends/x11: Drop users of clutter_input_device_set_stage()
- Date: Thu, 13 Aug 2020 19:31:08 +0000 (UTC)
commit 5d457223620bd17b6112456b3e9079babb66b200
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jun 5 17:04:25 2020 +0200
backends/x11: Drop users of clutter_input_device_set_stage()
There is no getter, so this information is useless.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
src/backends/x11/meta-seat-x11.c | 17 -----------------
1 file changed, 17 deletions(-)
---
diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c
index 81684de588..b4a7fe836a 100644
--- a/src/backends/x11/meta-seat-x11.c
+++ b/src/backends/x11/meta-seat-x11.c
@@ -1845,11 +1845,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
device = g_hash_table_lookup (seat->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 &&
- stage != NULL)
- _clutter_input_device_set_stage (device, stage);
-
if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE)
{
/* We got these events because of the passive button grab */
@@ -2007,9 +2002,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
break;
}
- if (device->stage != NULL)
- _clutter_input_device_set_stage (source_device, device->stage);
-
if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE);
@@ -2041,11 +2033,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
break;
}
- /* 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 &&
- stage != NULL)
- _clutter_input_device_set_stage (device, stage);
-
if (scroll_valuators_changed (source_device,
&xev->valuators,
&delta_x, &delta_y))
@@ -2098,9 +2085,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
event->motion.y,
&xev->valuators);
- if (device->stage != NULL)
- _clutter_input_device_set_stage (source_device, device->stage);
-
if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE);
@@ -2121,7 +2105,6 @@ 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));
- _clutter_input_device_set_stage (device, stage);
}
/* Fall through */
case XI_TouchEnd:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]