672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
64 lines
2.8 KiB
Diff
64 lines
2.8 KiB
Diff
From 47dfdc212f68d2ab3d06db162bff907c4922e67d Mon Sep 17 00:00:00 2001
|
|
From: Miika S <miika9764@gmail.com>
|
|
Date: Tue, 16 Jan 2018 13:42:14 +0000
|
|
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>
|
|
Message-Id: <20180116134217.8725-12-berrange@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
(cherry picked from commit 280b8da3b842177de538de4f73d3d63db077e39b)
|
|
[BR: BSC#1077564 - added changes to hw/input/virtio-input-hid.c which
|
|
were in an earlier proposed version of patch, but removed since that
|
|
file had become autogenerated. In 2.11, it is not autogenerated so those
|
|
previously proposed changes make sense for us.]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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',
|