From b3d6ae34eee8d79c67745d242dcb28f36e73bfaa Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 2 Aug 2023 12:52:23 +0200
Subject: [PATCH] backends/x11: Handle MetaSeatX11 event translation in main
 event handler

This is about the only reason now to go through the ClutterBackend
translate_event vmethod. We can do that directly, and stop requiring the
generic vmethod that is actually just used for X11 events.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3153>
---
 src/backends/x11/meta-clutter-backend-x11.c | 10 ----------
 src/backends/x11/meta-event-x11.c           | 13 ++++++-------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c
index 3474cab86..03e90fd92 100644
--- a/src/backends/x11/meta-clutter-backend-x11.c
+++ b/src/backends/x11/meta-clutter-backend-x11.c
@@ -217,16 +217,6 @@ meta_clutter_backend_x11_translate_event (ClutterBackend *clutter_backend,
                                           gpointer        native,
                                           ClutterEvent   *event)
 {
-  MetaClutterBackendX11 *clutter_backend_x11 =
-    META_CLUTTER_BACKEND_X11 (clutter_backend);
-  MetaClutterBackendX11Private *priv =
-    meta_clutter_backend_x11_get_instance_private (clutter_backend_x11);
-  ClutterSeat *seat;
-
-  seat = meta_backend_get_default_seat (priv->backend);
-  if (meta_seat_x11_translate_event (META_SEAT_X11 (seat), native, event))
-    return TRUE;
-
   return FALSE;
 }
 
diff --git a/src/backends/x11/meta-event-x11.c b/src/backends/x11/meta-event-x11.c
index 8f8880989..13b7688e0 100644
--- a/src/backends/x11/meta-event-x11.c
+++ b/src/backends/x11/meta-event-x11.c
@@ -28,6 +28,7 @@
 
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-event-x11.h"
+#include "backends/x11/meta-seat-x11.h"
 #include "backends/x11/meta-stage-x11.h"
 #include "clutter/clutter-mutter.h"
 #include "cogl/cogl-xlib.h"
@@ -56,6 +57,7 @@ meta_x11_handle_event (MetaBackend *backend,
   MetaX11FilterReturn result;
   ClutterBackend *clutter_backend;
   ClutterEvent *event;
+  MetaSeatX11 *seat_x11;
   MetaStageX11 *stage_x11;
   gint spin = 1;
   Display *xdisplay;
@@ -74,24 +76,21 @@ meta_x11_handle_event (MetaBackend *backend,
 
   clutter_backend = meta_backend_get_clutter_backend (backend);
 
-  event = clutter_event_new (CLUTTER_NOTHING);
-
   xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
 
   allocated_event = XGetEventData (xdisplay, &xevent->xcookie);
 
   if (cogl_xlib_renderer_handle_event (clutter_backend->cogl_renderer,
                                        xevent) == COGL_FILTER_REMOVE)
-    {
-      clutter_event_free (event);
-      goto out;
-    }
+    goto out;
 
   stage_x11 =
     META_STAGE_X11 (clutter_backend_get_stage_window (clutter_backend));
   meta_stage_x11_handle_event (stage_x11, xevent);
 
-  if (_clutter_backend_translate_event (clutter_backend, xevent, event))
+  event = clutter_event_new (CLUTTER_NOTHING);
+  seat_x11 = META_SEAT_X11 (meta_backend_get_default_seat (backend));
+  if (meta_seat_x11_translate_event (seat_x11, xevent, event))
     {
       _clutter_event_push (event, FALSE);