From 29ea5306ebdc4da198397d63d16ee9a1f0ae724a Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu, 22 Aug 2019 16:14:21 +0300
Subject: [PATCH] keybindings: Restore inhibit shortcut for overlay key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After the introduction of locate-pointer (commit 851b7d063 -
 “keybindings: Trigger locate-pointer on key modifier”), inhibiting
shortcuts would no longer forward the overlay key to the client.

Restore the code that was inadvertently removed so that inhibiting
shortcuts works on the overlay key again.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/734
---
 src/core/keybindings.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index d2599adf4..8e9016484 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2130,6 +2130,15 @@ process_overlay_key (MetaDisplay     *display,
 {
   MetaKeyBindingManager *keys = &display->key_binding_manager;
 
+  if (display->focus_window && !keys->overlay_key_only_pressed)
+    {
+      ClutterInputDevice *source;
+
+      source = clutter_event_get_source_device ((ClutterEvent *) event);
+      if (meta_window_shortcuts_inhibited (display->focus_window, source))
+        return FALSE;
+    }
+
   return process_special_modifier_key (display,
                                        event,
                                        window,