[PATCH 0/1] input: Add lang1 and lang2 to QKeyCode

[PATCH 0/1] input: Add lang1 and lang2 to QKeyCode

[Akihiko Odaki]

This patch adds two QKeyCodes. The corresponding path for ui/keycodemapdb
titled "Add QEMU QKeyCode 'lang1' and 'lang2'" will shortly be submitted.
This patch should be applied *before* applying the patch for
ui/keycodemapdb, or it causes build failures.

Akihiko Odaki (1):
  input: Add lang1 and lang2 to QKeyCode

 qapi/ui.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.30.1 (Apple Git-130)

[PATCH 1/1] input: Add lang1 and lang2 to QKeyCode

[Akihiko Odaki]

lang1 and lang2 represents the keys with the same names in the
keyboard/keypad usage page (0x07) included in the "HID Usage Tables for
Universal Serial Bus (USB)" version 1.22. Although the keys are
described as "Hangul/English toggle key" and "Hanja conversion key" in
the specification, the meaning depends on the variety of the keyboard,
and it will be used as the representations of Kana and Eisu keys on
Japanese Macs in qemu_input_map_osx_to_qcode, which is used by ui/gtk.

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
 qapi/ui.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qapi/ui.json b/qapi/ui.json
index ee6fde46d59..3b16b2191cc 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -786,6 +786,9 @@
 # @muhenkan: since 2.12
 # @katakanahiragana: since 2.12
 #
+# @lang1: since 6.0.50
+# @lang2: since 6.0.50
+#
 # '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
@@ -818,7 +821,8 @@
             'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute',
             'volumeup', 'volumedown', 'mediaselect',
             'mail', 'calculator', 'computer',
-            'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks' ] }
+            'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks',
+            'lang1', 'lang2' ] }
 
 ##
 # @KeyValue:
-- 
2.30.1 (Apple Git-130)

Re: [PATCH 1/1] input: Add lang1 and lang2 to QKeyCode

[Eric Blake]

On Wed, Jun 16, 2021 at 11:45:22PM +0900, Akihiko Odaki wrote:
> lang1 and lang2 represents the keys with the same names in the
> keyboard/keypad usage page (0x07) included in the "HID Usage Tables for
> Universal Serial Bus (USB)" version 1.22. Although the keys are
> described as "Hangul/English toggle key" and "Hanja conversion key" in
> the specification, the meaning depends on the variety of the keyboard,
> and it will be used as the representations of Kana and Eisu keys on
> Japanese Macs in qemu_input_map_osx_to_qcode, which is used by ui/gtk.
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>  qapi/ui.json | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi/ui.json b/qapi/ui.json
> index ee6fde46d59..3b16b2191cc 100644
> --- a/qapi/ui.json
> +++ b/qapi/ui.json
> @@ -786,6 +786,9 @@
>  # @muhenkan: since 2.12
>  # @katakanahiragana: since 2.12
>  #
> +# @lang1: since 6.0.50
> +# @lang2: since 6.0.50

since 6.1

(6.0.50 is a convenience used during development, but does not point
to any released build; for that matter, it doesn't even point to a
constant commit over time the way 6.1 does).

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org