sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

input/action-mapper: Get ClutterBackend from MetaBackend

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3977>
This commit is contained in:
Bilal Elmoussaoui 2024-08-20 23:31:20 +02:00
parent 102ca86c97
commit 98c36ad1c6
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backends/meta-input-mapper.c
View file

@ -793,10 +793,12 @@ static void
meta_input_mapper_constructed (GObject *object) meta_input_mapper_constructed (GObject *object)
{ {
MetaInputMapper *mapper = META_INPUT_MAPPER (object); MetaInputMapper *mapper = META_INPUT_MAPPER (object);
ClutterBackend *clutter_backend;
G_OBJECT_CLASS (meta_input_mapper_parent_class)->constructed (object); G_OBJECT_CLASS (meta_input_mapper_parent_class)->constructed (object);
mapper->seat = clutter_backend_get_default_seat (clutter_get_default_backend ()); clutter_backend = meta_backend_get_clutter_backend (mapper->backend);
mapper->seat = clutter_backend_get_default_seat (clutter_backend);
g_signal_connect (mapper->seat, "device-removed", g_signal_connect (mapper->seat, "device-removed",
G_CALLBACK (input_mapper_device_removed_cb), mapper); G_CALLBACK (input_mapper_device_removed_cb), mapper);

14
src/core/meta-tablet-action-mapper.c
View file

@ -287,10 +287,14 @@ meta_tablet_action_mapper_constructed (GObject *object)
MetaTabletActionMapper *mapper = META_TABLET_ACTION_MAPPER (object); MetaTabletActionMapper *mapper = META_TABLET_ACTION_MAPPER (object);
MetaTabletActionMapperPrivate *priv = MetaTabletActionMapperPrivate *priv =
meta_tablet_action_mapper_get_instance_private (mapper); meta_tablet_action_mapper_get_instance_private (mapper);
MetaBackend *backend =
meta_monitor_manager_get_backend (priv->monitor_manager);
ClutterBackend *clutter_backend =
meta_backend_get_clutter_backend (backend);
g_autoptr (GList) devices = NULL; g_autoptr (GList) devices = NULL;
GList *l; GList *l;
priv->seat = clutter_backend_get_default_seat (clutter_get_default_backend ()); priv->seat = clutter_backend_get_default_seat (clutter_backend);
devices = clutter_seat_list_devices (priv->seat); devices = clutter_seat_list_devices (priv->seat);
/* FIXME: is this call correct?? */ /* FIXME: is this call correct?? */
@ -515,6 +519,8 @@ meta_tablet_action_mapper_emulate_keybinding (MetaTabletActionMapper *mapper,
{ {
MetaTabletActionMapperPrivate *priv = MetaTabletActionMapperPrivate *priv =
meta_tablet_action_mapper_get_instance_private (mapper); meta_tablet_action_mapper_get_instance_private (mapper);
MetaBackend *backend =
meta_monitor_manager_get_backend (priv->monitor_manager);
ClutterKeyState state; ClutterKeyState state;
MetaKeyCombo combo = { 0 }; MetaKeyCombo combo = { 0 };
@ -529,11 +535,11 @@ meta_tablet_action_mapper_emulate_keybinding (MetaTabletActionMapper *mapper,
if (!priv->virtual_tablet_keyboard) if (!priv->virtual_tablet_keyboard)
{ {
ClutterBackend *backend; ClutterBackend *clutter_backend;
ClutterSeat *seat; ClutterSeat *seat;
backend = clutter_get_default_backend (); clutter_backend = meta_backend_get_clutter_backend (backend);
seat = clutter_backend_get_default_seat (backend); seat = clutter_backend_get_default_seat (clutter_backend);
priv->virtual_tablet_keyboard = priv->virtual_tablet_keyboard =
clutter_seat_create_virtual_device (seat, clutter_seat_create_virtual_device (seat,