[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] ui/gtk: use native keyboard scancodes on Windows
From: |
Gerd Hoffmann |
Subject: |
[PULL 10/11] ui/gtk: use native keyboard scancodes on Windows |
Date: |
Wed, 20 May 2020 10:43:15 +0200 |
From: Volker Rümelin <address@hidden>
Since GTK 3.22 the function gdk_event_get_scancode() is
available. On Windows this function returns keyboard scancodes
and some extended flags. These raw keyboard scancodes are much
better suited for this use case than the half-cooked win32
virtual-key codes because scancodes report the key position on
the keyboard and the positions are independent of national
language settings.
Signed-off-by: Volker Rümelin <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 1d51e14bb58d..68a5b901c72d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1026,8 +1026,13 @@ static const guint16 *gd_get_keymap(size_t *maplen)
#ifdef GDK_WINDOWING_WIN32
if (GDK_IS_WIN32_DISPLAY(dpy)) {
trace_gd_keymap_windowing("win32");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ *maplen = qemu_input_map_atset1_to_qcode_len;
+ return qemu_input_map_atset1_to_qcode;
+#else
*maplen = qemu_input_map_win32_to_qcode_len;
return qemu_input_map_win32_to_qcode;
+#endif
}
#endif
@@ -1073,6 +1078,25 @@ static int gd_map_keycode(int scancode)
return keycode_map[scancode];
}
+static int gd_get_keycode(GdkEventKey *key)
+{
+#if defined G_OS_WIN32 && GTK_CHECK_VERSION(3, 22, 0)
+ int scancode = gdk_event_get_scancode((GdkEvent *)key);
+
+ /* translate Windows native scancodes to atset1 keycodes */
+ switch (scancode & (KF_EXTENDED | 0xff)) {
+ case 0x145: /* NUMLOCK */
+ return scancode & 0xff;
+ }
+
+ return scancode & KF_EXTENDED ?
+ 0xe000 | (scancode & 0xff) : scancode & 0xff;
+
+#else
+ return key->hardware_keycode;
+#endif
+}
+
static gboolean gd_text_key_down(GtkWidget *widget,
GdkEventKey *key, void *opaque)
{
@@ -1084,7 +1108,7 @@ static gboolean gd_text_key_down(GtkWidget *widget,
} else if (key->length) {
kbd_put_string_console(con, key->string, key->length);
} else {
- int qcode = gd_map_keycode(key->hardware_keycode);
+ int qcode = gd_map_keycode(gd_get_keycode(key));
kbd_put_qcode_console(con, qcode, false);
}
return TRUE;
@@ -1093,7 +1117,7 @@ static gboolean gd_text_key_down(GtkWidget *widget,
static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
{
VirtualConsole *vc = opaque;
- int qcode;
+ int keycode, qcode;
#ifdef G_OS_WIN32
/* on windows, we ought to ignore the reserved key event? */
@@ -1121,9 +1145,10 @@ static gboolean gd_key_event(GtkWidget *widget,
GdkEventKey *key, void *opaque)
return TRUE;
}
- qcode = gd_map_keycode(key->hardware_keycode);
+ keycode = gd_get_keycode(key);
+ qcode = gd_map_keycode(keycode);
- trace_gd_key_event(vc->label, key->hardware_keycode, qcode,
+ trace_gd_key_event(vc->label, keycode, qcode,
(key->type == GDK_KEY_PRESS) ? "down" : "up");
qkbd_state_key_event(vc->gfx.kbd, qcode,
--
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 <=
- [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, 2020/05/20
- [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