Update downstream patch

The reverts keep piling up ...

0001-Revert-x11-Use-input-region-from-frame-window-for-de.patch

@@ -1,7 +1,74 @@
-From 21680b2f4edb064ff524cb91e9e20ace91deda6d Mon Sep 17 00:00:00 2001
+From e2689988a40966f1ac17d2e7faf900ce4e85ee6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sun, 26 May 2024 00:43:37 +0200
+Subject: [PATCH 1/3] Revert "x11/window: Compare input shape to client rect
+ when undecorating"
+
+This reverts commit d8af06fe4993227c5059971effbe28527cd75412.
+---
+ src/x11/window-x11.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index df5f955877..925c7549b7 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -2400,7 +2400,6 @@ meta_window_x11_update_input_region (MetaWindow *window)
+   g_autoptr (MtkRegion) region = NULL;
+   MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
+   MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
+-  MtkRectangle bounding_rect = { 0 };
+   Window xwindow;
+ 
+   if (window->decorated)
+@@ -2412,14 +2411,10 @@ meta_window_x11_update_input_region (MetaWindow *window)
+           return;
+         }
+       xwindow = window->frame->xwindow;
+-      bounding_rect.width = window->buffer_rect.width;
+-      bounding_rect.height = window->buffer_rect.height;
+     }
+   else
+     {
+       xwindow = priv->xwindow;
+-      bounding_rect.width = priv->client_rect.width;
+-      bounding_rect.height = priv->client_rect.height;
+     }
+ 
+   if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
+@@ -2463,8 +2458,8 @@ meta_window_x11_update_input_region (MetaWindow *window)
+       else if (n_rects == 1 &&
+                (rects[0].x == 0 &&
+                 rects[0].y == 0 &&
+-                rects[0].width == bounding_rect.width &&
+-                rects[0].height == bounding_rect.height))
++                rects[0].width == window->buffer_rect.width &&
++                rects[0].height == window->buffer_rect.height))
+         {
+           /* This is the bounding region case. Keep the
+            * region as NULL. */
+@@ -2481,6 +2476,13 @@ meta_window_x11_update_input_region (MetaWindow *window)
+ 
+   if (region != NULL)
+     {
++      MtkRectangle bounding_rect;
++
++      bounding_rect.x = 0;
++      bounding_rect.y = 0;
++      bounding_rect.width = window->buffer_rect.width;
++      bounding_rect.height = window->buffer_rect.height;
++
+       /* The shape we get back from the client may have coordinates
+        * outside of the frame. The X SHAPE Extension requires that
+        * the overall shape the client provides never exceeds the
+-- 
+2.45.1
+
+
+From dd0580024d559570a272413f3a4d14a22402667a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Sun, 21 Apr 2024 16:54:52 +0200
-Subject: [PATCH 1/2] Revert "x11/window: Update comment and variable name to
+Subject: [PATCH 2/3] Revert "x11/window: Update comment and variable name to
  reflect current behavior"
 
 This reverts commit e4763d00e8512aeb408ae118597d753f12217487.
@@ -10,7 +77,7 @@ This reverts commit e4763d00e8512aeb408ae118597d753f12217487.
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
-index 6d2016e3ec..f6f7d87dfe 100644
+index 925c7549b7..7f2c0a3fd2 100644
 --- a/src/x11/window-x11.c
 +++ b/src/x11/window-x11.c
 @@ -2476,20 +2476,21 @@ meta_window_x11_update_input_region (MetaWindow *window)
@@ -43,13 +110,13 @@ index 6d2016e3ec..f6f7d87dfe 100644
  
    meta_window_set_input_region (window, region);
 -- 
-2.44.0
+2.45.1
 
 
-From f1996e67ad8a5a0009e90c38767c8906e015ba70 Mon Sep 17 00:00:00 2001
+From 562087309a2c8f08e9d5436cf652ba4fd7400a82 Mon Sep 17 00:00:00 2001
 From: Adam Williamson <awilliam@redhat.com>
 Date: Thu, 5 Oct 2023 13:09:46 -0700
-Subject: [PATCH 2/2] Revert "x11: Use input region from frame window for
+Subject: [PATCH 3/3] Revert "x11: Use input region from frame window for
  decorated windows"
 
 This reverts commit d991961ae2a5c8cf2e58ff1072239f4902b0f767. It
@@ -95,7 +162,7 @@ index c74a2e04ec..5feb854805 100644
                     meta_window_x11_get_xwindow (window),
                     x11_display->atom__MUTTER_NEEDS_FRAME);
 diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
-index f6f7d87dfe..1bc5c57a1a 100644
+index 7f2c0a3fd2..ace1f8f5bc 100644
 --- a/src/x11/window-x11.c
 +++ b/src/x11/window-x11.c
 @@ -2082,10 +2082,6 @@ meta_window_x11_constructed (GObject *object)
@@ -159,5 +226,5 @@ index f6f7d87dfe..1bc5c57a1a 100644
        /* The shape we get back from the client may have coordinates
         * outside of the frame. The X SHAPE Extension requires that
 -- 
-2.44.0
+2.45.1