[mutter/wip/rstrode/rhel-8.0.0: 18/117] window: Don't refuse to move focus to the grab window

[Ray Strode <halfline src gnome org>]

commit c19274706d852724d1e4327aba8b03a42cc567d1
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri May 25 18:18:23 2018 +0000

    window: Don't refuse to move focus to the grab window
    
    We refuse to move focus while a grab operation is in place. While this
    generally makes sense, there's no reason why the window that owns the
    grab shouldn't be given the regular input focus as well - we pretty
    much assume that the grab window is also the focus window anyway.
    
    In fact there's a strong reason for allowing the focus change here:
    If the grab window isn't the focus window, it probably has a modal
    transient that is focused instead, and a likely reason for the focus
    request is that the transient is being unmanaged and we must move
    the focus elsewhere.
    
    https://gitlab.gnome.org/GNOME/mutter/issues/15
    
    (cherry picked from commit 148da24f9510ebd23d750b8224aa0ab3a549e69e)

 src/core/window.c | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/src/core/window.c b/src/core/window.c
index 07f826bb5..d17f8838b 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4628,6 +4628,7 @@ meta_window_focus (MetaWindow  *window,
               window->desc, window->input, window->take_focus);
 
   if (window->display->grab_window &&
+      window->display->grab_window != window &&
       window->display->grab_window->all_keys_grabbed &&
       !window->display->grab_window->unmanaging)
     {