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

events: Use new API to get MetaWindow from ClutterActor

Browse Source 
The new API supports Wayland subsurfaces and is probably better placed.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/604
This commit is contained in:
Robert Mader 2019-06-13 20:18:27 +02:00
parent 73bc3c4426
commit 62f576e15b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/events.c
View File

@ -27,7 +27,7 @@
#include "backends/meta-cursor-tracker-private.h" #include "backends/meta-cursor-tracker-private.h"
#include "backends/meta-idle-monitor-private.h" #include "backends/meta-idle-monitor-private.h"
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-backend-x11.h"
#include "compositor/meta-surface-actor.h" #include "compositor/meta-window-actor-private.h"
#include "core/display-private.h" #include "core/display-private.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
@ -68,14 +68,16 @@ get_window_for_event (MetaDisplay *display,
case META_EVENT_ROUTE_NORMAL: case META_EVENT_ROUTE_NORMAL:
{ {
ClutterActor *source; ClutterActor *source;
MetaWindowActor *window_actor;
/* Always use the key focused window for key events. */ /* Always use the key focused window for key events. */
if (IS_KEY_EVENT (event)) if (IS_KEY_EVENT (event))
return stage_has_key_focus () ? display->focus_window : NULL; return stage_has_key_focus () ? display->focus_window : NULL;
source = clutter_event_get_source (event); source = clutter_event_get_source (event);
if (META_IS_SURFACE_ACTOR (source)) window_actor = meta_window_actor_from_actor (source);
return meta_surface_actor_get_window (META_SURFACE_ACTOR (source)); if (window_actor)
return meta_window_actor_get_meta_window (window_actor);
else else
return NULL; return NULL;
} }