Merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic

[Marco Trevisan (Treviño)]

Upstream cherry-picks and crash fix

[Iain Lane (laney)]

Done, thanks! I think we should probably think about doing a snapshot next time, this is a lot of cherry-picks already.

diff --git a/debian/changelog b/debian/changelog
index 62c0624..9a06342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+mutter (3.28.4-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+  * d/p/screen-Destroy-window-actors-after-windows-while-unmanagi.patch,
+    d/p/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch:
+    - Destroy window actors after windows while unmanaging compositor
+      (LP: #1832869)
+  * d/p/window-Emit-an-error-and-return-when-trying-to-activate-a.patch:
+    - window: Emit an error and return when trying to activate an unmanaged
+      (LP: #1827401)
+  * d/p/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch,
+    d/p/test-runner-Add-assert_focused-command.patch,
+    d/p/test-runner-Add-dispatch-command.patch,
+    d/p/test-runner-Add-sleep-command.patch,
+    d/p/tests-Add-accept_focus-command-to-runner-and-client.patch,
+    d/p/tests-Add-can_take_focus-command-to-runner-and-client.patch,
+    d/p/tests-Verify-focused-window-in-closed-transient-tests.patch,
+    d/p/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch,
+    d/p/window-x11-Accept-any-focusable-window-as-fallback-focus.patch,
+    d/p/window-x11-Don-t-double-check-for-unmanaging-windows.patch,
+    d/p/window-x11-Focus-the-default-window-with-delay-while-wait.patch,
+    d/p/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch,
+    d/p/workspace-Focus-only-ancestors-that-are-focusable.patch:
+    - Workspace: Take-Input windows focus fixes (LP: #1791574)
+  * debian/libmutter-2-0.symbols: Update with new symbols
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 08 Jul 2019 20:00:56 +0200
+
 mutter (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
 
   * New upstream release:
diff --git a/debian/libmutter-2-0.symbols b/debian/libmutter-2-0.symbols
index 951e8e4..70b61dc 100644
--- a/debian/libmutter-2-0.symbols
+++ b/debian/libmutter-2-0.symbols
@@ -139,6 +139,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_compositor_sync_updates_frozen@Base 3.28.2
  meta_compositor_sync_window_geometry@Base 3.28.2
  meta_compositor_unmanage@Base 3.28.2
+ meta_compositor_unmanage_window_actors@Base 3.28.4-0ubuntu18.04.2
  meta_compositor_window_opacity_changed@Base 3.28.2
  meta_compositor_window_shape_changed@Base 3.28.2
  meta_compositor_window_surface_changed@Base 3.28.2
@@ -1112,6 +1113,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER#
  meta_stack_get_above@Base 3.28.2
  meta_stack_get_below@Base 3.28.2
  meta_stack_get_bottom@Base 3.28.2
+ meta_stack_get_default_focus_candidates@Base 3.28.4-0ubuntu18.04.2
  meta_stack_get_default_focus_window@Base 3.28.2
  meta_stack_get_default_focus_window_at_point@Base 3.28.2
  meta_stack_get_positions@Base 3.28.2
diff --git a/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch b/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch
new file mode 100644
index 0000000..3bf085a
--- /dev/null
+++ b/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch
@@ -0,0 +1,106 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 25 Jun 2019 20:22:23 +0200
+Subject: screen: Destroy window actors after windows while unmanaging
+ compositor
+
+After commit 2e64457f4 we destroy window actors as part of compositor
+destruction, however this might emit 'actor-removed' signals on window groups
+that the shell could use to access to resources that are already free'd at this
+point (like the destroyed screen, in gnome-shell's Panel._updateSolidStyle()).
+
+So, move the actor destructions under in a new function and destroy the window
+actors as part of compositor unmanage step, just after that all the windows are
+unmanaged (as they need to have an actor around).
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/652
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/653
+Bug-Ubuntu: https://launchpad.net/bugs/1832869
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/652
+Applied-Upstream: 3.28.5
+---
+ src/compositor/compositor-private.h |  2 ++
+ src/compositor/compositor.c         | 30 +++++++++++++++++-------------
+ src/core/screen.c                   |  3 +++
+ 3 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
+index 4669bc5..4582792 100644
+--- a/src/compositor/compositor-private.h
++++ b/src/compositor/compositor-private.h
+@@ -73,4 +73,6 @@ MetaCloseDialog * meta_compositor_create_close_dialog (MetaCompositor *composito
+ MetaInhibitShortcutsDialog * meta_compositor_create_inhibit_shortcuts_dialog (MetaCompositor *compositor,
+                                                                               MetaWindow     *window);
+ 
++void meta_compositor_unmanage_window_actors (MetaCompositor *compositor);
++
+ #endif /* META_COMPOSITOR_PRIVATE_H */
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 2545d2c..6d04533 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -145,19 +145,6 @@ meta_compositor_destroy (MetaCompositor *compositor)
+   clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
+   clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
+ 
+-  if (compositor->top_window_actor)
+-    {
+-      g_signal_handlers_disconnect_by_func (compositor->top_window_actor,
+-                                            on_top_window_actor_destroyed,
+-                                            compositor);
+-      compositor->top_window_actor = NULL;
+-    }
+-
+-  g_clear_pointer (&compositor->window_group, clutter_actor_destroy);
+-  g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy);
+-  g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy);
+-  g_clear_pointer (&compositor->windows, g_list_free);
+-
+   if (compositor->have_x11_sync_object)
+     meta_sync_ring_destroy ();
+ }
+@@ -610,6 +597,23 @@ meta_compositor_unmanage (MetaCompositor *compositor)
+     }
+ }
+ 
++void
++meta_compositor_unmanage_window_actors (MetaCompositor *compositor)
++{
++  if (compositor->top_window_actor)
++    {
++      g_signal_handlers_disconnect_by_func (compositor->top_window_actor,
++                                            on_top_window_actor_destroyed,
++                                            compositor);
++      compositor->top_window_actor = NULL;
++    }
++
++  g_clear_pointer (&compositor->window_group, clutter_actor_destroy);
++  g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy);
++  g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy);
++  g_clear_pointer (&compositor->windows, g_list_free);
++}
++
+ /**
+  * meta_shape_cow_for_window:
+  * @compositor: A #MetaCompositor
+diff --git a/src/core/screen.c b/src/core/screen.c
+index d7623f3..2e59754 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -41,6 +41,7 @@
+ #include "stack.h"
+ #include <meta/compositor.h>
+ #include <meta/meta-enum-types.h>
++#include "compositor-private.h"
+ #include "core.h"
+ #include "meta-cursor-tracker-private.h"
+ #include "boxes-private.h"
+@@ -844,6 +845,8 @@ meta_screen_free (MetaScreen *screen,
+ 
+   meta_display_unmanage_windows_for_screen (display, screen, timestamp);
+ 
++  meta_compositor_unmanage_window_actors (display->compositor);
++
+   meta_prefs_remove_listener (prefs_changed_callback, screen);
+ 
+   meta_screen_ungrab_keys (screen);
diff --git a/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch b/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch
new file mode 100644
index 0000000..7c67b0c
--- /dev/null
+++ b/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 25 Jun 2019 20:22:54 +0200
+Subject: screen: Unset the active workspace and remove workspaces on free
+
+Related to https://gitlab.gnome.org/GNOME/mutter/issues/652
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/653
+Bug-Ubuntu: https://launchpad.net/bugs/1832869
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/652
+Applied-Upstream: 3.28.5
+---
+ src/core/screen.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/core/screen.c b/src/core/screen.c
+index 2e59754..11f3bad 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -836,6 +836,7 @@ meta_screen_free (MetaScreen *screen,
+                   guint32     timestamp)
+ {
+   MetaDisplay *display;
++  GList *l;
+ 
+   display = screen->display;
+ 
+@@ -877,6 +878,16 @@ meta_screen_free (MetaScreen *screen,
+ 
+   g_free (screen->screen_name);
+ 
++  screen->active_workspace = NULL;
++
++  for (l = screen->workspaces; l;)
++    {
++      MetaWorkspace *workspace = l->data;
++      l = l->next;
++
++      meta_workspace_remove (workspace);
++    }
++
+   g_object_unref (screen);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5bf1aa6..8165334 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,22 @@ clutter-Fix-offscreen-effect-painting-of-clones.patch
 bgo768531_workaround-startup-notifications.patch
 monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
 monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
+screen-Destroy-window-actors-after-windows-while-unmanagi.patch
+screen-Unset-the-active-workspace-and-remove-workspaces-o.patch
+workspace-Focus-only-ancestors-that-are-focusable.patch
+tests-Add-accept_focus-command-to-runner-and-client.patch
+tests-Add-can_take_focus-command-to-runner-and-client.patch
+tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch
+test-runner-Add-assert_focused-command.patch
+tests-Verify-focused-window-in-closed-transient-tests.patch
+test-runner-Add-sleep-command.patch
+test-runner-Add-dispatch-command.patch
+window-x11-Focus-the-default-window-with-delay-while-wait.patch
+window-Emit-an-error-and-return-when-trying-to-activate-a.patch
+window-x11-Don-t-double-check-for-unmanaging-windows.patch
+window-x11-Accept-any-focusable-window-as-fallback-focus.patch
+stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch
+window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch
 lp1763892-a-renderer-native-Add-hardware-presentation-timing.patch
 lp1763892-b-renderer-native-Advertise-_FEATURE_SWAP_THROTTLE.patch
 debian/synaptics-support.patch
diff --git a/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch b/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch
new file mode 100644
index 0000000..f3452b8
--- /dev/null
+++ b/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch
@@ -0,0 +1,134 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 3 Jul 2019 18:48:07 +0200
+Subject: stack: Add a function to get a sorted list of focus candidates
+
+Use a static function if a window can be the default focus window, and use such
+function to return a filtered list of the stack.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+
+(cherry picked from commit 2439255f32b4e775d4427c92a6797b8bd33e7d5a)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-Ubuntu: https://launchpad.net/bugs/1834583
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Applied-Upstream: 3.28.5
+---
+ src/core/stack.c | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
+ src/core/stack.h | 15 +++++++++++++++
+ 2 files changed, 57 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/stack.c b/src/core/stack.c
+index fc51aa1..3a0130f 100644
+--- a/src/core/stack.c
++++ b/src/core/stack.c
+@@ -1176,6 +1176,27 @@ window_contains_point (MetaWindow *window,
+   return POINT_IN_RECT (root_x, root_y, rect);
+ }
+ 
++static gboolean
++window_can_get_default_focus (MetaWindow *window)
++{
++  if (window->unmaps_pending > 0)
++    return FALSE;
++
++  if (window->unmanaging)
++    return FALSE;
++
++  if (!(window->input || window->take_focus))
++    return FALSE;
++
++  if (!meta_window_should_be_showing (window))
++    return FALSE;
++
++  if (window->type == META_WINDOW_DOCK)
++    return FALSE;
++
++  return TRUE;
++}
++
+ static MetaWindow*
+ get_default_focus_window (MetaStack     *stack,
+                           MetaWorkspace *workspace,
+@@ -1203,24 +1224,12 @@ get_default_focus_window (MetaStack     *stack,
+       if (window == not_this_one)
+         continue;
+ 
+-      if (window->unmaps_pending > 0)
+-        continue;
+-
+-      if (window->unmanaging)
+-        continue;
+-
+-      if (!(window->input || window->take_focus))
+-        continue;
+-
+-      if (!meta_window_should_be_showing (window))
++      if (!window_can_get_default_focus (window))
+         continue;
+ 
+       if (must_be_at_point && !window_contains_point (window, root_x, root_y))
+         continue;
+ 
+-      if (window->type == META_WINDOW_DOCK)
+-        continue;
+-
+       return window;
+     }
+ 
+@@ -1275,6 +1284,26 @@ meta_stack_list_windows (MetaStack     *stack,
+   return workspace_windows;
+ }
+ 
++GList *
++meta_stack_get_default_focus_candidates (MetaStack     *stack,
++                                         MetaWorkspace *workspace)
++{
++  GList *windows = meta_stack_list_windows (stack, workspace);
++  GList *l;
++
++  for (l = windows; l;)
++    {
++      GList *next = l->next;
++
++      if (!window_can_get_default_focus (l->data))
++        windows = g_list_delete_link (windows, l);
++
++      l = next;
++    }
++
++  return windows;
++}
++
+ int
+ meta_stack_windows_cmp  (MetaStack  *stack,
+                          MetaWindow *window_a,
+diff --git a/src/core/stack.h b/src/core/stack.h
+index e82be0a..8cd7c68 100644
+--- a/src/core/stack.h
++++ b/src/core/stack.h
+@@ -337,6 +337,21 @@ MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack     *stack,
+                                                           int            root_x,
+                                                           int            root_y);
+ 
++/**
++ * meta_stack_get_default_focus_candidates:
++ * @stack: The stack to examine.
++ * @workspace: If not %NULL, only windows on this workspace will be
++ *             returned; otherwise all windows in the stack will be
++ *             returned.
++ *
++ * Returns all the focus candidate windows in the stack, in order.
++ *
++ * Returns: (transfer container) (element-type Meta.Window):
++ *     A #GList of #MetaWindow, in stacking order, honouring layers.
++ */
++GList *     meta_stack_get_default_focus_candidates (MetaStack     *stack,
++                                                     MetaWorkspace *workspace);
++
+ /**
+  * meta_stack_list_windows:
+  * @stack: The stack to examine.
diff --git a/debian/patches/test-runner-Add-assert_focused-command.patch b/debian/patches/test-runner-Add-assert_focused-command.patch
new file mode 100644
index 0000000..94d47fc
--- /dev/null
+++ b/debian/patches/test-runner-Add-assert_focused-command.patch
@@ -0,0 +1,76 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 08:37:14 +0100
+Subject: test-runner: Add 'assert_focused' command
+
+This allows to verify which window should have the focus, which might not
+be the same as the top of the stack.
+
+It's possible to assert the case where there's no focused window using
+"NONE" as parameter.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit 51f9e04ef1fa8cd7298044ac8c82e83bea425770)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/tests/test-runner.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
+index 37befb4..9056d9a 100644
+--- a/src/tests/test-runner.c
++++ b/src/tests/test-runner.c
+@@ -273,6 +273,37 @@ test_case_assert_stacking (TestCase *test,
+   return *error == NULL;
+ }
+ 
++static gboolean
++test_case_assert_focused (TestCase    *test,
++                          const char  *expected_window,
++                          GError     **error)
++{
++  MetaDisplay *display = meta_get_display ();
++
++  if (!display->focus_window)
++    {
++      if (g_strcmp0 (expected_window, "none") != 0)
++        {
++          g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED,
++                       "focus: expected='%s', actual='none'", expected_window);
++        }
++    }
++  else
++    {
++      const char *focused = display->focus_window->title;
++
++      if (g_str_has_prefix (focused, "test/"))
++        focused += 5;
++
++      if (g_strcmp0 (focused, expected_window) != 0)
++        g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED,
++                     "focus: expected='%s', actual='%s'",
++                     expected_window, focused);
++    }
++
++  return *error == NULL;
++}
++
+ static gboolean
+ test_case_check_xserver_stacking (TestCase *test,
+                                   GError  **error)
+@@ -496,6 +527,11 @@ test_case_do (TestCase *test,
+       if (!test_case_check_xserver_stacking (test, error))
+         return FALSE;
+     }
++  else if (strcmp (argv[0], "assert_focused") == 0)
++    {
++      if (!test_case_assert_focused (test, argv[1], error))
++        return FALSE;
++    }
+   else
+     {
+       BAD_COMMAND("Unknown command %s", argv[0]);
diff --git a/debian/patches/test-runner-Add-dispatch-command.patch b/debian/patches/test-runner-Add-dispatch-command.patch
new file mode 100644
index 0000000..0fcbbd7
--- /dev/null
+++ b/debian/patches/test-runner-Add-dispatch-command.patch
@@ -0,0 +1,84 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 21 Jun 2019 13:15:48 +0200
+Subject: test-runner: Add 'dispatch' command
+
+This will only wait for events to be dispatched and processed by the server
+without waiting for client processing.
+
+Reuse the code for the wait command too.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit 6022b23923fa6192c630920e9f895f185977beee)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/tests/test-runner.c | 38 ++++++++++++++++++++++++++++----------
+ 1 file changed, 28 insertions(+), 10 deletions(-)
+
+diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
+index 75732c6..cdeaba2 100644
+--- a/src/tests/test-runner.c
++++ b/src/tests/test-runner.c
+@@ -122,6 +122,24 @@ test_case_loop_quit (gpointer data)
+   return FALSE;
+ }
+ 
++static gboolean
++test_case_dispatch (TestCase *test,
++                    GError  **error)
++{
++  /* Wait until we've done any outstanding queued up work.
++   * Though we add this as BEFORE_REDRAW, the iteration that runs the
++   * BEFORE_REDRAW idles will proceed on and do the redraw, so we're
++   * waiting until after *all* frame processing.
++   */
++  meta_later_add (META_LATER_BEFORE_REDRAW,
++                  test_case_loop_quit,
++                  test,
++                  NULL);
++  g_main_loop_run (test->loop);
++
++  return TRUE;
++}
++
+ static gboolean
+ test_case_wait (TestCase *test,
+                 GError  **error)
+@@ -138,16 +156,8 @@ test_case_wait (TestCase *test,
+     if (!test_client_wait (value, error))
+       return FALSE;
+ 
+-  /* Then wait until we've done any outstanding queued up work.
+-   * Though we add this as BEFORE_REDRAW, the iteration that runs the
+-   * BEFORE_REDRAW idles will proceed on and do the redraw, so we're
+-   * waiting until after *all* frame processing.
+-   */
+-  meta_later_add (META_LATER_BEFORE_REDRAW,
+-                  test_case_loop_quit,
+-                  test,
+-                  NULL);
+-  g_main_loop_run (test->loop);
++  /* Then wait until we've done any outstanding queued up work. */
++  test_case_dispatch (test, error);
+ 
+   /* Then set an XSync counter ourselves and and wait until
+    * we receive the resulting event - this makes sure that we've
+@@ -530,6 +540,14 @@ test_case_do (TestCase *test,
+       if (!test_case_wait (test, error))
+         return FALSE;
+     }
++  else if (strcmp (argv[0], "dispatch") == 0)
++    {
++      if (argc != 1)
++        BAD_COMMAND("usage: %s", argv[0]);
++
++      if (!test_case_dispatch (test, error))
++        return FALSE;
++    }
+   else if (strcmp (argv[0], "sleep") == 0)
+     {
+       guint64 interval;
diff --git a/debian/patches/test-runner-Add-sleep-command.patch b/debian/patches/test-runner-Add-sleep-command.patch
new file mode 100644
index 0000000..914c9c2
--- /dev/null
+++ b/debian/patches/test-runner-Add-sleep-command.patch
@@ -0,0 +1,82 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 18 Jun 2019 19:33:10 +0200
+Subject: test-runner: Add 'sleep' command
+
+This allows to sleep for a given timeout in milliseconds.
+
+Rename test_case_before_redraw to test_case_loop_quit since it's a generic
+function and use it for the timeout too.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit d08763c18cb25fe250b27bf296e1607e63e86400)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/tests/test-runner.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
+index 9056d9a..75732c6 100644
+--- a/src/tests/test-runner.c
++++ b/src/tests/test-runner.c
+@@ -113,7 +113,7 @@ test_case_new (void)
+ }
+ 
+ static gboolean
+-test_case_before_redraw (gpointer data)
++test_case_loop_quit (gpointer data)
+ {
+   TestCase *test = data;
+ 
+@@ -144,7 +144,7 @@ test_case_wait (TestCase *test,
+    * waiting until after *all* frame processing.
+    */
+   meta_later_add (META_LATER_BEFORE_REDRAW,
+-                  test_case_before_redraw,
++                  test_case_loop_quit,
+                   test,
+                   NULL);
+   g_main_loop_run (test->loop);
+@@ -157,6 +157,17 @@ test_case_wait (TestCase *test,
+   return TRUE;
+ }
+ 
++static gboolean
++test_case_sleep (TestCase  *test,
++                 guint32    interval,
++                 GError   **error)
++{
++  g_timeout_add_full (G_PRIORITY_LOW, interval, test_case_loop_quit, test, NULL);
++  g_main_loop_run (test->loop);
++
++  return TRUE;
++}
++
+ #define BAD_COMMAND(...)                                                \
+   G_STMT_START {                                                        \
+       g_set_error (error,                                               \
+@@ -519,6 +530,20 @@ test_case_do (TestCase *test,
+       if (!test_case_wait (test, error))
+         return FALSE;
+     }
++  else if (strcmp (argv[0], "sleep") == 0)
++    {
++      guint64 interval;
++
++      if (argc != 2)
++        BAD_COMMAND("usage: %s <milliseconds>", argv[0]);
++
++      if (!g_ascii_string_to_unsigned (argv[1], 10, 0, G_MAXUINT32,
++                                       &interval, error))
++        return FALSE;
++
++      if (!test_case_sleep (test, (guint32) interval, error))
++        return FALSE;
++    }
+   else if (strcmp (argv[0], "assert_stacking") == 0)
+     {
+       if (!test_case_assert_stacking (test, argv + 1, argc - 1, error))
diff --git a/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch b/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch
new file mode 100644
index 0000000..82dc33b
--- /dev/null
+++ b/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch
@@ -0,0 +1,78 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 03:43:57 +0100
+Subject: tests: Add 'accept_focus' command to runner and client
+
+Under the hood, calls gtk_window_set_accept_focus in the client
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit e1f839f48f8e49c826ba558fbc9d6842a156b28b)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/tests/test-client.c | 18 ++++++++++++++++++
+ src/tests/test-runner.c | 19 +++++++++++++++++++
+ 2 files changed, 37 insertions(+)
+
+diff --git a/src/tests/test-client.c b/src/tests/test-client.c
+index 5836083..1870fd2 100644
+--- a/src/tests/test-client.c
++++ b/src/tests/test-client.c
+@@ -161,6 +161,24 @@ process_line (const char *line)
+       gtk_window_set_transient_for (GTK_WINDOW (window),
+                                     GTK_WINDOW (parent_window));
+     }
++  else if (strcmp (argv[0], "accept_focus") == 0)
++    {
++      if (argc != 3)
++        {
++          g_print ("usage: %s <window-id> [true|false]", argv[0]);
++          goto out;
++        }
++
++      GtkWidget *window = lookup_window (argv[1]);
++      if (!window)
++        {
++          g_print ("unknown window %s", argv[1]);
++          goto out;
++        }
++
++      gboolean enabled = g_ascii_strcasecmp (argv[2], "true") == 0;
++      gtk_window_set_accept_focus (GTK_WINDOW (window), enabled);
++    }
+   else if (strcmp (argv[0], "show") == 0)
+     {
+       if (argc != 2)
+diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
+index 8867945..613c0bb 100644
+--- a/src/tests/test-runner.c
++++ b/src/tests/test-runner.c
+@@ -406,6 +406,25 @@ test_case_do (TestCase *test,
+                            NULL))
+         return FALSE;
+     }
++  else if (strcmp (argv[0], "accept_focus") == 0)
++    {
++      if (argc != 3 ||
++          (g_ascii_strcasecmp (argv[2], "true") != 0 &&
++           g_ascii_strcasecmp (argv[2], "false") != 0))
++        BAD_COMMAND("usage: %s <client-id>/<window-id> [true|false]",
++                    argv[0]);
++
++      TestClient *client;
++      const char *window_id;
++      if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error))
++        return FALSE;
++
++      if (!test_client_do (client, error,
++                           argv[0], window_id,
++                           argv[2],
++                           NULL))
++        return FALSE;
++    }
+   else if (strcmp (argv[0], "show") == 0 ||
+            strcmp (argv[0], "hide") == 0 ||
+            strcmp (argv[0], "activate") == 0 ||
diff --git a/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch b/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch
new file mode 100644
index 0000000..03357df
--- /dev/null
+++ b/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch
@@ -0,0 +1,116 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 04:04:22 +0100
+Subject: tests: Add 'can_take_focus' command to runner and client
+
+Allow to set/unset WM_TAKE_FOCUS from client window.
+This is added by default by gtk, but this might not happen in other toolkits,
+so add an ability to (un)set this.
+
+So fetch the protocols with XGetWMProtocols and unset the atom.
+
+test-client now needs to depend on Xlib directly in meson build.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit f2d2d473b71dbdb339c80f068c5cb3e529af2478)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/tests/test-client.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/tests/test-runner.c | 19 +++++++++++++++++++
+ 2 files changed, 69 insertions(+)
+
+diff --git a/src/tests/test-client.c b/src/tests/test-client.c
+index 1870fd2..aa763d5 100644
+--- a/src/tests/test-client.c
++++ b/src/tests/test-client.c
+@@ -179,6 +179,56 @@ process_line (const char *line)
+       gboolean enabled = g_ascii_strcasecmp (argv[2], "true") == 0;
+       gtk_window_set_accept_focus (GTK_WINDOW (window), enabled);
+     }
++  else if (strcmp (argv[0], "can_take_focus") == 0)
++    {
++      if (argc != 3)
++        {
++          g_print ("usage: %s <window-id> [true|false]", argv[0]);
++          goto out;
++        }
++
++      GtkWidget *window = lookup_window (argv[1]);
++      if (!window)
++        {
++          g_print ("unknown window %s", argv[1]);
++          goto out;
++        }
++
++      if (wayland)
++        {
++          g_print ("%s not supported under wayland", argv[0]);
++          goto out;
++        }
++
++      GdkDisplay *display = gdk_display_get_default ();
++      GdkWindow *gdkwindow = gtk_widget_get_window (window);
++      Display *xdisplay = gdk_x11_display_get_xdisplay (display);
++      Window xwindow = GDK_WINDOW_XID (gdkwindow);
++      Atom wm_take_focus = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS");
++      gboolean add = g_ascii_strcasecmp(argv[2], "true") == 0;
++      Atom *protocols = NULL;
++      Atom *new_protocols;
++      int n_protocols = 0;
++      int i, n = 0;
++
++      gdk_display_sync (display);
++      XGetWMProtocols (xdisplay, xwindow, &protocols, &n_protocols);
++      new_protocols = g_new0 (Atom, n_protocols + (add ? 1 : 0));
++
++      for (i = 0; i < n_protocols; ++i)
++        {
++          if (protocols[i] != wm_take_focus)
++            new_protocols[n++] = protocols[i];
++        }
++
++      if (add)
++        new_protocols[n++] = wm_take_focus;
++
++      XSetWMProtocols (xdisplay, xwindow, new_protocols, n);
++
++      XFree (new_protocols);
++      XFree (protocols);
++    }
+   else if (strcmp (argv[0], "show") == 0)
+     {
+       if (argc != 2)
+diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
+index 613c0bb..37befb4 100644
+--- a/src/tests/test-runner.c
++++ b/src/tests/test-runner.c
+@@ -425,6 +425,25 @@ test_case_do (TestCase *test,
+                            NULL))
+         return FALSE;
+     }
++  else if (strcmp (argv[0], "can_take_focus") == 0)
++    {
++      if (argc != 3 ||
++          (g_ascii_strcasecmp (argv[2], "true") != 0 &&
++           g_ascii_strcasecmp (argv[2], "false") != 0))
++        BAD_COMMAND("usage: %s <client-id>/<window-id> [true|false]",
++                    argv[0]);
++
++      TestClient *client;
++      const char *window_id;
++      if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error))
++        return FALSE;
++
++      if (!test_client_do (client, error,
++                           argv[0], window_id,
++                           argv[2],
++                           NULL))
++        return FALSE;
++    }
+   else if (strcmp (argv[0], "show") == 0 ||
+            strcmp (argv[0], "hide") == 0 ||
+            strcmp (argv[0], "activate") == 0 ||
diff --git a/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch b/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch
new file mode 100644
index 0000000..f65d295
--- /dev/null
+++ b/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch
@@ -0,0 +1,64 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 08:45:56 +0100
+Subject: tests: Verify focused window in closed-transient tests
+
+Ensure that we have a focused window when closing transient windows with
+no-focus or no-take-focus atoms
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit fcb408ad5d8d7fec3e6a7bdaa92e5ef06b55c2c6)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ .../closed-transient-no-input-no-take-focus-parent.metatest |  2 ++
+ ...closed-transient-no-input-no-take-focus-parents.metatest | 13 ++++++++++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
+index 4249c32..0c0649c 100644
+--- a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
++++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
+@@ -13,9 +13,11 @@ set_parent 1/3 2
+ show 1/3
+ 
+ wait
++assert_focused 1/3
+ assert_stacking 1/1 1/2 1/3
+ 
+ destroy 1/3
+ 
+ wait
++assert_focused 1/1
+ assert_stacking 1/1 1/2
+diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
+index a61c640..6556803 100644
+--- a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
++++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
+@@ -1,3 +1,8 @@
++new_client 2 x11
++create 2/1
++show 2/1
++wait
++
+ new_client 1 x11
+ create 1/1
+ accept_focus 1/1 false
+@@ -15,9 +20,11 @@ set_parent 1/3 2
+ show 1/3
+ 
+ wait
+-assert_stacking 1/1 1/2 1/3
++assert_focused 1/3
++assert_stacking 2/1 1/1 1/2 1/3
+ 
+ destroy 1/3
+-wait
+ 
+-assert_stacking 1/1 1/2
++wait
++assert_stacking 1/1 1/2 2/1
++assert_focused 2/1
diff --git a/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch b/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch
new file mode 100644
index 0000000..77cc7d3
--- /dev/null
+++ b/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch
@@ -0,0 +1,125 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 07:48:53 +0100
+Subject: tests, stacking: Add tests with no-input and no-take-focus windows
+
+When a window with no frame, that doesn't accept focus and that has no
+take-focus atom set is destroyed, we ended up in not changing the current_focus
+window, causing a crash.
+
+Added test cases that verify this situation.
+
+Related to https://gitlab.gnome.org/GNOME/mutter/issues/308
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit 2fc7760ceed6f948d4f3c1dd74d4e57c7df05eea)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/Makefile-tests.am                              |  3 +++
+ ...ransient-no-input-no-take-focus-parent.metatest | 21 ++++++++++++++++++++
+ ...ansient-no-input-no-take-focus-parents.metatest | 23 ++++++++++++++++++++++
+ .../closed-transient-no-input-parent.metatest      | 20 +++++++++++++++++++
+ 4 files changed, 67 insertions(+)
+ create mode 100644 src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
+ create mode 100644 src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
+ create mode 100644 src/tests/stacking/closed-transient-no-input-parent.metatest
+
+diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am
+index 4be832c..3764917 100644
+--- a/src/Makefile-tests.am
++++ b/src/Makefile-tests.am
+@@ -15,6 +15,9 @@ dist_stacking_DATA =				\
+ 	tests/stacking/basic-x11.metatest	\
+ 	tests/stacking/basic-wayland.metatest	\
+ 	tests/stacking/closed-transient.metatest	\
++	tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest	\
++	tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest	\
++	tests/stacking/closed-transient-no-input-parent.metatest	\
+ 	tests/stacking/minimized.metatest   	\
+ 	tests/stacking/mixed-windows.metatest   \
+ 	tests/stacking/set-parent.metatest	\
+diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
+new file mode 100644
+index 0000000..4249c32
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
+@@ -0,0 +1,21 @@
++new_client 1 x11
++create 1/1
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++can_take_focus 1/2 false
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++show 1/3
++
++wait
++assert_stacking 1/1 1/2 1/3
++
++destroy 1/3
++
++wait
++assert_stacking 1/1 1/2
+diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
+new file mode 100644
+index 0000000..a61c640
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
+@@ -0,0 +1,23 @@
++new_client 1 x11
++create 1/1
++accept_focus 1/1 false
++can_take_focus 1/1 false
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++can_take_focus 1/2 false
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++show 1/3
++
++wait
++assert_stacking 1/1 1/2 1/3
++
++destroy 1/3
++wait
++
++assert_stacking 1/1 1/2
+diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest
+new file mode 100644
+index 0000000..4cadb23
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-parent.metatest
+@@ -0,0 +1,20 @@
++new_client 1 x11
++create 1/1
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++show 1/3
++
++wait
++assert_stacking 1/1 1/2 1/3
++
++destroy 1/3
++
++wait
++assert_stacking 1/1 1/2
diff --git a/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch b/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch
new file mode 100644
index 0000000..0d9d7e1
--- /dev/null
+++ b/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 3 May 2019 20:10:47 +0200
+Subject: window: Emit an error and return when trying to activate an
+ unmanaged
+
+If something (i.e. gnome-shell or an extension) tries to activate an unmanaged
+window, we should warn about this and avoid to perform further actions as this
+could lead to a crash of mutter, since the window has not valid flags (like
+workspace) set anymore at this stage.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/580
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/564
+
+(cherry picked from commit a6fc656e917fd48b8708b8d9f4bf9f8b15581313)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/core/window.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/core/window.c b/src/core/window.c
+index eaae5b0..32c9461 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -3622,6 +3622,13 @@ meta_window_activate_full (MetaWindow     *window,
+                            MetaWorkspace  *workspace)
+ {
+   gboolean allow_workspace_switch;
++
++  if (window->unmanaging)
++    {
++      g_warning ("Trying to activate unmanaged window '%s'", window->desc);
++      return;
++    }
++
+   meta_topic (META_DEBUG_FOCUS,
+               "_NET_ACTIVE_WINDOW message sent for %s at time %u "
+               "by client type %u.\n",
diff --git a/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch b/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch
new file mode 100644
index 0000000..77c2843
--- /dev/null
+++ b/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch
@@ -0,0 +1,109 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 3 Jul 2019 11:15:36 +0200
+Subject: window-x11: Accept any focusable window as fallback focus
+
+As per commit f71151a5 we were ignoring WM_TAKE_FOCUS-only windows as focus
+targets, however this might end-up in an infinite loop if there are multiple
+non-input windows stacked.
+
+So, accept any focusable window as fallback focus target even if it's a
+take-focus one (that might not reply to the request).
+
+Added a stacking test to verify this.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/issues/660
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+
+(cherry picked from commit c327b2df95ff9979dd22bca2e0d285e1b3ba0add)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-Ubuntu: https://launchpad.net/bugs/1834583
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Applied-Upstream: 3.28.5
+---
+ src/Makefile-tests.am                              |  1 +
+ .../closed-transient-no-input-parents.metatest     | 46 ++++++++++++++++++++++
+ src/x11/window-x11.c                               |  2 +-
+ 3 files changed, 48 insertions(+), 1 deletion(-)
+ create mode 100644 src/tests/stacking/closed-transient-no-input-parents.metatest
+
+diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am
+index eca6a7b..21d0619 100644
+--- a/src/Makefile-tests.am
++++ b/src/Makefile-tests.am
+@@ -19,6 +19,7 @@ dist_stacking_DATA =				\
+ 	tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest	\
+ 	tests/stacking/closed-transient-no-input-parent.metatest	\
+ 	tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest	\
++	tests/stacking/closed-transient-no-input-parents.metatest	\
+ 	tests/stacking/minimized.metatest   	\
+ 	tests/stacking/mixed-windows.metatest   \
+ 	tests/stacking/set-parent.metatest	\
+diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest
+new file mode 100644
+index 0000000..e3ec2e8
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-parents.metatest
+@@ -0,0 +1,46 @@
++new_client 0 x11
++create 0/1
++show 0/1
++
++new_client 1 x11
++create 1/1
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++accept_focus 1/3 false
++show 1/3
++
++create 1/4 csd
++set_parent 1/4 3
++accept_focus 1/4 false
++show 1/4
++
++create 1/5 csd
++set_parent 1/5 3
++show 1/5
++
++wait
++assert_focused 1/5
++assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5
++
++destroy 1/5
++dispatch
++
++assert_focused none
++assert_stacking 0/1 1/1 1/2 1/3 1/4
++
++sleep 250
++assert_focused none
++assert_stacking 0/1 1/1 1/2 1/3 1/4
++
++destroy 1/3
++wait
++
++assert_focused none
++assert_stacking 0/1 1/1 1/2 1/4
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index c09ba3e..7dff35e 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -852,7 +852,7 @@ meta_window_x11_focus (MetaWindow *window,
+                       if (!focus_window)
+                         break;
+ 
+-                      if (focus_window->input)
++                      if (focus_window->input || focus_window->take_focus)
+                         break;
+ 
+                       if (focus_window->shaded && focus_window->frame)
diff --git a/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch b/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch
new file mode 100644
index 0000000..8127f55
--- /dev/null
+++ b/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch
@@ -0,0 +1,39 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Mon, 1 Jul 2019 10:38:02 +0200
+Subject: window-x11: Don't double-check for unmanaging windows
+
+When looking for the best fallback focus window, we ignore it if it is in the
+unmanaging state, but meta_stack_get_default_focus_window() does this is check
+for us already.
+
+So, ignore the redundant test.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+
+(cherry picked from commit 9aee47daa984e5cc4a1ccefb3aacfbb2729cfbc1)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-Ubuntu: https://launchpad.net/bugs/1834583
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Applied-Upstream: 3.28.5
+---
+ src/x11/window-x11.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 29ea3a6..c09ba3e 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -852,9 +852,6 @@ meta_window_x11_focus (MetaWindow *window,
+                       if (!focus_window)
+                         break;
+ 
+-                      if (focus_window->unmanaging)
+-                        continue;
+-
+                       if (focus_window->input)
+                         break;
+ 
diff --git a/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch b/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch
new file mode 100644
index 0000000..9e9af63
--- /dev/null
+++ b/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch
@@ -0,0 +1,247 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 14 Nov 2018 00:08:34 +0100
+Subject: window-x11: Focus the default window with delay while waiting for
+ take-focus
+
+When requesting to a take-focus window to acquire the input, the client may or
+may not respond with a SetInputFocus (this doesn't happen for no-input gtk
+windows in fact [to be fixed there too]), in such case we were unsetting the
+focus while waiting the reply.
+
+In case the client won't respond, we wait for a small delay (set to 250 ms) for
+the take-focus window to grab the input focus before setting it to the default
+window.
+
+Added a test for this behavior and for the case in which a window takes the
+focus meanwhile we're waiting to focus the default window.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+(cherry picked from commit f71151a5dd990d935f3fbb39451f9b41f640b625)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/Makefile-tests.am                              |   1 +
+ ...parent-delayed-focus-default-cancelled.metatest |  36 ++++++++
+ .../closed-transient-no-input-parent.metatest      |  16 +++-
+ src/x11/window-x11.c                               | 101 ++++++++++++++++++++-
+ 4 files changed, 146 insertions(+), 8 deletions(-)
+ create mode 100644 src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest
+
+diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am
+index 3764917..eca6a7b 100644
+--- a/src/Makefile-tests.am
++++ b/src/Makefile-tests.am
+@@ -18,6 +18,7 @@ dist_stacking_DATA =				\
+ 	tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest	\
+ 	tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest	\
+ 	tests/stacking/closed-transient-no-input-parent.metatest	\
++	tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest	\
+ 	tests/stacking/minimized.metatest   	\
+ 	tests/stacking/mixed-windows.metatest   \
+ 	tests/stacking/set-parent.metatest	\
+diff --git a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest
+new file mode 100644
+index 0000000..38897e3
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest
+@@ -0,0 +1,36 @@
++new_client 2 x11
++create 2/1
++show 2/1
++
++new_client 1 x11
++create 1/1
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++show 1/3
++
++wait
++assert_focused 1/3
++assert_stacking 2/1 1/1 1/2 1/3
++
++destroy 1/3
++sleep 10
++
++assert_focused none
++assert_stacking 2/1 1/1 1/2
++
++activate 2/1
++wait
++
++assert_focused 2/1
++assert_stacking 1/1 1/2 2/1
++
++sleep 250
++assert_focused 2/1
++assert_stacking 1/1 1/2 2/1
+diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest
+index 4cadb23..e0f1dc1 100644
+--- a/src/tests/stacking/closed-transient-no-input-parent.metatest
++++ b/src/tests/stacking/closed-transient-no-input-parent.metatest
+@@ -1,3 +1,7 @@
++new_client 2 x11
++create 2/1
++show 2/1
++
+ new_client 1 x11
+ create 1/1
+ show 1/1
+@@ -12,9 +16,15 @@ set_parent 1/3 2
+ show 1/3
+ 
+ wait
+-assert_stacking 1/1 1/2 1/3
++assert_focused 1/3
++assert_stacking 2/1 1/1 1/2 1/3
+ 
+ destroy 1/3
++dispatch
+ 
+-wait
+-assert_stacking 1/1 1/2
++assert_focused none
++assert_stacking 2/1 1/1 1/2
++
++sleep 250
++assert_focused 1/1
++assert_stacking 2/1 1/1 1/2
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index e1c3441..29ea3a6 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -53,6 +53,8 @@
+ #include "backends/meta-logical-monitor.h"
+ #include "backends/x11/meta-backend-x11.h"
+ 
++#define TAKE_FOCUS_FALLBACK_DELAY_MS 250
++
+ G_DEFINE_TYPE_WITH_PRIVATE (MetaWindowX11, meta_window_x11, META_TYPE_WINDOW)
+ 
+ static void
+@@ -722,6 +724,66 @@ request_take_focus (MetaWindow *window,
+   send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp);
+ }
+ 
++typedef struct
++{
++  MetaWindow *window;
++  guint32 timestamp;
++  guint timeout_id;
++  gulong unmanaged_id;
++  gulong focused_changed_id;
++} MetaWindowX11DelayedFocusData;
++
++static void
++meta_window_x11_delayed_focus_data_free (MetaWindowX11DelayedFocusData *data)
++{
++  g_signal_handler_disconnect (data->window, data->unmanaged_id);
++  g_signal_handler_disconnect (data->window->display, data->focused_changed_id);
++
++  if (data->timeout_id)
++    g_source_remove (data->timeout_id);
++
++  g_free (data);
++}
++
++static gboolean
++focus_window_delayed_timeout (gpointer user_data)
++{
++  MetaWindowX11DelayedFocusData *data = user_data;
++  MetaWindow *window = data->window;
++  guint32 timestamp = data->timestamp;
++
++  data->timeout_id = 0;
++  meta_window_x11_delayed_focus_data_free (data);
++
++  meta_window_focus (window, timestamp);
++
++  return G_SOURCE_REMOVE;
++}
++
++static void
++meta_window_x11_maybe_focus_delayed (MetaWindow *window,
++                                     guint32     timestamp)
++{
++  MetaWindowX11DelayedFocusData *data;
++
++  data = g_new0 (MetaWindowX11DelayedFocusData, 1);
++  data->window = window;
++  data->timestamp = timestamp;
++
++  data->unmanaged_id =
++    g_signal_connect_swapped (window, "unmanaged",
++                              G_CALLBACK (meta_window_x11_delayed_focus_data_free),
++                              data);
++
++  data->focused_changed_id =
++    g_signal_connect_swapped (window->display, "notify::focus-window",
++                              G_CALLBACK (meta_window_x11_delayed_focus_data_free),
++                              data);
++
++  data->timeout_id = g_timeout_add (TAKE_FOCUS_FALLBACK_DELAY_MS,
++                                    focus_window_delayed_timeout, data);
++}
++
+ static void
+ meta_window_x11_focus (MetaWindow *window,
+                        guint32     timestamp)
+@@ -771,14 +833,43 @@ meta_window_x11_focus (MetaWindow *window,
+                * Normally, we want to just leave the focus undisturbed until
+                * the window responds to WM_TAKE_FOCUS, but if we're unmanaging
+                * the current focus window we *need* to move the focus away, so
+-               * we focus the no_focus_window now (and set
+-               * display->focus_window to that) before sending WM_TAKE_FOCUS.
++               * we focus the no focus window before sending WM_TAKE_FOCUS,
++               * and eventually the default focus windwo excluding this one,
++               * if meanwhile we don't get any focus request.
+                */
+               if (window->display->focus_window != NULL &&
+                   window->display->focus_window->unmanaging)
+-                meta_display_focus_the_no_focus_window (window->display,
+-                                                        window->screen,
+-                                                        timestamp);
++                {
++                  MetaWindow *focus_window = window;
++                  MetaWorkspace *workspace = window->workspace;
++                  MetaStack *stack = window->screen->stack;
++
++                  while (TRUE)
++                    {
++                      focus_window = meta_stack_get_default_focus_window (stack,
++                                                                          workspace,
++                                                                          focus_window);
++                      if (!focus_window)
++                        break;
++
++                      if (focus_window->unmanaging)
++                        continue;
++
++                      if (focus_window->input)
++                        break;
++
++                      if (focus_window->shaded && focus_window->frame)
++                        break;
++                    }
++
++                  meta_display_focus_the_no_focus_window (window->display,
++                                                          window->screen,
++                                                          timestamp);
++
++                  if (focus_window)
++                    meta_window_x11_maybe_focus_delayed (focus_window,
++                                                         timestamp);
++                }
+             }
+ 
+           request_take_focus (window, timestamp);
diff --git a/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch b/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch
new file mode 100644
index 0000000..a29f61e
--- /dev/null
+++ b/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch
@@ -0,0 +1,339 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 3 Jul 2019 12:04:08 +0200
+Subject: window-x11: Use any focusable window as fallback delayed focus
+ window
+
+As per commit f71151a5 we focus an input window if no take-focus-window accepts
+it. This might lead to an infinite loop if there are various focusable but
+non-input windows in the stack.
+
+When the current focus window is unmanaging and we're trying to focus a
+WM_TAKE_FOCUS window, we intent to give the focus to the first focusable input
+window in the stack.
+
+However, if an application (such as the Java ones) only uses non-input
+WM_TAKE_FOCUS windows, are not requesting these ones to get the focus. This
+might lead to a state where no window is focused, or a wrong one is.
+
+So, instead of only focus the first eventually input window available, try to
+request to all the take-focus windows that are in the stack between the
+destroyed one and the first input one to acquire the input focus.
+Use a queue to keep track of those windows, that is passed around stealing
+ownership, while we protect for unmanaged queued windows.
+
+Also, reduce the default timeout value, as the previous one might lead to an
+excessive long wait.
+
+Added metatests verifying these situations.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/issues/660
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+
+(cherry picked from commit 6d8293a422b08af97d3da985d49448db32d59248)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-Ubuntu: https://launchpad.net/bugs/1834583
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Applied-Upstream: 3.28.5
+---
+ src/Makefile-tests.am                              |   1 +
+ .../closed-transient-no-input-parent.metatest      |   2 +-
+ ...parents-queued-default-focus-destroyed.metatest |  43 ++++++++
+ .../closed-transient-no-input-parents.metatest     |   6 +-
+ src/x11/window-x11.c                               | 120 ++++++++++++++++-----
+ 5 files changed, 144 insertions(+), 28 deletions(-)
+ create mode 100644 src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest
+
+diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am
+index 21d0619..359f398 100644
+--- a/src/Makefile-tests.am
++++ b/src/Makefile-tests.am
+@@ -20,6 +20,7 @@ dist_stacking_DATA =				\
+ 	tests/stacking/closed-transient-no-input-parent.metatest	\
+ 	tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest	\
+ 	tests/stacking/closed-transient-no-input-parents.metatest	\
++	tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest	\
+ 	tests/stacking/minimized.metatest   	\
+ 	tests/stacking/mixed-windows.metatest   \
+ 	tests/stacking/set-parent.metatest	\
+diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest
+index e0f1dc1..d0f3228 100644
+--- a/src/tests/stacking/closed-transient-no-input-parent.metatest
++++ b/src/tests/stacking/closed-transient-no-input-parent.metatest
+@@ -25,6 +25,6 @@ dispatch
+ assert_focused none
+ assert_stacking 2/1 1/1 1/2
+ 
+-sleep 250
++sleep 150
+ assert_focused 1/1
+ assert_stacking 2/1 1/1 1/2
+diff --git a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest
+new file mode 100644
+index 0000000..49ecc51
+--- /dev/null
++++ b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest
+@@ -0,0 +1,43 @@
++new_client 0 x11
++create 0/1
++show 0/1
++
++new_client 1 x11
++create 1/1
++show 1/1
++
++create 1/2 csd
++set_parent 1/2 1
++accept_focus 1/2 false
++show 1/2
++
++create 1/3 csd
++set_parent 1/3 2
++accept_focus 1/3 false
++show 1/3
++
++create 1/4 csd
++set_parent 1/4 3
++accept_focus 1/4 false
++show 1/4
++
++create 1/5 csd
++set_parent 1/5 3
++show 1/5
++
++wait
++assert_focused 1/5
++assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5
++
++destroy 1/5
++dispatch
++
++assert_focused none
++assert_stacking 0/1 1/1 1/2 1/3 1/4
++
++destroy 1/2
++dispatch
++
++sleep 450
++assert_focused 1/1
++assert_stacking 0/1 1/1 1/3 1/4
+diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest
+index e3ec2e8..ee99841 100644
+--- a/src/tests/stacking/closed-transient-no-input-parents.metatest
++++ b/src/tests/stacking/closed-transient-no-input-parents.metatest
+@@ -35,12 +35,12 @@ dispatch
+ assert_focused none
+ assert_stacking 0/1 1/1 1/2 1/3 1/4
+ 
+-sleep 250
+-assert_focused none
++sleep 600
++assert_focused 1/1
+ assert_stacking 0/1 1/1 1/2 1/3 1/4
+ 
+ destroy 1/3
+ wait
+ 
+-assert_focused none
++assert_focused 1/1
+ assert_stacking 0/1 1/1 1/2 1/4
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 7dff35e..60b121f 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -53,10 +53,15 @@
+ #include "backends/meta-logical-monitor.h"
+ #include "backends/x11/meta-backend-x11.h"
+ 
+-#define TAKE_FOCUS_FALLBACK_DELAY_MS 250
++#define TAKE_FOCUS_FALLBACK_DELAY_MS 150
+ 
+ G_DEFINE_TYPE_WITH_PRIVATE (MetaWindowX11, meta_window_x11, META_TYPE_WINDOW)
+ 
++static void
++meta_window_x11_maybe_focus_delayed (MetaWindow *window,
++                                     GQueue     *other_focus_candidates,
++                                     guint32     timestamp);
++
+ static void
+ meta_window_x11_init (MetaWindowX11 *window_x11)
+ {
+@@ -727,24 +732,60 @@ request_take_focus (MetaWindow *window,
+ typedef struct
+ {
+   MetaWindow *window;
++  GQueue *pending_focus_candidates;
+   guint32 timestamp;
+   guint timeout_id;
+   gulong unmanaged_id;
+   gulong focused_changed_id;
+ } MetaWindowX11DelayedFocusData;
+ 
++static void
++disconnect_pending_focus_window_signals (MetaWindow *window,
++                                         GQueue     *focus_candidates)
++{
++  g_signal_handlers_disconnect_by_func (window, g_queue_remove,
++                                        focus_candidates);
++}
++
+ static void
+ meta_window_x11_delayed_focus_data_free (MetaWindowX11DelayedFocusData *data)
+ {
+   g_signal_handler_disconnect (data->window, data->unmanaged_id);
+   g_signal_handler_disconnect (data->window->display, data->focused_changed_id);
+ 
++  if (data->pending_focus_candidates)
++    {
++      g_queue_foreach (data->pending_focus_candidates,
++                       (GFunc) disconnect_pending_focus_window_signals,
++                       data->pending_focus_candidates);
++      g_queue_free (data->pending_focus_candidates);
++    }
++
+   if (data->timeout_id)
+     g_source_remove (data->timeout_id);
+ 
+   g_free (data);
+ }
+ 
++static void
++focus_candidates_maybe_take_and_focus_next (GQueue  **focus_candidates_ptr,
++                                            guint32   timestamp)
++{
++  MetaWindow *focus_window;
++  GQueue *focus_candidates;
++
++  g_assert (*focus_candidates_ptr);
++
++  if (g_queue_is_empty (*focus_candidates_ptr))
++    return;
++
++  focus_candidates = g_steal_pointer (focus_candidates_ptr);
++  focus_window = g_queue_pop_head (focus_candidates);
++
++  disconnect_pending_focus_window_signals (focus_window, focus_candidates);
++  meta_window_x11_maybe_focus_delayed (focus_window, focus_candidates, timestamp);
++}
++
+ static gboolean
+ focus_window_delayed_timeout (gpointer user_data)
+ {
+@@ -752,6 +793,9 @@ focus_window_delayed_timeout (gpointer user_data)
+   MetaWindow *window = data->window;
+   guint32 timestamp = data->timestamp;
+ 
++  focus_candidates_maybe_take_and_focus_next (&data->pending_focus_candidates,
++                                              timestamp);
++
+   data->timeout_id = 0;
+   meta_window_x11_delayed_focus_data_free (data);
+ 
+@@ -762,6 +806,7 @@ focus_window_delayed_timeout (gpointer user_data)
+ 
+ static void
+ meta_window_x11_maybe_focus_delayed (MetaWindow *window,
++                                     GQueue     *other_focus_candidates,
+                                      guint32     timestamp)
+ {
+   MetaWindowX11DelayedFocusData *data;
+@@ -769,6 +814,10 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window,
+   data = g_new0 (MetaWindowX11DelayedFocusData, 1);
+   data->window = window;
+   data->timestamp = timestamp;
++  data->pending_focus_candidates = other_focus_candidates;
++
++  meta_topic (META_DEBUG_FOCUS,
++              "Requesting delayed focus to %s\n", window->desc);
+ 
+   data->unmanaged_id =
+     g_signal_connect_swapped (window, "unmanaged",
+@@ -784,6 +833,50 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window,
+                                     focus_window_delayed_timeout, data);
+ }
+ 
++static void
++maybe_focus_default_window (MetaWorkspace *workspace,
++                            MetaWindow    *not_this_one,
++                            guint32        timestamp)
++{
++  MetaStack *stack = workspace->screen->stack;
++  g_autoptr (GList) focusable_windows = NULL;
++  g_autoptr (GQueue) focus_candidates = NULL;
++  GList *l;
++
++   /* Go through all the focusable windows and try to focus them
++    * in order, waiting for a delay. The first one that replies to
++    * the request (in case of take focus windows) changing the display
++    * focused window, will stop the chained requests.
++    */
++  focusable_windows =
++    meta_stack_get_default_focus_candidates (stack, workspace);
++  focus_candidates = g_queue_new ();
++
++  for (l = g_list_last (focusable_windows); l; l = l->prev)
++    {
++      MetaWindow *focus_window = l->data;
++
++      if (focus_window == not_this_one)
++        continue;
++
++      g_queue_push_tail (focus_candidates, focus_window);
++      g_signal_connect_swapped (focus_window, "unmanaged",
++                                G_CALLBACK (g_queue_remove),
++                                focus_candidates);
++
++      if (!META_IS_WINDOW_X11 (focus_window))
++        break;
++
++      if (focus_window->input)
++        break;
++
++      if (focus_window->shaded && focus_window->frame)
++        break;
++    }
++
++  focus_candidates_maybe_take_and_focus_next (&focus_candidates, timestamp);
++}
++
+ static void
+ meta_window_x11_focus (MetaWindow *window,
+                        guint32     timestamp)
+@@ -840,32 +933,11 @@ meta_window_x11_focus (MetaWindow *window,
+               if (window->display->focus_window != NULL &&
+                   window->display->focus_window->unmanaging)
+                 {
+-                  MetaWindow *focus_window = window;
+-                  MetaWorkspace *workspace = window->workspace;
+-                  MetaStack *stack = window->screen->stack;
+-
+-                  while (TRUE)
+-                    {
+-                      focus_window = meta_stack_get_default_focus_window (stack,
+-                                                                          workspace,
+-                                                                          focus_window);
+-                      if (!focus_window)
+-                        break;
+-
+-                      if (focus_window->input || focus_window->take_focus)
+-                        break;
+-
+-                      if (focus_window->shaded && focus_window->frame)
+-                        break;
+-                    }
+-
+                   meta_display_focus_the_no_focus_window (window->display,
+                                                           window->screen,
+                                                           timestamp);
+-
+-                  if (focus_window)
+-                    meta_window_x11_maybe_focus_delayed (focus_window,
+-                                                         timestamp);
++                  maybe_focus_default_window (window->workspace, window,
++                                              timestamp);
+                 }
+             }
+ 
diff --git a/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch b/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch
new file mode 100644
index 0000000..53d4ff0
--- /dev/null
+++ b/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch
@@ -0,0 +1,85 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 13 Nov 2018 08:31:52 +0100
+Subject: workspace: Focus only ancestors that are focusable
+
+When destroying a window that has a parent, we initially try to focus one of
+its ancestors. However if no ancestor can be focused, then we should instead
+focus the default focus window instead of trying to request focus for a window
+that can't get focus anyways.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/308
+(cherry picked from commit eccc791f3b3451216f957e67fec47a73b65ed2b2)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307
+Bug-Ubuntu: https://launchpad.net/bugs/1791574
+Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308
+Applied-Upstream: 3.28.5
+---
+ src/core/workspace.c | 37 +++++++++++++++++++++++++++----------
+ 1 file changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/workspace.c b/src/core/workspace.c
+index a964e66..d194943 100644
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -85,6 +85,12 @@ typedef struct _MetaWorkspaceLogicalMonitorData
+   MetaRectangle logical_monitor_work_area;
+ } MetaWorkspaceLogicalMonitorData;
+ 
++typedef struct _MetaWorkspaceFocusableAncestorData
++{
++  MetaWorkspace *workspace;
++  MetaWindow *out_window;
++} MetaWorkspaceFocusableAncestorData;
++
+ static MetaWorkspaceLogicalMonitorData *
+ meta_workspace_get_logical_monitor_data (MetaWorkspace      *workspace,
+                                          MetaLogicalMonitor *logical_monitor)
+@@ -1319,13 +1325,20 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
+ }
+ 
+ static gboolean
+-record_ancestor (MetaWindow *window,
+-                 void       *data)
++find_focusable_ancestor (MetaWindow *window,
++                         gpointer    user_data)
+ {
+-  MetaWindow **result = data;
++  MetaWorkspaceFocusableAncestorData *data = user_data;
++
++  if (!window->unmanaging && (window->input || window->take_focus) &&
++      meta_window_located_on_workspace (window, data->workspace) &&
++      meta_window_showing_on_its_workspace (window))
++    {
++      data->out_window = window;
++      return FALSE;
++    }
+ 
+-  *result = window;
+-  return FALSE; /* quit with the first ancestor we find */
++  return TRUE;
+ }
+ 
+ /* Focus ancestor of not_this_one if there is one */
+@@ -1347,11 +1360,15 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
+   if (not_this_one)
+     {
+       MetaWindow *ancestor;
+-      ancestor = NULL;
+-      meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
+-      if (ancestor != NULL &&
+-          meta_window_located_on_workspace (ancestor, workspace) &&
+-          meta_window_showing_on_its_workspace (ancestor))
++      MetaWorkspaceFocusableAncestorData data;
++
++      data = (MetaWorkspaceFocusableAncestorData) {
++        .workspace = workspace,
++      };
++      meta_window_foreach_ancestor (not_this_one, find_focusable_ancestor, &data);
++      ancestor = data.out_window;
++
++      if (ancestor)
+         {
+           meta_topic (META_DEBUG_FOCUS,
+                       "Focusing %s, ancestor of %s\n",