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

backend: Get the default seat directly

Browse Source 
In various places we retrieved the default seat from the ClutterBackend.
All the clutter backends implement this by calling
meta_backend_get_default_seat() which will then return
MetaBackendPrivate::default_seat.

Lets avoid this by fetching the default seat directly.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2002>
This commit is contained in:
Jonas Ådahl 2021-09-16 11:12:08 +02:00 committed by Marge Bot
parent c23c07716f
commit cf1715ac43
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backends/meta-backend.c
View File

@ -286,7 +286,7 @@ reset_pointer_position (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
MetaMonitorManager *monitor_manager = priv->monitor_manager; MetaMonitorManager *monitor_manager = priv->monitor_manager;
ClutterSeat *seat = clutter_backend_get_default_seat (priv->clutter_backend); ClutterSeat *seat = priv->default_seat;
MetaLogicalMonitor *primary; MetaLogicalMonitor *primary;
primary = primary =
@ -321,7 +321,7 @@ static void
update_cursors (MetaBackend *backend) update_cursors (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterSeat *seat = clutter_backend_get_default_seat (priv->clutter_backend); ClutterSeat *seat = priv->default_seat;
MetaCursorRenderer *cursor_renderer; MetaCursorRenderer *cursor_renderer;
ClutterInputDevice *pointer, *device; ClutterInputDevice *pointer, *device;
GList *devices, *l; GList *devices, *l;
@ -352,7 +352,7 @@ meta_backend_monitors_changed (MetaBackend *backend)
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
MetaMonitorManager *monitor_manager = MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend); meta_backend_get_monitor_manager (backend);
ClutterSeat *seat = clutter_backend_get_default_seat (priv->clutter_backend); ClutterSeat *seat = priv->default_seat;
ClutterInputDevice *device = clutter_seat_get_pointer (seat); ClutterInputDevice *device = clutter_seat_get_pointer (seat);
graphene_point_t point; graphene_point_t point;
@ -509,7 +509,7 @@ static void
on_stage_shown_cb (MetaBackend *backend) on_stage_shown_cb (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterSeat *seat = clutter_backend_get_default_seat (priv->clutter_backend); ClutterSeat *seat = priv->default_seat;
g_autoptr (GList) devices = NULL; g_autoptr (GList) devices = NULL;
const GList *l; const GList *l;
@ -535,7 +535,7 @@ static void
meta_backend_real_post_init (MetaBackend *backend) meta_backend_real_post_init (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterSeat *seat = clutter_backend_get_default_seat (priv->clutter_backend); ClutterSeat *seat = priv->default_seat;
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
priv->stage = meta_stage_new (backend); priv->stage = meta_stage_new (backend);
@ -1221,10 +1221,8 @@ meta_backend_get_cursor_renderer (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterInputDevice *pointer; ClutterInputDevice *pointer;
ClutterSeat *seat;
seat = clutter_backend_get_default_seat (priv->clutter_backend); pointer = clutter_seat_get_pointer (priv->default_seat);
pointer = clutter_seat_get_pointer (seat);
return meta_backend_get_cursor_renderer_for_device (backend, pointer); return meta_backend_get_cursor_renderer_for_device (backend, pointer);
} }