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

backends/x11: Drop users of clutter_input_device_set_stage()

Browse Source 
There is no getter, so this information is useless.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
This commit is contained in:
Carlos Garnacho 2020-06-05 17:04:25 +02:00 committed by Jonas Ådahl
parent 942b3c63df
commit ce2b3728a2
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1801,10 +1801,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
GINT_TO_POINTER (xev->deviceid)); GINT_TO_POINTER (xev->deviceid));
clutter_event_set_device (event, device); clutter_event_set_device (event, device);
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL &&
stage != NULL)
_clutter_input_device_set_stage (device, stage);
/* XXX keep this in sync with the evdev device manager */ /* XXX keep this in sync with the evdev device manager */
n = print_keysym (event->key.keyval, buffer, sizeof (buffer)); n = print_keysym (event->key.keyval, buffer, sizeof (buffer));
if (n == 0) if (n == 0)
@ -1849,11 +1845,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
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));
/* 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 &&
stage != NULL)
_clutter_input_device_set_stage (device, stage);
if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE) if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE)
{ {
/* We got these events because of the passive button grab */ /* We got these events because of the passive button grab */
@ -2011,9 +2002,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
break; break;
} }
if (device->stage != NULL)
_clutter_input_device_set_stage (source_device, device->stage);
if (xev->flags & XIPointerEmulated) if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE); _clutter_event_set_pointer_emulated (event, TRUE);
@ -2045,11 +2033,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
break; 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_LOGICAL &&
stage != NULL)
_clutter_input_device_set_stage (device, stage);
if (scroll_valuators_changed (source_device, if (scroll_valuators_changed (source_device,
&xev->valuators, &xev->valuators,
&delta_x, &delta_y)) &delta_x, &delta_y))
@ -2102,9 +2085,6 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat,
event->motion.y, event->motion.y,
&xev->valuators); &xev->valuators);
if (device->stage != NULL)
_clutter_input_device_set_stage (source_device, device->stage);
if (xev->flags & XIPointerEmulated) if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE); _clutter_event_set_pointer_emulated (event, TRUE);
@ -2125,7 +2105,6 @@ 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));
_clutter_input_device_set_stage (device, stage);
} }
/* Fall through */ /* Fall through */
case XI_TouchEnd: case XI_TouchEnd: