@@ -43,7 +43,6 @@ void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
void qemu_input_event_send_key_delay(uint32_t delay_ms);
int qemu_input_key_number_to_qcode(unsigned int nr);
int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
-int qemu_input_linux_to_qcode(unsigned int lnx);
InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);
void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);
@@ -24,14 +24,6 @@
#include "ui/input-keymap-xorgxquartz2qcode.c"
#include "ui/input-keymap-xorgxwin2qcode.c"
-int qemu_input_linux_to_qcode(unsigned int lnx)
-{
- if (lnx >= qemu_input_map_linux2qcode_len) {
- return 0;
- }
- return qemu_input_map_linux2qcode[lnx];
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
if (nr >= qemu_input_map_qnum2qcode_len) {
@@ -128,8 +128,8 @@ static void input_linux_handle_keyboard(InputLinux *il,
}
/* send event to guest when grab is active */
- if (il->grab_active) {
- int qcode = qemu_input_linux_to_qcode(event->code);
+ if (il->grab_active && event->code < qemu_input_map_linux2qcode_len) {
+ int qcode = qemu_input_map_linux2qcode[event->code];
qemu_input_event_send_key_qcode(NULL, qcode, event->value);
}
The qemu_input_linux_to_qcode method is only used in one place and no new code should require it, so inline it at the only caller. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- include/ui/input.h | 1 - ui/input-keymap.c | 8 -------- ui/input-linux.c | 4 ++-- 3 files changed, 2 insertions(+), 11 deletions(-)