[mutter] events: Use new API to get MetaWindow from ClutterActor
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] events: Use new API to get MetaWindow from ClutterActor
- Date: Sat, 13 Jul 2019 14:25:12 +0000 (UTC)
commit 62f576e15bb2cf77fd48804686b11da10e7b50f2
Author: Robert Mader <robert mader posteo de>
Date: Thu Jun 13 20:18:27 2019 +0200
events: Use new API to get MetaWindow from ClutterActor
The new API supports Wayland subsurfaces and is probably better placed.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/604
src/core/events.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/core/events.c b/src/core/events.c
index 5b8e49fc7..699b5b4b7 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -27,7 +27,7 @@
#include "backends/meta-cursor-tracker-private.h"
#include "backends/meta-idle-monitor-private.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/window-private.h"
#include "meta/meta-backend.h"
@@ -68,14 +68,16 @@ get_window_for_event (MetaDisplay *display,
case META_EVENT_ROUTE_NORMAL:
{
ClutterActor *source;
+ MetaWindowActor *window_actor;
/* Always use the key focused window for key events. */
if (IS_KEY_EVENT (event))
return stage_has_key_focus () ? display->focus_window : NULL;
source = clutter_event_get_source (event);
- if (META_IS_SURFACE_ACTOR (source))
- return meta_surface_actor_get_window (META_SURFACE_ACTOR (source));
+ window_actor = meta_window_actor_from_actor (source);
+ if (window_actor)
+ return meta_window_actor_get_meta_window (window_actor);
else
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]