[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] ui/gtk: don't pass on win keys without keyboard grab
From: |
Gerd Hoffmann |
Subject: |
[PULL 09/11] ui/gtk: don't pass on win keys without keyboard grab |
Date: |
Wed, 20 May 2020 10:43:14 +0200 |
From: Volker Rümelin <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 354dd90e1898..1d51e14bb58d 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
--
2.18.4
- [PULL 00/11] Ui 20200520 patches, Gerd Hoffmann, 2020/05/20
- [PULL 04/11] ui/gtk: remove unused code, Gerd Hoffmann, 2020/05/20
- [PULL 02/11] ui/gtk: fix handling of AltGr key on Windows, Gerd Hoffmann, 2020/05/20
- [PULL 10/11] ui/gtk: use native keyboard scancodes on Windows, Gerd Hoffmann, 2020/05/20
- [PULL 06/11] ui/sdl2: fix handling of AltGr key on Windows, Gerd Hoffmann, 2020/05/20
- [PULL 11/11] ui: increase min required GTK version to 3.22.0, Gerd Hoffmann, 2020/05/20
- [PULL 07/11] ui/sdl2: start in full screen with grab enabled, Gerd Hoffmann, 2020/05/20
- [PULL 08/11] ui/sdl2-input: use trace-events to debug key events, Gerd Hoffmann, 2020/05/20
- [PULL 03/11] ui/gkt: release all keys on grab-broken-event, Gerd Hoffmann, 2020/05/20
- [PULL 05/11] ui/gtk: remove unused variable ignore_keys, Gerd Hoffmann, 2020/05/20
- [PULL 09/11] ui/gtk: don't pass on win keys without keyboard grab,
Gerd Hoffmann <=
- [PULL 01/11] ui/win32-kbd-hook: handle AltGr in a hook procedure, Gerd Hoffmann, 2020/05/20
- Re: [PULL 00/11] Ui 20200520 patches, Peter Maydell, 2020/05/21