mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/sdl2: ignore GUI keys in SDL_TEXTINPUT handler

Browse Source 
Ignore GUI keys for SDL_TEXTINPUT events, just like GUI keys are
ignored for SDL_KEYDOWN events. This prevents unintended text input
in a text console when hiding the text console with the GUI keys.

The SDL_TEXTINPUT event always comes after the SDL_KEYDOWN event.
See https://github.com/libsdl-org/SDL/issues/1659.

Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Tested-by: Bernhard Beschow <shentey@gmail.com>
Message-ID: <20240909061552.6122-3-vr_qemu@t-online.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Volker Rümelin 2024-09-09 08:15:52 +02:00 committed by Philippe Mathieu-Daudé
parent df3c610ffc
commit eaea80315f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/sdl2.h
View File

@ -42,6 +42,7 @@ struct sdl2_console {
int updates;
int idle_counter;
int ignore_hotkeys;
bool gui_keysym;
SDL_GLContext winctx;
QKbdState *kbd;
#ifdef CONFIG_OPENGL

17
ui/sdl2.c
View File

@ -388,12 +388,13 @@ static void handle_keydown(SDL_Event *ev)
int win;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
int gui_key_modifier_pressed = get_mod_state();
int gui_keysym = 0;
if (!scon) {
return;
}
scon->gui_keysym = false;
if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) {
switch (ev->key.keysym.scancode) {
case SDL_SCANCODE_2:
@ -419,15 +420,15 @@ static void handle_keydown(SDL_Event *ev)
}
}
sdl2_release_modifiers(scon);
gui_keysym = 1;
scon->gui_keysym = true;
}
break;
case SDL_SCANCODE_F:
toggle_full_screen(scon);
gui_keysym = 1;
scon->gui_keysym = true;
break;
case SDL_SCANCODE_G:
gui_keysym = 1;
scon->gui_keysym = true;
if (!gui_grab) {
sdl_grab_start(scon);
} else if (!gui_fullscreen) {
@ -440,7 +441,7 @@ static void handle_keydown(SDL_Event *ev)
/* re-create scon->texture */
sdl2_2d_switch(&scon->dcl, scon->surface);
}
gui_keysym = 1;
scon->gui_keysym = true;
break;
#if 0
case SDL_SCANCODE_KP_PLUS:
@ -459,14 +460,14 @@ static void handle_keydown(SDL_Event *ev)
__func__, width, height);
sdl_scale(scon, width, height);
sdl2_redraw(scon);
gui_keysym = 1;
scon->gui_keysym = true;
}
#endif
default:
break;
}
}
if (!gui_keysym) {
if (!scon->gui_keysym) {
sdl2_process_key(scon, &ev->key);
}
}
@ -492,7 +493,7 @@ static void handle_textinput(SDL_Event *ev)
return;
}
if (QEMU_IS_TEXT_CONSOLE(con)) {
if (!scon->gui_keysym && QEMU_IS_TEXT_CONSOLE(con)) {
qemu_text_console_put_string(QEMU_TEXT_CONSOLE(con), ev->text.text, strlen(ev->text.text));
}
}