[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/11] ui/sdl2: fix handling of AltGr key on Windows
From: |
Gerd Hoffmann |
Subject: |
[PULL 06/11] ui/sdl2: fix handling of AltGr key on Windows |
Date: |
Wed, 20 May 2020 10:43:11 +0200 |
From: Volker Rümelin <address@hidden>
Wire up the keyboard hooking code on Windows to fix the AltGr
key and improve keyboard grabbing.
Signed-off-by: Volker Rümelin <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl2.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 61c7956da334..79c1ea29d223 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -30,6 +30,7 @@
#include "ui/sdl2.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
+#include "ui/win32-kbd-hook.h"
static int sdl2_num_outputs;
static struct sdl2_console *sdl2_console;
@@ -220,6 +221,7 @@ static void sdl_grab_start(struct sdl2_console *scon)
}
SDL_SetWindowGrab(scon->real_window, SDL_TRUE);
gui_grab = 1;
+ win32_kbd_set_grab(true);
sdl_update_caption(scon);
}
@@ -227,6 +229,7 @@ static void sdl_grab_end(struct sdl2_console *scon)
{
SDL_SetWindowGrab(scon->real_window, SDL_FALSE);
gui_grab = 0;
+ win32_kbd_set_grab(false);
sdl_show_cursor(scon);
sdl_update_caption(scon);
}
@@ -325,6 +328,19 @@ static int get_mod_state(void)
}
}
+static void *sdl2_win32_get_hwnd(struct sdl2_console *scon)
+{
+#ifdef CONFIG_WIN32
+ SDL_SysWMinfo info;
+
+ SDL_VERSION(&info.version);
+ if (SDL_GetWindowWMInfo(scon->real_window, &info)) {
+ return info.info.win.window;
+ }
+#endif
+ return NULL;
+}
+
static void handle_keydown(SDL_Event *ev)
{
int win;
@@ -544,6 +560,11 @@ static void handle_windowevent(SDL_Event *ev)
sdl2_redraw(scon);
break;
case SDL_WINDOWEVENT_FOCUS_GAINED:
+ win32_kbd_set_grab(gui_grab);
+ if (qemu_console_is_graphic(scon->dcl.con)) {
+ win32_kbd_set_window(sdl2_win32_get_hwnd(scon));
+ }
+ /* fall through */
case SDL_WINDOWEVENT_ENTER:
if (!gui_grab && (qemu_input_is_absolute() || absolute_enabled)) {
absolute_mouse_grab(scon);
@@ -558,6 +579,9 @@ static void handle_windowevent(SDL_Event *ev)
scon->ignore_hotkeys = get_mod_state();
break;
case SDL_WINDOWEVENT_FOCUS_LOST:
+ if (qemu_console_is_graphic(scon->dcl.con)) {
+ win32_kbd_set_window(NULL);
+ }
if (gui_grab && !gui_fullscreen) {
sdl_grab_end(scon);
}
--
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 <=
- [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