[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v3 4/8] sdl2: use only QKeyCode in sdl2_process_
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RFC PATCH v3 4/8] sdl2: use only QKeyCode in sdl2_process_key() |
Date: |
Tue, 22 Jan 2019 10:28:10 +0100 |
Also: sdl2_process_key is never called with scon == NULL.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
ui/sdl2-input.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index 22e3336aab..664364a5e5 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -34,20 +34,19 @@ void sdl2_process_key(struct sdl2_console *scon,
SDL_KeyboardEvent *ev)
{
int qcode;
- QemuConsole *con = scon ? scon->dcl.con : NULL;
+ QemuConsole *con = scon->dcl.con;
if (ev->keysym.scancode >= qemu_input_map_usb_to_qcode_len) {
return;
}
-
qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
qkbd_state_key_event(scon->kbd, qcode, ev->type == SDL_KEYDOWN);
if (!qemu_console_is_graphic(con)) {
bool ctrl = qkbd_state_modifier_get(scon->kbd, QKBD_MOD_CTRL);
if (ev->type == SDL_KEYDOWN) {
- switch (ev->keysym.scancode) {
- case SDL_SCANCODE_RETURN:
+ switch (qcode) {
+ case Q_KEY_CODE_RET:
kbd_put_keysym_console(con, '\n');
break;
default:
--
2.9.3
- [Qemu-devel] [RFC PATCH v3 0/8] ui: add generic keyboard state tracker, fix keymap, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 5/8] kbd-state: use state tracker for gtk, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 2/8] sdl2: remove sdl2_reset_keys() function, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 7/8] keymap: pass full keyboard state to keysym2scancode, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 8/8] keymap: fix keyup mappings, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 6/8] kbd-state: use state tracker for vnc, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 3/8] kbd-state: use state tracker for sdl2, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 1/8] kbd-state: add keyboard state tracker, Gerd Hoffmann, 2019/01/22
- [Qemu-devel] [RFC PATCH v3 4/8] sdl2: use only QKeyCode in sdl2_process_key(),
Gerd Hoffmann <=