isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 03:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

backends/native: Drop users of clutter_input_device_set_stage()

Browse Source 
There is no getter, so doing this is now pointless.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
This commit is contained in:
Carlos Garnacho 2020-06-05 17:02:35 +02:00
parent 0fbbeb0c82
commit cef6520836
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,11 +1457,8 @@ evdev_add_device (MetaSeatNative *seat,
{ {
ClutterInputDeviceType type; ClutterInputDeviceType type;
ClutterInputDevice *device, *master = NULL; ClutterInputDevice *device, *master = NULL;
ClutterActor *stage;
device = meta_input_device_native_new (seat, libinput_device); device = meta_input_device_native_new (seat, libinput_device);
stage = CLUTTER_ACTOR (meta_seat_native_get_stage (seat));
_clutter_input_device_set_stage (device, CLUTTER_STAGE (stage));
seat->devices = g_slist_prepend (seat->devices, device); seat->devices = g_slist_prepend (seat->devices, device);
@ -2460,7 +2457,6 @@ meta_seat_native_constructed (GObject *object)
{ {
MetaSeatNative *seat = META_SEAT_NATIVE (object); MetaSeatNative *seat = META_SEAT_NATIVE (object);
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterStage *stage;
MetaEventSource *source; MetaEventSource *source;
struct udev *udev; struct udev *udev;
struct xkb_keymap *xkb_keymap; struct xkb_keymap *xkb_keymap;
@ -2468,8 +2464,6 @@ meta_seat_native_constructed (GObject *object)
device = meta_input_device_native_new_virtual ( device = meta_input_device_native_new_virtual (
seat, CLUTTER_POINTER_DEVICE, seat, CLUTTER_POINTER_DEVICE,
CLUTTER_INPUT_MODE_MASTER); CLUTTER_INPUT_MODE_MASTER);
stage = meta_seat_native_get_stage (seat);
_clutter_input_device_set_stage (device, stage);
seat->pointer_x = INITIAL_POINTER_X; seat->pointer_x = INITIAL_POINTER_X;
seat->pointer_y = INITIAL_POINTER_Y; seat->pointer_y = INITIAL_POINTER_Y;
_clutter_input_device_set_coords (device, NULL, _clutter_input_device_set_coords (device, NULL,
@ -2480,7 +2474,6 @@ meta_seat_native_constructed (GObject *object)
device = meta_input_device_native_new_virtual ( device = meta_input_device_native_new_virtual (
seat, CLUTTER_KEYBOARD_DEVICE, seat, CLUTTER_KEYBOARD_DEVICE,
CLUTTER_INPUT_MODE_MASTER); CLUTTER_INPUT_MODE_MASTER);
_clutter_input_device_set_stage (device, stage);
seat->core_keyboard = device; seat->core_keyboard = device;
udev = udev_new (); udev = udev_new ();
@ -2893,21 +2886,7 @@ void
meta_seat_native_set_stage (MetaSeatNative *seat, meta_seat_native_set_stage (MetaSeatNative *seat,
ClutterStage *stage) ClutterStage *stage)
{ {
GSList *l;
if (seat->stage == stage)
return;
seat->stage = stage; seat->stage = stage;
_clutter_input_device_set_stage (seat->core_pointer, stage);
_clutter_input_device_set_stage (seat->core_keyboard, stage);
for (l = seat->devices; l; l = l->next)
{
ClutterInputDevice *device = l->data;
_clutter_input_device_set_stage (device, stage);
}
} }
ClutterStage * ClutterStage *

4
src/backends/native/meta-virtual-input-device-native.c
View File

@ -680,7 +680,6 @@ meta_virtual_input_device_native_constructed (GObject *object)
MetaVirtualInputDeviceNative *virtual_evdev = MetaVirtualInputDeviceNative *virtual_evdev =
META_VIRTUAL_INPUT_DEVICE_NATIVE (object); META_VIRTUAL_INPUT_DEVICE_NATIVE (object);
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterStage *stage;
device_type = clutter_virtual_input_device_get_device_type (virtual_device); device_type = clutter_virtual_input_device_get_device_type (virtual_device);
@ -693,9 +692,6 @@ meta_virtual_input_device_native_constructed (GObject *object)
device_type, device_type,
CLUTTER_INPUT_MODE_SLAVE); CLUTTER_INPUT_MODE_SLAVE);
stage = meta_seat_native_get_stage (virtual_evdev->seat);
_clutter_input_device_set_stage (virtual_evdev->device, stage);
g_signal_emit_by_name (virtual_evdev->seat, g_signal_emit_by_name (virtual_evdev->seat,
"device-added", "device-added",
virtual_evdev->device); virtual_evdev->device);