Their users have migrated to Linux key codes.
Signed-off-by: Akihiko Odaki <[email protected]>
---
include/ui/input.h | 50 --------------------------------------------------
tools/qemu-vnc/input.c | 6 ------
ui/input-keymap.c | 39 ---------------------------------------
ui/input.c | 16 ----------------
ui/meson.build | 15 ---------------
5 files changed, 126 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index e76dd4b172aa..ea2d944a7ed5 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -58,18 +58,13 @@ void qemu_input_event_send_impl(QemuConsole *src,
QemuInputEvent *evt);
void qemu_input_event_sync(void);
void qemu_input_event_sync_impl(void);
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
bool down);
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
-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);
unsigned int qemu_input_key_number_to_linux(unsigned int nr);
-int qemu_input_key_value_to_number(const KeyValue *value);
-int qemu_input_key_value_to_qcode(const KeyValue *value);
unsigned int qemu_input_key_value_to_linux(const KeyValue *value);
-int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes);
int qemu_input_linux_to_scancode(unsigned int lnx, bool down, int *codes);
int qemu_input_linux_to_qcode(unsigned int lnx);
@@ -109,96 +104,51 @@ void qemu_input_check_mode_change(void);
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
-extern const guint qemu_input_map_atset1_to_qcode_len;
-extern const guint16 qemu_input_map_atset1_to_qcode[];
-
extern const guint qemu_input_map_atset1_to_linux_len;
extern const guint16 qemu_input_map_atset1_to_linux[];
extern const guint qemu_input_map_linux_to_qcode_len;
extern const guint16 qemu_input_map_linux_to_qcode[];
-extern const guint qemu_input_map_qcode_to_atset1_len;
-extern const guint16 qemu_input_map_qcode_to_atset1[];
-
extern const guint qemu_input_map_linux_to_atset1_len;
extern const guint16 qemu_input_map_linux_to_atset1[];
-extern const guint qemu_input_map_qcode_to_atset2_len;
-extern const guint16 qemu_input_map_qcode_to_atset2[];
-
extern const guint qemu_input_map_linux_to_atset2_len;
extern const guint16 qemu_input_map_linux_to_atset2[];
-extern const guint qemu_input_map_qcode_to_atset3_len;
-extern const guint16 qemu_input_map_qcode_to_atset3[];
-
extern const guint qemu_input_map_linux_to_atset3_len;
extern const guint16 qemu_input_map_linux_to_atset3[];
extern const guint qemu_input_map_qcode_to_linux_len;
extern const guint16 qemu_input_map_qcode_to_linux[];
-extern const guint qemu_input_map_qcode_to_qnum_len;
-extern const guint16 qemu_input_map_qcode_to_qnum[];
-
extern const guint qemu_input_map_linux_to_qnum_len;
extern const guint16 qemu_input_map_linux_to_qnum[];
-extern const guint qemu_input_map_qcode_to_sun_len;
-extern const guint16 qemu_input_map_qcode_to_sun[];
-
extern const guint qemu_input_map_linux_to_sun_len;
extern const guint16 qemu_input_map_linux_to_sun[];
-extern const guint qemu_input_map_qnum_to_qcode_len;
-extern const guint16 qemu_input_map_qnum_to_qcode[];
-
extern const guint qemu_input_map_qnum_to_linux_len;
extern const guint16 qemu_input_map_qnum_to_linux[];
-extern const guint qemu_input_map_usb_to_qcode_len;
-extern const guint16 qemu_input_map_usb_to_qcode[];
-
extern const guint qemu_input_map_usb_to_linux_len;
extern const guint16 qemu_input_map_usb_to_linux[];
-extern const guint qemu_input_map_win32_to_qcode_len;
-extern const guint16 qemu_input_map_win32_to_qcode[];
-
extern const guint qemu_input_map_win32_to_linux_len;
extern const guint16 qemu_input_map_win32_to_linux[];
-extern const guint qemu_input_map_x11_to_qcode_len;
-extern const guint16 qemu_input_map_x11_to_qcode[];
-
extern const guint qemu_input_map_x11_to_linux_len;
extern const guint16 qemu_input_map_x11_to_linux[];
-extern const guint qemu_input_map_xorgevdev_to_qcode_len;
-extern const guint16 qemu_input_map_xorgevdev_to_qcode[];
-
-extern const guint qemu_input_map_xorgkbd_to_qcode_len;
-extern const guint16 qemu_input_map_xorgkbd_to_qcode[];
-
extern const guint qemu_input_map_xorgkbd_to_linux_len;
extern const guint16 qemu_input_map_xorgkbd_to_linux[];
-extern const guint qemu_input_map_xorgxquartz_to_qcode_len;
-extern const guint16 qemu_input_map_xorgxquartz_to_qcode[];
-
extern const guint qemu_input_map_xorgxquartz_to_linux_len;
extern const guint16 qemu_input_map_xorgxquartz_to_linux[];
-extern const guint qemu_input_map_xorgxwin_to_qcode_len;
-extern const guint16 qemu_input_map_xorgxwin_to_qcode[];
-
extern const guint qemu_input_map_xorgxwin_to_linux_len;
extern const guint16 qemu_input_map_xorgxwin_to_linux[];
-extern const guint qemu_input_map_osx_to_qcode_len;
-extern const guint16 qemu_input_map_osx_to_qcode[];
-
extern const guint qemu_input_map_osx_to_linux_len;
extern const guint16 qemu_input_map_osx_to_linux[];
diff --git a/tools/qemu-vnc/input.c b/tools/qemu-vnc/input.c
index 90e2e79d1ea7..6fb73b312483 100644
--- a/tools/qemu-vnc/input.c
+++ b/tools/qemu-vnc/input.c
@@ -81,12 +81,6 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms)
{
}
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
-{
- unsigned int lnx = qemu_input_map_qcode_to_linux[q];
- qemu_input_event_send_key_linux(src, lnx, down);
-}
-
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
bool down)
{
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 2b77ef09fd66..ec2a1fbc1a95 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -4,36 +4,21 @@
#include "standard-headers/linux/input.h"
-#include "ui/input-keymap-atset1-to-qcode.c.inc"
#include "ui/input-keymap-atset1-to-linux.c.inc"
#include "ui/input-keymap-linux-to-qcode.c.inc"
-#include "ui/input-keymap-qcode-to-atset1.c.inc"
#include "ui/input-keymap-linux-to-atset1.c.inc"
-#include "ui/input-keymap-qcode-to-atset2.c.inc"
#include "ui/input-keymap-linux-to-atset2.c.inc"
-#include "ui/input-keymap-qcode-to-atset3.c.inc"
#include "ui/input-keymap-linux-to-atset3.c.inc"
#include "ui/input-keymap-qcode-to-linux.c.inc"
-#include "ui/input-keymap-qcode-to-qnum.c.inc"
#include "ui/input-keymap-linux-to-qnum.c.inc"
-#include "ui/input-keymap-qcode-to-sun.c.inc"
#include "ui/input-keymap-linux-to-sun.c.inc"
-#include "ui/input-keymap-qnum-to-qcode.c.inc"
#include "ui/input-keymap-qnum-to-linux.c.inc"
-#include "ui/input-keymap-usb-to-qcode.c.inc"
#include "ui/input-keymap-usb-to-linux.c.inc"
-#include "ui/input-keymap-win32-to-qcode.c.inc"
#include "ui/input-keymap-win32-to-linux.c.inc"
-#include "ui/input-keymap-x11-to-qcode.c.inc"
#include "ui/input-keymap-x11-to-linux.c.inc"
-#include "ui/input-keymap-xorgevdev-to-qcode.c.inc"
-#include "ui/input-keymap-xorgkbd-to-qcode.c.inc"
#include "ui/input-keymap-xorgkbd-to-linux.c.inc"
-#include "ui/input-keymap-xorgxquartz-to-qcode.c.inc"
#include "ui/input-keymap-xorgxquartz-to-linux.c.inc"
-#include "ui/input-keymap-xorgxwin-to-qcode.c.inc"
#include "ui/input-keymap-xorgxwin-to-linux.c.inc"
-#include "ui/input-keymap-osx-to-qcode.c.inc"
#include "ui/input-keymap-osx-to-linux.c.inc"
int qemu_input_linux_to_qcode(unsigned int lnx)
@@ -44,19 +29,6 @@ int qemu_input_linux_to_qcode(unsigned int lnx)
return qemu_input_map_linux_to_qcode[lnx];
}
-int qemu_input_key_value_to_number(const KeyValue *value)
-{
- if (value->type == KEY_VALUE_KIND_QCODE) {
- if (value->u.qcode.data >= qemu_input_map_qcode_to_qnum_len) {
- return 0;
- }
- return qemu_input_map_qcode_to_qnum[value->u.qcode.data];
- } else {
- assert(value->type == KEY_VALUE_KIND_NUMBER);
- return value->u.number.data;
- }
-}
-
int qemu_input_key_number_to_qcode(unsigned int nr)
{
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)
return qemu_input_map_qnum_to_linux[nr];
}
-int qemu_input_key_value_to_qcode(const KeyValue *value)
-{
- return qemu_input_linux_to_qcode(qemu_input_key_value_to_linux(value));
-}
-
unsigned int qemu_input_key_value_to_linux(const KeyValue *value)
{
switch (value->type) {
@@ -89,12 +56,6 @@ unsigned int qemu_input_key_value_to_linux(const KeyValue
*value)
}
}
-int qemu_input_qcode_to_scancode(QKeyCode qcode, bool down, int *codes)
-{
- return qemu_input_linux_to_scancode(qemu_input_map_qcode_to_linux[qcode],
- down, codes);
-}
-
int qemu_input_linux_to_scancode(unsigned int lnx, bool down, int *codes)
{
int keycode = lnx < qemu_input_map_linux_to_qnum_len ?
diff --git a/ui/input.c b/ui/input.c
index 68c7ac6f1ccb..c013cd9f7e04 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -365,14 +365,6 @@ void qemu_input_event_sync(void)
replay_input_sync_event();
}
-void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
-{
- unsigned int lnx = qemu_input_key_value_to_linux(key);
-
- g_free(key);
- qemu_input_event_send_key_linux(src, lnx, down);
-}
-
void qemu_input_event_send_key_linux(QemuConsole *src, unsigned int lnx,
bool down)
{
@@ -399,14 +391,6 @@ void qemu_input_event_send_key_number(QemuConsole *src,
int num, bool down)
qemu_input_event_send_key_linux(src, lnx, down);
}
-void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
-{
- KeyValue *key = g_new0(KeyValue, 1);
- key->type = KEY_VALUE_KIND_QCODE;
- key->u.qcode.data = q;
- qemu_input_event_send_key(src, key, down);
-}
-
void qemu_input_event_send_key_delay(uint32_t delay_ms)
{
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
diff --git a/ui/meson.build b/ui/meson.build
index 1504e27248f3..bb01f0728e28 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -1,34 +1,19 @@
keymaps = [
- ['atset1', 'qcode'],
['atset1', 'linux'],
['linux', 'qcode'],
- ['qcode', 'atset1'],
['linux', 'atset1'],
- ['qcode', 'atset2'],
['linux', 'atset2'],
- ['qcode', 'atset3'],
['linux', 'atset3'],
['qcode', 'linux'],
- ['qcode', 'qnum'],
['linux', 'qnum'],
- ['qcode', 'sun'],
['linux', 'sun'],
- ['qnum', 'qcode'],
['qnum', 'linux'],
- ['usb', 'qcode'],
['usb', 'linux'],
- ['win32', 'qcode'],
['win32', 'linux'],
- ['x11', 'qcode'],
['x11', 'linux'],
- ['xorgevdev', 'qcode'],
- ['xorgkbd', 'qcode'],
['xorgkbd', 'linux'],
- ['xorgxquartz', 'qcode'],
['xorgxquartz', 'linux'],
- ['xorgxwin', 'qcode'],
['xorgxwin', 'linux'],
- ['osx', 'qcode'],
['osx', 'linux'],
]
--
2.54.0
