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

backend: Dispatch initial burst of events synchronously on init

Browse Source 
This will consist of device-added events, meaning before init finishes,
we can derive some state that depends on the set of input devices
available on startup, such as cursor visibility.

This avoids cursor visibility switching between hidden and visibility
during startup.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3070>
This commit is contained in:
Jonas Ådahl
2023-06-12 16:46:33 +02:00
committed by Marge Bot
parent 27606cf1fb
commit 49e6ce459c
3 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,8 @@ struct _MetaBackendPrivate
GList *gpus;
GList *hw_cursor_inhibitors;
gboolean in_init;
guint device_update_idle_id;
ClutterInputDevice *current_device;
@ -422,8 +424,9 @@ on_device_added (ClutterSeat *seat,
device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_TOUCHSCREEN_DEVICE ||
device_type == CLUTTER_POINTER_DEVICE)
if (!priv->in_init &&
(device_type == CLUTTER_TOUCHSCREEN_DEVICE ||
device_type == CLUTTER_POINTER_DEVICE))
{
meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker,
determine_hotplug_pointer_visibility (seat));
@ -446,6 +449,8 @@ on_device_removed (ClutterSeat *seat,
MetaBackend *backend = META_BACKEND (user_data);
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
g_warn_if_fail (!priv->in_init);
if (clutter_input_device_get_device_mode (device) ==
CLUTTER_INPUT_MODE_LOGICAL)
return;
@ -1032,6 +1037,8 @@ update_pointer_visibility_from_event (MetaBackend *backend,
ClutterInputDeviceType device_type;
uint32_t time_ms;
g_warn_if_fail (!priv->in_init);
device = clutter_event_get_source_device (event);
device_type = clutter_input_device_get_device_type (device);
time_ms = clutter_event_get_time (event);
@ -1063,6 +1070,28 @@ update_pointer_visibility_from_event (MetaBackend *backend,
}
}
static gboolean
dispatch_clutter_event (MetaBackend *backend)
{
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterEvent *event;
event = clutter_event_get ();
if (event)
{
g_warn_if_fail (!priv->in_init ||
event->type == CLUTTER_DEVICE_ADDED);
event->any.stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
clutter_do_event (event);
meta_backend_update_from_event (backend, event);
clutter_event_free (event);
return TRUE;
}
return FALSE;
}
/* Mutter is responsible for pulling events off the X queue, so Clutter
* doesn't need (and shouldn't) run its normal event source which polls
* the X fd, but we do have to deal with dispatching events that accumulate
@ -1095,16 +1124,8 @@ clutter_source_dispatch (GSource *source,
gpointer user_data)
{
MetaBackendSource *backend_source = (MetaBackendSource *) source;
ClutterEvent *event = clutter_event_get ();
if (event)
{
event->any.stage =
CLUTTER_STAGE (meta_backend_get_stage (backend_source->backend));
clutter_do_event (event);
meta_backend_update_from_event (backend_source->backend, event);
clutter_event_free (event);
}
dispatch_clutter_event (backend_source->backend);
return TRUE;
}
@ -1205,6 +1226,15 @@ meta_backend_initable_init (GInitable *initable,
meta_backend_post_init (backend);
while (TRUE)
{
if (!dispatch_clutter_event (backend))
break;
}
_clutter_stage_process_queued_events (CLUTTER_STAGE (priv->stage));
priv->in_init = FALSE;
return TRUE;
}
@ -1217,6 +1247,9 @@ initable_iface_init (GInitableIface *initable_iface)
static void
meta_backend_init (MetaBackend *backend)
{
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
priv->in_init = TRUE;
}
/**
@ -1708,8 +1741,12 @@ void
meta_backend_update_from_event (MetaBackend *backend,
ClutterEvent *event)
{
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
update_last_device_from_event (backend, event);
update_pointer_visibility_from_event (backend, event);
if (!priv->in_init)
update_pointer_visibility_from_event (backend, event);
}
/**