From: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
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-13-7c9e4c7abe34@rsg.ci.i.u-tokyo.ac.jp>
---
hw/input/ps2.c | 51 +++++++++++++++++++++----------------------
hw/input/trace-events | 2 +-
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 93c3c737205..f2523ff4bc7 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -28,6 +28,7 @@
#include "hw/core/sysbus.h"
#include "hw/input/ps2.h"
#include "migration/vmstate.h"
+#include "standard-headers/linux/input-event-codes.h"
#include "ui/console.h"
#include "ui/input.h"
#include "system/reset.h"
@@ -123,20 +124,20 @@ static uint8_t translate_table[256] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
};
-static unsigned int ps2_modifier_bit(QKeyCode key)
+static unsigned int ps2_modifier_bit(unsigned int key)
{
switch (key) {
- case Q_KEY_CODE_CTRL:
+ case KEY_LEFTCTRL:
return MOD_CTRL_L;
- case Q_KEY_CODE_CTRL_R:
+ case KEY_RIGHTCTRL:
return MOD_CTRL_R;
- case Q_KEY_CODE_SHIFT:
+ case KEY_LEFTSHIFT:
return MOD_SHIFT_L;
- case Q_KEY_CODE_SHIFT_R:
+ case KEY_RIGHTSHIFT:
return MOD_SHIFT_R;
- case Q_KEY_CODE_ALT:
+ case KEY_LEFTALT:
return MOD_ALT_L;
- case Q_KEY_CODE_ALT_R:
+ case KEY_RIGHTALT:
return MOD_ALT_R;
default:
return 0;
@@ -313,7 +314,6 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
QemuInputEvent *evt)
{
PS2KbdState *s = (PS2KbdState *)dev;
- int qcode;
uint16_t keycode = 0;
int mod;
@@ -324,10 +324,9 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
assert(evt->type == INPUT_EVENT_KIND_KEY);
- qcode = qemu_input_linux_to_qcode(evt->key.key);
- mod = ps2_modifier_bit(qcode);
- trace_ps2_keyboard_event(s, qcode, evt->key.down, mod,
+ mod = ps2_modifier_bit(evt->key.key);
+ trace_ps2_keyboard_event(s, evt->key.key, evt->key.down, mod,
s->modifiers, s->scancode_set, s->translate);
if (evt->key.down) {
s->modifiers |= mod;
@@ -336,7 +335,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
if (s->scancode_set == 1) {
- if (qcode == Q_KEY_CODE_PAUSE) {
+ if (evt->key.key == KEY_PAUSE) {
if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
if (evt->key.down) {
ps2_put_keycode(s, 0xe0);
@@ -354,7 +353,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0xc5);
}
}
- } else if (qcode == Q_KEY_CODE_PRINT) {
+ } else if (evt->key.key == KEY_SYSRQ) {
if (s->modifiers & MOD_ALT_L) {
if (evt->key.down) {
ps2_put_keycode(s, 0xb8);
@@ -401,12 +400,12 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0xaa);
}
}
- } else if ((qcode == Q_KEY_CODE_LANG1 || qcode == Q_KEY_CODE_LANG2)
+ } else if ((evt->key.key == KEY_HANGEUL || evt->key.key == KEY_HANJA)
&& !evt->key.down) {
/* Ignore release for these keys */
} else {
- if (qcode < qemu_input_map_qcode_to_atset1_len) {
- keycode = qemu_input_map_qcode_to_atset1[qcode];
+ if (evt->key.key < qemu_input_map_linux_to_atset1_len) {
+ keycode = qemu_input_map_linux_to_atset1[evt->key.key];
}
if (keycode) {
if (keycode & 0xff00) {
@@ -418,11 +417,11 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, keycode & 0xff);
} else {
qemu_log_mask(LOG_UNIMP,
- "ps2: ignoring key with qcode %d\n", qcode);
+ "ps2: ignoring key %u\n", evt->key.key);
}
}
} else if (s->scancode_set == 2) {
- if (qcode == Q_KEY_CODE_PAUSE) {
+ if (evt->key.key == KEY_PAUSE) {
if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
if (evt->key.down) {
ps2_put_keycode(s, 0xe0);
@@ -443,7 +442,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0x77);
}
}
- } else if (qcode == Q_KEY_CODE_PRINT) {
+ } else if (evt->key.key == KEY_SYSRQ) {
if (s->modifiers & MOD_ALT_L) {
if (evt->key.down) {
ps2_put_keycode(s, 0xf0);
@@ -499,12 +498,12 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, 0x12);
}
}
- } else if ((qcode == Q_KEY_CODE_LANG1 || qcode == Q_KEY_CODE_LANG2) &&
+ } else if ((evt->key.key == KEY_HANGEUL || evt->key.key == KEY_HANJA) &&
!evt->key.down) {
/* Ignore release for these keys */
} else {
- if (qcode < qemu_input_map_qcode_to_atset2_len) {
- keycode = qemu_input_map_qcode_to_atset2[qcode];
+ if (evt->key.key < qemu_input_map_linux_to_atset2_len) {
+ keycode = qemu_input_map_linux_to_atset2[evt->key.key];
}
if (keycode) {
if (keycode & 0xff00) {
@@ -516,12 +515,12 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, keycode & 0xff);
} else {
qemu_log_mask(LOG_UNIMP,
- "ps2: ignoring key with qcode %d\n", qcode);
+ "ps2: ignoring key %u\n", evt->key.key);
}
}
} else if (s->scancode_set == 3) {
- if (qcode < qemu_input_map_qcode_to_atset3_len) {
- keycode = qemu_input_map_qcode_to_atset3[qcode];
+ if (evt->key.key < qemu_input_map_linux_to_atset3_len) {
+ keycode = qemu_input_map_linux_to_atset3[evt->key.key];
}
if (keycode) {
/* FIXME: break code should be configured on a key by key basis */
@@ -531,7 +530,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
ps2_put_keycode(s, keycode);
} else {
qemu_log_mask(LOG_UNIMP,
- "ps2: ignoring key with qcode %d\n", qcode);
+ "ps2: ignoring key %u\n", evt->key.key);
}
}
}
diff --git a/hw/input/trace-events b/hw/input/trace-events
index 1484625565b..43900914be2 100644
--- a/hw/input/trace-events
+++ b/hw/input/trace-events
@@ -30,7 +30,7 @@ pckbd_kbd_write_data(uint64_t val) "0x%02"PRIx64
# ps2.c
ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x"
-ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifier, unsigned int modifiers, int set, int xlate) "%p qcode %d down %d modifier 0x%x modifiers 0x%x set %d xlate %d"
+ps2_keyboard_event(void *opaque, unsigned int lnx, int down, unsigned int modifier, unsigned int modifiers, int set, int xlate) "%p lnx %u down %d modifier 0x%x modifiers 0x%x set %d xlate %d"
ps2_read_data(void *opaque) "%p"
ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d"
ps2_reset_keyboard(void *s) "%p"
--
2.54.0