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

clutter: Specify that input-only grabs are started inactive in API

Browse source 
Add the _inactive suffix, so that the state of these objects is clear.

(cherry-picked from commit 01444e803f)

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3874>
This commit is contained in:
Carlos Garnacho 2024-06-17 16:15:07 +02:00
parent 827c4fea4b
commit 7e0e428016
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clutter/clutter/clutter-stage-private.h
View file

@ -136,10 +136,10 @@ void clutter_stage_add_to_redraw_clip (ClutterStage *self,
ClutterPaintVolume *clip);
CLUTTER_EXPORT
ClutterGrab * clutter_stage_grab_input_only (ClutterStage *self,
ClutterEventHandler handler,
gpointer user_data,
GDestroyNotify user_data_destroy);
ClutterGrab * clutter_stage_grab_input_only_inactive (ClutterStage *self,
ClutterEventHandler handler,
gpointer user_data,
GDestroyNotify user_data_destroy);
void clutter_stage_invalidate_devices (ClutterStage *stage);

8
clutter/clutter/clutter-stage.c
View file

@ -3931,10 +3931,10 @@ clutter_stage_grab_inactive (ClutterStage *stage,
}
ClutterGrab *
clutter_stage_grab_input_only (ClutterStage *stage,
ClutterEventHandler handler,
gpointer user_data,
GDestroyNotify user_data_destroy)
clutter_stage_grab_input_only_inactive (ClutterStage *stage,
ClutterEventHandler handler,
gpointer user_data,
GDestroyNotify user_data_destroy)
{
ClutterInputOnlyActor *input_only_actor;
ClutterActor *actor;

6
src/tests/clutter/conform/grab.c
View file

@ -625,9 +625,9 @@ grab_input_only (void)
test_data_init (&data);
grab = clutter_stage_grab_input_only (CLUTTER_STAGE (data.stage),
handle_input_only_event,
data.events, NULL);
grab = clutter_stage_grab_input_only_inactive (CLUTTER_STAGE (data.stage),
handle_input_only_event,
data.events, NULL);
clutter_grab_activate (grab);
event_log_compare ((EventLog *) &grab1_log, data.events);

8
src/wayland/meta-wayland-input.c
View file

@ -299,10 +299,10 @@ meta_wayland_input_attach_event_handler (MetaWaylandInput *input,
MetaBackend *backend = meta_context_get_backend (context);
ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
input->grab = clutter_stage_grab_input_only (stage,
grab_handle_event,
input,
NULL);
input->grab = clutter_stage_grab_input_only_inactive (stage,
grab_handle_event,
input,
NULL);
clutter_grab_activate (input->grab);
g_signal_connect_swapped (input->grab, "notify::revoked",