isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Drop CLUTTER_DESTROY_NOTIFY event

Browse Source 
Stop propagating this as a Clutter event. DestroyNotify is only
relevant on nested X11 sessions, so handle it specifically in place.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1623>
This commit is contained in:
Carlos Garnacho
2020-12-07 18:18:00 +01:00
committed by Marge Bot
parent 49b3ac2f86
commit 96e320ba5a
8 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/x11/meta-stage-x11.c
View File

@ -734,9 +734,10 @@ meta_stage_x11_translate_event (MetaStageX11 *stage_x11,
g_debug ("Destroy notification received for stage, win:0x%x",
(unsigned int) xevent->xany.window);
event->any.type = CLUTTER_DESTROY_NOTIFY;
event->any.stage = stage;
res = TRUE;
g_return_val_if_fail (META_IS_STAGE_X11_NESTED (stage_x11),
FALSE);
meta_quit (META_EXIT_SUCCESS);
res = FALSE;
break;
case ClientMessage:

3
src/core/events.c
View File

@ -110,8 +110,7 @@ handle_idletime_for_event (const ClutterEvent *event)
if (event->any.flags & CLUTTER_EVENT_FLAG_SYNTHETIC ||
event->type == CLUTTER_ENTER ||
event->type == CLUTTER_LEAVE ||
event->type == CLUTTER_STAGE_STATE ||
event->type == CLUTTER_DESTROY_NOTIFY)
event->type == CLUTTER_STAGE_STATE)
return;
core_monitor = meta_idle_monitor_get_core ();

3
src/tests/clutter/interactive/test-events.c
View File

@ -350,9 +350,6 @@ input_cb (ClutterActor *actor,
case CLUTTER_STAGE_STATE:
g_print ("[%s] STAGE STATE", clutter_actor_get_name (source_actor));
break;
case CLUTTER_DESTROY_NOTIFY:
g_print ("[%s] DESTROY NOTIFY", clutter_actor_get_name (source_actor));
break;
case CLUTTER_TOUCHPAD_PINCH:
g_print ("[%s] TOUCHPAD PINCH", clutter_actor_get_name (source_actor));
break;

3
src/tests/clutter/interactive/test-grab.c
View File

@ -62,9 +62,6 @@ debug_event_cb (ClutterActor *actor,
case CLUTTER_STAGE_STATE:
printf("[%s] STAGE STATE", source);
break;
case CLUTTER_DESTROY_NOTIFY:
printf("[%s] DESTROY NOTIFY", source);
break;
case CLUTTER_TOUCH_BEGIN:
g_print ("[%s] TOUCH BEGIN", source);
break;