[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 5/5] sdl2: use only QKeyCode in sdl2_process_key
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RFC PATCH 5/5] sdl2: use only QKeyCode in sdl2_process_key() |
Date: |
Wed, 21 Feb 2018 18:08:20 +0100 |
Small cleanup. Also drop the special backspace handling,
kbd_put_qcode_console() learned to handle that meanwhile.
And sdl2_process_key is never called with scon == NULL.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl2-input.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index 82ec375ea2..f0847dd745 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -39,23 +39,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];
if (!qemu_console_is_graphic(con)) {
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;
- case SDL_SCANCODE_BACKSPACE:
- kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE);
- break;
default:
kbd_put_qcode_console(con, qcode);
break;
--
2.9.3
- [Qemu-devel] [RFC PATCH 0/5] ui: add keyboard state and hotkey tracker, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [RFC PATCH 2/5] kbd-state: add hotkey registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [RFC PATCH 3/5] kbd-state: use state tracker for sdl2, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [RFC PATCH 1/5] kbd-state: add keyboard state tracker, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [RFC PATCH 5/5] sdl2: use only QKeyCode in sdl2_process_key(),
Gerd Hoffmann <=
- [Qemu-devel] [RFC PATCH 4/5] kbd-state: register sdl2 hotkeys, Gerd Hoffmann, 2018/02/21
- Re: [Qemu-devel] [RFC PATCH 0/5] ui: add keyboard state and hotkey tracker, no-reply, 2018/02/22