From 184055b2bb7119566cada1eb632a5ab9471fe558 Mon Sep 17 00:00:00 2001
From: Sebastian Keller <skeller@gnome.org>
Date: Wed, 5 Oct 2022 15:07:49 +0200
Subject: [PATCH] window/x11: Ignore the _NET_WM_BYPASS_COMPOSITOR = 1 hint

We already detect all the cases that allow a window to be properly
unredirected. Using this hint to bypass some of those checks only causes
windows that can not be unredirected properly to get unredirected
regardless.

Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/2434
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2651>
---
 src/x11/window-x11.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 7f152ff42..93511e919 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -4279,14 +4279,6 @@ meta_window_x11_get_client_rect (MetaWindowX11 *window_x11)
   return priv->client_rect;
 }
 
-static gboolean
-has_requested_bypass_compositor (MetaWindowX11 *window_x11)
-{
-  MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
-
-  return priv->bypass_compositor == META_BYPASS_COMPOSITOR_HINT_ON;
-}
-
 static gboolean
 has_requested_dont_bypass_compositor (MetaWindowX11 *window_x11)
 {
@@ -4318,9 +4310,6 @@ meta_window_x11_can_unredirect (MetaWindowX11 *window_x11)
   if (meta_window_is_screen_sized (window))
     return TRUE;
 
-  if (has_requested_bypass_compositor (window_x11))
-    return TRUE;
-
   if (window->override_redirect)
     {
       MetaRectangle window_rect;