sdl2: fix hotkey keyup
PATCH 1/1 sdl2: fix hotkey keyup
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 <[email protected]>
Tested-by Howard Spoelstra <[email protected]>
Signed-off-by Gerd Hoffmann <[email protected]>
--- ui/sdl2.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
ui/sdl2.c +3 -11
@@ -38,7 +38,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;
@@ -330,8 +329,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) {
@@ -412,18 +410,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) {
Signature · 1 line
2.9.3
Quoted 6 lines · Gerd Hoffmann
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(). Alsogui_key_modifier_presseddoesn't need to be a global variable.
Quoted 6 lines
Reported-by Howard Spoelstra <[email protected]>Tested-by Howard Spoelstra <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- ui/sdl2.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
Reviewed-by Daniel P. Berrangé <[email protected]>
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|