[PATCH 09/10] ui/gtk: don't pass on win keys without keyboard grab

From: "Volker Rümelin" <vr_qemu@t-online.de>
To: "Gerd Hoffmann" <kraxel@redhat.com>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Cc: QEMU <qemu-devel@nongnu.org>
Subject: [PATCH 09/10] ui/gtk: don't pass on win keys without keyboard grab
Date: Sun, 10 May 2020 20:43:03 +0200	[thread overview]
Message-ID: <20200510184304.9267-9-vr_qemu@t-online.de> (raw)
In-Reply-To: <2393388c-86c3-4d7e-178e-2c7e6d14a8de@t-online.de>

This patch applies commit c68f74b02e "win32: do not handle win
keys when the keyboard is not grabbed" from project spice-gtk
to ui/gtk.c.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 ui/gtk.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 5a25e3fa4c..a43fddc57f 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1085,10 +1085,17 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
     VirtualConsole *vc = opaque;
     int qcode;
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
     /* on windows, we ought to ignore the reserved key event? */
     if (key->hardware_keycode == 0xff)
         return false;
+
+    if (!vc->s->kbd_owner) {
+        if (key->hardware_keycode == VK_LWIN ||
+            key->hardware_keycode == VK_RWIN) {
+            return FALSE;
+        }
+    }
 #endif
 
     if (key->keyval == GDK_KEY_Pause
-- 
2.26.1


