9d553ab38a
Hopefully we're at least close to the right stuff for handling python2 vs python3 right with these changes. OBS-URL: https://build.opensuse.org/request/show/569754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=384
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From 3279607f70ff31e79924ff86c82fdca1da49c28e Mon Sep 17 00:00:00 2001
|
|
From: Miika S <miika9764@gmail.com>
|
|
Date: Tue, 16 Jan 2018 13:46:04 -0700
|
|
Subject: [PATCH] input: add missing JIS keys to virtio input
|
|
|
|
keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana
|
|
|
|
Signed-off-by: Miika S <miika9764@gmail.com>
|
|
---
|
|
hw/input/virtio-input-hid.c | 7 +++++++
|
|
qapi/ui.json | 5 ++++-
|
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
|
|
index e78faec0b1..9628d289f9 100644
|
|
--- a/hw/input/virtio-input-hid.c
|
|
+++ b/hw/input/virtio-input-hid.c
|
|
@@ -139,6 +139,13 @@ static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
|
|
[Q_KEY_CODE_META_L] = KEY_LEFTMETA,
|
|
[Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
|
|
[Q_KEY_CODE_MENU] = KEY_MENU,
|
|
+
|
|
+ [Q_KEY_CODE_MUHENKAN] = KEY_MUHENKAN,
|
|
+ [Q_KEY_CODE_HENKAN] = KEY_HENKAN,
|
|
+ [Q_KEY_CODE_KATAKANAHIRAGANA] = KEY_KATAKANAHIRAGANA,
|
|
+ [Q_KEY_CODE_COMPOSE] = KEY_COMPOSE,
|
|
+ [Q_KEY_CODE_RO] = KEY_RO,
|
|
+ [Q_KEY_CODE_YEN] = KEY_YEN,
|
|
};
|
|
|
|
static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
|
|
diff --git a/qapi/ui.json b/qapi/ui.json
|
|
index 07b468f625..d6679aa8f5 100644
|
|
--- a/qapi/ui.json
|
|
+++ b/qapi/ui.json
|
|
@@ -748,6 +748,9 @@
|
|
# @ac_bookmarks: since 2.10
|
|
# altgr, altgr_r: dropped in 2.10
|
|
#
|
|
+# @muhenkan: since 2.12
|
|
+# @katakanahiragana: since 2.12
|
|
+#
|
|
# 'sysrq' was mistakenly added to hack around the fact that
|
|
# the ps2 driver was not generating correct scancodes sequences
|
|
# when 'alt+print' was pressed. This flaw is now fixed and the
|
|
@@ -775,7 +778,7 @@
|
|
'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again',
|
|
'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut',
|
|
'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause',
|
|
- 'ro', 'hiragana', 'henkan', 'yen',
|
|
+ 'ro', 'hiragana', 'henkan', 'yen', 'muhenkan', 'katakanahiragana',
|
|
'kp_comma', 'kp_equals', 'power', 'sleep', 'wake',
|
|
'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute',
|
|
'volumeup', 'volumedown', 'mediaselect',
|