isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

device-manager-evdev: Add main seat to seats by default

Browse Source 
Treat the main seat as other seats, so we don't have to handle it differently
in specific places. This was already the case before when a real device
was plugged before the startup, but not applied when hotplugging a device.


(cherry picked from commit 15f41c9f68)
This commit is contained in:
Marco Trevisan (Treviño) 2018-05-17 00:53:48 +01:00 committed by Marco Trevisan
parent b6dc2052c3
commit e73b321c2e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter/evdev/clutter-device-manager-evdev.c
View File

@ -793,10 +793,12 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
if (priv->main_seat->libinput_seat == NULL) if (priv->main_seat->libinput_seat == NULL)
seat = priv->main_seat; seat = priv->main_seat;
else else
seat = clutter_seat_evdev_new (manager_evdev); {
seat = clutter_seat_evdev_new (manager_evdev);
priv->seats = g_slist_append (priv->seats, seat);
}
clutter_seat_evdev_set_libinput_seat (seat, libinput_seat); clutter_seat_evdev_set_libinput_seat (seat, libinput_seat);
priv->seats = g_slist_append (priv->seats, seat);
} }
device = _clutter_input_device_evdev_new (manager, seat, libinput_device); device = _clutter_input_device_evdev_new (manager, seat, libinput_device);
@ -932,7 +934,7 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
return device; return device;
} }
return clutter_seat_evdev_get_device (priv->main_seat, id); return NULL;
} }
static void static void
@ -1962,6 +1964,7 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
xkb_context_unref (ctx); xkb_context_unref (ctx);
priv->main_seat = clutter_seat_evdev_new (manager_evdev); priv->main_seat = clutter_seat_evdev_new (manager_evdev);
priv->seats = g_slist_append (priv->seats, priv->main_seat);
dispatch_libinput (manager_evdev); dispatch_libinput (manager_evdev);
@ -2010,7 +2013,6 @@ clutter_device_manager_evdev_finalize (GObject *object)
manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (object); manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (object);
priv = manager_evdev->priv; priv = manager_evdev->priv;
clutter_seat_evdev_free (priv->main_seat);
g_slist_free_full (priv->seats, (GDestroyNotify) clutter_seat_evdev_free); g_slist_free_full (priv->seats, (GDestroyNotify) clutter_seat_evdev_free);
g_slist_free (priv->devices); g_slist_free (priv->devices);
@ -2071,8 +2073,6 @@ clutter_device_manager_evdev_stage_added_cb (ClutterStageManager *manager,
priv->stage = stage; priv->stage = stage;
/* Set the stage of any devices that don't already have a stage */ /* Set the stage of any devices that don't already have a stage */
clutter_seat_evdev_set_stage (priv->main_seat, stage);
for (l = priv->seats; l; l = l->next) for (l = priv->seats; l; l = l->next)
{ {
ClutterSeatEvdev *seat = l->data; ClutterSeatEvdev *seat = l->data;
@ -2098,8 +2098,6 @@ clutter_device_manager_evdev_stage_removed_cb (ClutterStageManager *manager,
/* Remove the stage of any input devices that were pointing to this /* Remove the stage of any input devices that were pointing to this
stage so we don't send events to invalid stages */ stage so we don't send events to invalid stages */
clutter_seat_evdev_set_stage (priv->main_seat, NULL);
for (l = priv->seats; l; l = l->next) for (l = priv->seats; l; l = l->next)
{ {
ClutterSeatEvdev *seat = l->data; ClutterSeatEvdev *seat = l->data;