[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup |
Date: |
Thu, 22 Feb 2018 11:23:09 +0100 |
After some hotkey was pressed sdl2 doesn't forward the first modifier
keyup event to the guest, resulting in stuck modifier keys.
Fix the logic in handle_keyup(). Also gui_key_modifier_pressed doesn't
need to be a global variable.
Reported-by: Howard Spoelstra <address@hidden>
Tested-by: Howard Spoelstra <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Message-id: address@hidden
---
ui/sdl2.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 6e96a4a24c..b5a0fa1d13 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -39,7 +39,6 @@ static int gui_grab; /* if true, all keyboard/mouse events
are grabbed */
static int gui_saved_grab;
static int gui_fullscreen;
-static int gui_key_modifier_pressed;
static int gui_keysym;
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
static SDL_Cursor *sdl_cursor_normal;
@@ -331,8 +330,7 @@ static void handle_keydown(SDL_Event *ev)
{
int win;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
-
- gui_key_modifier_pressed = get_mod_state();
+ int gui_key_modifier_pressed = get_mod_state();
if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) {
switch (ev->key.keysym.scancode) {
@@ -413,18 +411,12 @@ static void handle_keydown(SDL_Event *ev)
static void handle_keyup(SDL_Event *ev)
{
- int mod_state;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
+ int gui_key_modifier_pressed = get_mod_state();
scon->ignore_hotkeys = false;
- if (!alt_grab) {
- mod_state = (ev->key.keysym.mod & gui_grab_code);
- } else {
- mod_state = (ev->key.keysym.mod & (gui_grab_code | KMOD_LSHIFT));
- }
- if (!mod_state && gui_key_modifier_pressed) {
- gui_key_modifier_pressed = 0;
+ if (!gui_key_modifier_pressed) {
gui_keysym = 0;
}
if (!gui_keysym) {
--
2.9.3
- [Qemu-devel] [PULL 0/9] Ui 20180222 patches, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t, Gerd Hoffmann, 2018/02/22
- Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches, Peter Maydell, 2018/02/22
- Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches, no-reply, 2018/02/24