ui/sdl2: Use Linux key codes
QemuInputEvent now stores Linux key codes for key events. Use those codes directly instead of translating between internal key code representations. Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-ID: <20260520-input-v3-24-7c9e4c7abe34@rsg.ci.i.u-tokyo.ac.jp>
Akihiko Odaki committed
May 20, 2026 at 15:48 UTC
e52a5d40d61ad779fb7afbcfb8192630dd9b3461
2 files changed
+10
-10
ui/sdl2-input.c
+9
-9
@@ -24,6 +24,7 @@
24
/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
25
26
#include "qemu/osdep.h"
27
+#include "standard-headers/linux/input-event-codes.h"
28
#include "ui/console.h"
29
#include "ui/input.h"
30
#include "ui/sdl2.h"
@@ -32,28 +33,27 @@
33
void sdl2_process_key(struct sdl2_console *scon,
34
SDL_KeyboardEvent *ev)
35
{
35
- int qcode;
36
+ unsigned int lnx;
37
QemuConsole *con = scon->dcl.con;
38
38
- if (ev->keysym.scancode >= qemu_input_map_usb_to_qcode_len) {
39
+ if (ev->keysym.scancode >= qemu_input_map_usb_to_linux_len) {
40
return;
41
}
41
- qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
42
- trace_sdl2_process_key(ev->keysym.scancode, qcode,
42
+ lnx = qemu_input_map_usb_to_linux[ev->keysym.scancode];
43
+ trace_sdl2_process_key(ev->keysym.scancode, lnx,
44
ev->type == SDL_KEYDOWN ? "down" : "up");
44
- qkbd_state_key_event(scon->kbd, qemu_input_map_qcode_to_linux[qcode],
45
- ev->type == SDL_KEYDOWN);
45
+ qkbd_state_key_event(scon->kbd, lnx, ev->type == SDL_KEYDOWN);
46
47
if (QEMU_IS_TEXT_CONSOLE(con)) {
48
QemuTextConsole *s = QEMU_TEXT_CONSOLE(con);
49
bool ctrl = qkbd_state_modifier_get(scon->kbd, QKBD_MOD_CTRL);
50
if (ev->type == SDL_KEYDOWN) {
51
- switch (qcode) {
52
- case Q_KEY_CODE_RET:
51
+ switch (lnx) {
52
+ case KEY_ENTER:
53
qemu_text_console_put_keysym(s, '\n');
54
break;
55
default:
56
- qemu_text_console_put_qcode(s, qcode, ctrl);
56
+ qemu_text_console_put_linux(s, lnx, ctrl);
57
break;
58
}
59
}
ui/trace-events
+1
-1
@@ -135,7 +135,7 @@ input_event_mtt(int conidx, const char *axis, int value) "con %d, axis %s, value
135
input_event_sync(void) ""
136
137
# sdl2-input.c
138
-sdl2_process_key(int sdl_scancode, int qcode, const char *action) "translated SDL scancode %d to QKeyCode %d (%s)"
138
+sdl2_process_key(int sdl_scancode, unsigned int lnx, const char *action) "translated SDL scancode %d to Linux scancode %u (%s)"
139
140
# spice-display.c
141
qemu_spice_add_memslot(int qid, uint32_t slot_id, unsigned long virt_start, unsigned long virt_end, int async) "%d %u: host virt 0x%lx - 0x%lx async=%d"