[mutter/wip/carlosg/input-thread: 26/96] backends/native: Drop users of clutter_input_device_set_stage()
- From: Robert Mader <rmader src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/input-thread: 26/96] backends/native: Drop users of clutter_input_device_set_stage()
- Date: Tue, 6 Oct 2020 20:24:11 +0000 (UTC)
commit eb6896030663ac942abee5a45dc3ab5660c2e556
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jun 5 17:02:35 2020 +0200
backends/native: Drop users of clutter_input_device_set_stage()
There is no getter, so doing this is now pointless.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
src/backends/native/meta-seat-native.c | 14 --------------
src/backends/native/meta-virtual-input-device-native.c | 4 ----
2 files changed, 18 deletions(-)
---
diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c
index 236ce612ab..657801e0ee 100644
--- a/src/backends/native/meta-seat-native.c
+++ b/src/backends/native/meta-seat-native.c
@@ -1457,11 +1457,8 @@ evdev_add_device (MetaSeatNative *seat,
{
ClutterInputDeviceType type;
ClutterInputDevice *device, *logical = NULL;
- ClutterActor *stage;
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);
@@ -2471,7 +2468,6 @@ meta_seat_native_constructed (GObject *object)
{
MetaSeatNative *seat = META_SEAT_NATIVE (object);
ClutterInputDevice *device;
- ClutterStage *stage;
MetaEventSource *source;
struct udev *udev;
struct xkb_keymap *xkb_keymap;
@@ -2479,8 +2475,6 @@ meta_seat_native_constructed (GObject *object)
device = meta_input_device_native_new_virtual (
seat, CLUTTER_POINTER_DEVICE,
CLUTTER_INPUT_MODE_LOGICAL);
- stage = meta_seat_native_get_stage (seat);
- _clutter_input_device_set_stage (device, stage);
seat->pointer_x = INITIAL_POINTER_X;
seat->pointer_y = INITIAL_POINTER_Y;
_clutter_input_device_set_coords (device, NULL,
@@ -2491,7 +2485,6 @@ meta_seat_native_constructed (GObject *object)
device = meta_input_device_native_new_virtual (
seat, CLUTTER_KEYBOARD_DEVICE,
CLUTTER_INPUT_MODE_LOGICAL);
- _clutter_input_device_set_stage (device, stage);
seat->core_keyboard = device;
udev = udev_new ();
@@ -2888,19 +2881,12 @@ meta_seat_native_set_stage (MetaSeatNative *seat,
{
GSList *l;
- if (seat->stage == stage)
- return;
-
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);
-
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_PHYSICAL)
{
ClutterEvent *device_event;
diff --git a/src/backends/native/meta-virtual-input-device-native.c
b/src/backends/native/meta-virtual-input-device-native.c
index 390d83cc59..dd319c7ef6 100644
--- a/src/backends/native/meta-virtual-input-device-native.c
+++ b/src/backends/native/meta-virtual-input-device-native.c
@@ -680,7 +680,6 @@ meta_virtual_input_device_native_constructed (GObject *object)
MetaVirtualInputDeviceNative *virtual_evdev =
META_VIRTUAL_INPUT_DEVICE_NATIVE (object);
ClutterInputDeviceType device_type;
- ClutterStage *stage;
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,
CLUTTER_INPUT_MODE_PHYSICAL);
- 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,
"device-added",
virtual_evdev->device);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]