From: Volker Rümelin <vr_qemu@t-online.de>
Date: Sat, 16 May 2020 07:20:12 +0000 (+0200)
Subject: ui/gtk: don't pass on win keys without keyboard grab
X-Git-Tag: qemu-xen-4.15.0~182^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d3953bf7978521b6373cb8101f594cc44b0efa9e;p=qemu-xen.git

ui/gtk: don't pass on win keys without keyboard grab

Without keyboard grab Windows currently handles the two win keys
and the key events are also sent to the guest. This is undesir-
able. Only one program should handle key events. This patch ap-
plies commit c68f74b02e "win32: do not handle win keys when the
keyboard is not grabbed" from project spice-gtk to ui/gtk.c to
fix this problem.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200516072014.7766-9-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/gtk.c b/ui/gtk.c
index 354dd90e18..1d51e14bb5 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1095,10 +1095,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