starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

ui/sdl2: Use Linux key codes

Browse Source 
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>
This commit is contained in:
Akihiko Odaki
2026-05-20 15:48:07 +09:00
committed by Marc-André Lureau
parent f0fccade86
commit e52a5d40d6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/sdl2-input.c
View File

@@ -24,6 +24,7 @@
/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
#include "qemu/osdep.h"
#include "standard-headers/linux/input-event-codes.h"
#include "ui/console.h"
#include "ui/input.h"
#include "ui/sdl2.h"
@@ -32,28 +33,27 @@
void sdl2_process_key(struct sdl2_console *scon,
SDL_KeyboardEvent *ev)
{
int qcode;
unsigned int lnx;
QemuConsole *con = scon->dcl.con;
if (ev->keysym.scancode >= qemu_input_map_usb_to_qcode_len) {
if (ev->keysym.scancode >= qemu_input_map_usb_to_linux_len) {
return;
}
qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
trace_sdl2_process_key(ev->keysym.scancode, qcode,
lnx = qemu_input_map_usb_to_linux[ev->keysym.scancode];
trace_sdl2_process_key(ev->keysym.scancode, lnx,
ev->type == SDL_KEYDOWN ? "down" : "up");
qkbd_state_key_event(scon->kbd, qemu_input_map_qcode_to_linux[qcode],
ev->type == SDL_KEYDOWN);
qkbd_state_key_event(scon->kbd, lnx, ev->type == SDL_KEYDOWN);
if (QEMU_IS_TEXT_CONSOLE(con)) {
QemuTextConsole *s = QEMU_TEXT_CONSOLE(con);
bool ctrl = qkbd_state_modifier_get(scon->kbd, QKBD_MOD_CTRL);
if (ev->type == SDL_KEYDOWN) {
switch (qcode) {
case Q_KEY_CODE_RET:
switch (lnx) {
case KEY_ENTER:
qemu_text_console_put_keysym(s, '\n');
break;
default:
qemu_text_console_put_qcode(s, qcode, ctrl);
qemu_text_console_put_linux(s, lnx, ctrl);
break;
}
}

2
ui/trace-events
View File

@@ -135,7 +135,7 @@ input_event_mtt(int conidx, const char *axis, int value) "con %d, axis %s, value
input_event_sync(void) ""
# sdl2-input.c
sdl2_process_key(int sdl_scancode, int qcode, const char *action) "translated SDL scancode %d to QKeyCode %d (%s)"
sdl2_process_key(int sdl_scancode, unsigned int lnx, const char *action) "translated SDL scancode %d to Linux scancode %u (%s)"
# spice-display.c
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"