ui/input: Remove unused QKeyCode helpers and keymaps
Their users have migrated to Linux key codes. 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-29-7c9e4c7abe34@rsg.ci.i.u-tokyo.ac.jp>
Akihiko Odaki committed
May 20, 2026 at 15:48 UTC
297a85fccabcf8a7df1314b4df91223cfa3cfdbc
5 files changed
-126
include/ui/input.h
-50
@@ -58,18 +58,13 @@ void qemu_input_event_send_impl(QemuConsole *src, QemuInputEvent *evt);
58
void qemu_input_event_sync(void);
59
void qemu_input_event_sync_impl(void);
60
61
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
61
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
62
bool down);
63
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
65
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
64
void qemu_input_event_send_key_delay(uint32_t delay_ms);
65
int qemu_input_key_number_to_qcode(unsigned int nr);
66
unsigned int qemu_input_key_number_to_linux(unsigned int nr);
69
-int qemu_input_key_value_to_number(const KeyValue *value);
70
-int qemu_input_key_value_to_qcode(const KeyValue *value);
67
unsigned int qemu_input_key_value_to_linux(const KeyValue *value);
72
-int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
68
int qemu_input_linux_to_scancode(unsigned int lnx, bool down, int *codes);
69
int qemu_input_linux_to_qcode(unsigned int lnx);
70
@@ -109,96 +104,51 @@ void qemu_input_check_mode_change(void);
104
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
105
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
106
112
-extern const guint qemu_input_map_atset1_to_qcode_len;
113
-extern const guint16 qemu_input_map_atset1_to_qcode[];
114
-
107
extern const guint qemu_input_map_atset1_to_linux_len;
108
extern const guint16 qemu_input_map_atset1_to_linux[];
109
110
extern const guint qemu_input_map_linux_to_qcode_len;
111
extern const guint16 qemu_input_map_linux_to_qcode[];
112
121
-extern const guint qemu_input_map_qcode_to_atset1_len;
122
-extern const guint16 qemu_input_map_qcode_to_atset1[];
123
-
113
extern const guint qemu_input_map_linux_to_atset1_len;
114
extern const guint16 qemu_input_map_linux_to_atset1[];
115
127
-extern const guint qemu_input_map_qcode_to_atset2_len;
128
-extern const guint16 qemu_input_map_qcode_to_atset2[];
129
-
116
extern const guint qemu_input_map_linux_to_atset2_len;
117
extern const guint16 qemu_input_map_linux_to_atset2[];
118
133
-extern const guint qemu_input_map_qcode_to_atset3_len;
134
-extern const guint16 qemu_input_map_qcode_to_atset3[];
135
-
119
extern const guint qemu_input_map_linux_to_atset3_len;
120
extern const guint16 qemu_input_map_linux_to_atset3[];
121
122
extern const guint qemu_input_map_qcode_to_linux_len;
123
extern const guint16 qemu_input_map_qcode_to_linux[];
124
142
-extern const guint qemu_input_map_qcode_to_qnum_len;
143
-extern const guint16 qemu_input_map_qcode_to_qnum[];
144
-
125
extern const guint qemu_input_map_linux_to_qnum_len;
126
extern const guint16 qemu_input_map_linux_to_qnum[];
127
148
-extern const guint qemu_input_map_qcode_to_sun_len;
149
-extern const guint16 qemu_input_map_qcode_to_sun[];
150
-
128
extern const guint qemu_input_map_linux_to_sun_len;
129
extern const guint16 qemu_input_map_linux_to_sun[];
130
154
-extern const guint qemu_input_map_qnum_to_qcode_len;
155
-extern const guint16 qemu_input_map_qnum_to_qcode[];
156
-
131
extern const guint qemu_input_map_qnum_to_linux_len;
132
extern const guint16 qemu_input_map_qnum_to_linux[];
133
160
-extern const guint qemu_input_map_usb_to_qcode_len;
161
-extern const guint16 qemu_input_map_usb_to_qcode[];
162
-
134
extern const guint qemu_input_map_usb_to_linux_len;
135
extern const guint16 qemu_input_map_usb_to_linux[];
136
166
-extern const guint qemu_input_map_win32_to_qcode_len;
167
-extern const guint16 qemu_input_map_win32_to_qcode[];
168
-
137
extern const guint qemu_input_map_win32_to_linux_len;
138
extern const guint16 qemu_input_map_win32_to_linux[];
139
172
-extern const guint qemu_input_map_x11_to_qcode_len;
173
-extern const guint16 qemu_input_map_x11_to_qcode[];
174
-
140
extern const guint qemu_input_map_x11_to_linux_len;
141
extern const guint16 qemu_input_map_x11_to_linux[];
142
178
-extern const guint qemu_input_map_xorgevdev_to_qcode_len;
179
-extern const guint16 qemu_input_map_xorgevdev_to_qcode[];
180
-
181
-extern const guint qemu_input_map_xorgkbd_to_qcode_len;
182
-extern const guint16 qemu_input_map_xorgkbd_to_qcode[];
183
-
143
extern const guint qemu_input_map_xorgkbd_to_linux_len;
144
extern const guint16 qemu_input_map_xorgkbd_to_linux[];
145
187
-extern const guint qemu_input_map_xorgxquartz_to_qcode_len;
188
-extern const guint16 qemu_input_map_xorgxquartz_to_qcode[];
189
-
146
extern const guint qemu_input_map_xorgxquartz_to_linux_len;
147
extern const guint16 qemu_input_map_xorgxquartz_to_linux[];
148
193
-extern const guint qemu_input_map_xorgxwin_to_qcode_len;
194
-extern const guint16 qemu_input_map_xorgxwin_to_qcode[];
195
-
149
extern const guint qemu_input_map_xorgxwin_to_linux_len;
150
extern const guint16 qemu_input_map_xorgxwin_to_linux[];
151
199
-extern const guint qemu_input_map_osx_to_qcode_len;
200
-extern const guint16 qemu_input_map_osx_to_qcode[];
201
-
152
extern const guint qemu_input_map_osx_to_linux_len;
153
extern const guint16 qemu_input_map_osx_to_linux[];
154
tools/qemu-vnc/input.c
-6
@@ -81,12 +81,6 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms)
81
{
82
}
83
84
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
85
-{
86
- unsigned int lnx = qemu_input_map_qcode_to_linux[q];
87
- qemu_input_event_send_key_linux(src, lnx, down);
88
-}
89
-
84
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
85
bool down)
86
{
ui/input-keymap.c
-39
@@ -4,36 +4,21 @@
4
5
#include "standard-headers/linux/input.h"
6
7
-#include "ui/input-keymap-atset1-to-qcode.c.inc"
7
#include "ui/input-keymap-atset1-to-linux.c.inc"
8
#include "ui/input-keymap-linux-to-qcode.c.inc"
10
-#include "ui/input-keymap-qcode-to-atset1.c.inc"
9
#include "ui/input-keymap-linux-to-atset1.c.inc"
12
-#include "ui/input-keymap-qcode-to-atset2.c.inc"
10
#include "ui/input-keymap-linux-to-atset2.c.inc"
14
-#include "ui/input-keymap-qcode-to-atset3.c.inc"
11
#include "ui/input-keymap-linux-to-atset3.c.inc"
12
#include "ui/input-keymap-qcode-to-linux.c.inc"
17
-#include "ui/input-keymap-qcode-to-qnum.c.inc"
13
#include "ui/input-keymap-linux-to-qnum.c.inc"
19
-#include "ui/input-keymap-qcode-to-sun.c.inc"
14
#include "ui/input-keymap-linux-to-sun.c.inc"
21
-#include "ui/input-keymap-qnum-to-qcode.c.inc"
15
#include "ui/input-keymap-qnum-to-linux.c.inc"
23
-#include "ui/input-keymap-usb-to-qcode.c.inc"
16
#include "ui/input-keymap-usb-to-linux.c.inc"
25
-#include "ui/input-keymap-win32-to-qcode.c.inc"
17
#include "ui/input-keymap-win32-to-linux.c.inc"
27
-#include "ui/input-keymap-x11-to-qcode.c.inc"
18
#include "ui/input-keymap-x11-to-linux.c.inc"
29
-#include "ui/input-keymap-xorgevdev-to-qcode.c.inc"
30
-#include "ui/input-keymap-xorgkbd-to-qcode.c.inc"
19
#include "ui/input-keymap-xorgkbd-to-linux.c.inc"
32
-#include "ui/input-keymap-xorgxquartz-to-qcode.c.inc"
20
#include "ui/input-keymap-xorgxquartz-to-linux.c.inc"
34
-#include "ui/input-keymap-xorgxwin-to-qcode.c.inc"
21
#include "ui/input-keymap-xorgxwin-to-linux.c.inc"
36
-#include "ui/input-keymap-osx-to-qcode.c.inc"
22
#include "ui/input-keymap-osx-to-linux.c.inc"
23
24
int qemu_input_linux_to_qcode(unsigned int lnx)
@@ -44,19 +29,6 @@ int qemu_input_linux_to_qcode(unsigned int lnx)
29
return qemu_input_map_linux_to_qcode[lnx];
30
}
31
47
-int qemu_input_key_value_to_number(const KeyValue *value)
48
-{
49
- if (value->type == KEY_VALUE_KIND_QCODE) {
50
- if (value->u.qcode.data >= qemu_input_map_qcode_to_qnum_len) {
51
- return 0;
52
- }
53
- return qemu_input_map_qcode_to_qnum[value->u.qcode.data];
54
- } else {
55
- assert(value->type == KEY_VALUE_KIND_NUMBER);
56
- return value->u.number.data;
57
- }
58
-}
59
-
32
int qemu_input_key_number_to_qcode(unsigned int nr)
33
{
34
return qemu_input_linux_to_qcode(qemu_input_key_number_to_linux(nr));
@@ -70,11 +42,6 @@ unsigned int qemu_input_key_number_to_linux(unsigned int nr)
42
return qemu_input_map_qnum_to_linux[nr];
43
}
44
73
-int qemu_input_key_value_to_qcode(const KeyValue *value)
74
-{
75
- return qemu_input_linux_to_qcode(qemu_input_key_value_to_linux(value));
76
-}
77
-
45
unsigned int qemu_input_key_value_to_linux(const KeyValue *value)
46
{
47
switch (value->type) {
@@ -89,12 +56,6 @@ unsigned int qemu_input_key_value_to_linux(const KeyValue *value)
56
}
57
}
58
92
-int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes)
93
-{
94
- return qemu_input_linux_to_scancode(qemu_input_map_qcode_to_linux[qcode],
95
- down, codes);
96
-}
97
-
59
int qemu_input_linux_to_scancode(unsigned int lnx, bool down, int *codes)
60
{
61
int keycode = lnx < qemu_input_map_linux_to_qnum_len ?
ui/input.c
-16
@@ -365,14 +365,6 @@ void qemu_input_event_sync(void)
365
replay_input_sync_event();
366
}
367
368
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
369
-{
370
- unsigned int lnx = qemu_input_key_value_to_linux(key);
371
-
372
- g_free(key);
373
- qemu_input_event_send_key_linux(src, lnx, down);
374
-}
375
-
368
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
369
bool down)
370
{
@@ -399,14 +391,6 @@ void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
391
qemu_input_event_send_key_linux(src, lnx, down);
392
}
393
402
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
403
-{
404
- KeyValue *key = g_new0(KeyValue, 1);
405
- key->type = KEY_VALUE_KIND_QCODE;
406
- key->u.qcode.data = q;
407
- qemu_input_event_send_key(src, key, down);
408
-}
409
-
394
void qemu_input_event_send_key_delay(uint32_t delay_ms)
395
{
396
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
ui/meson.build
-15
@@ -1,34 +1,19 @@
1
keymaps = [
2
- ['atset1', 'qcode'],
2
['atset1', 'linux'],
3
['linux', 'qcode'],
5
- ['qcode', 'atset1'],
4
['linux', 'atset1'],
7
- ['qcode', 'atset2'],
5
['linux', 'atset2'],
9
- ['qcode', 'atset3'],
6
['linux', 'atset3'],
7
['qcode', 'linux'],
12
- ['qcode', 'qnum'],
8
['linux', 'qnum'],
14
- ['qcode', 'sun'],
9
['linux', 'sun'],
16
- ['qnum', 'qcode'],
10
['qnum', 'linux'],
18
- ['usb', 'qcode'],
11
['usb', 'linux'],
20
- ['win32', 'qcode'],
12
['win32', 'linux'],
22
- ['x11', 'qcode'],
13
['x11', 'linux'],
24
- ['xorgevdev', 'qcode'],
25
- ['xorgkbd', 'qcode'],
14
['xorgkbd', 'linux'],
27
- ['xorgxquartz', 'qcode'],
15
['xorgxquartz', 'linux'],
29
- ['xorgxwin', 'qcode'],
16
['xorgxwin', 'linux'],
31
- ['osx', 'qcode'],
17
['osx', 'linux'],
18
]
19