qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Joao Luis Meloni Assirati <jlma@nonada.if.usp.br>,
	Michael Tokarev <mjt@tls.msk.ru>,
	Markus Armbruster <armbru@redhat.com>,
	772422@bugs.debian.org, Gerd Hoffmann <kraxel@redhat.com>,
	gtk-vnc-list@gnome.org
Subject: [Qemu-devel] [PATCH 1/2] kbd: add brazil kbd keys to qemu
Date: Tue, 26 May 2015 15:58:04 +0200	[thread overview]
Message-ID: <1432648685-17925-1-git-send-email-kraxel@redhat.com> (raw)

The brazilian computer keyboard layout has two extra keys (compared to
the usual 105-key intl ps/2 keyboard).  This patch makes these two keys
known to qemu.

For historic reasons qemu has two ways to specify a key:  A QKeyCode
(name-based) or a number (ps/2 scancode based).  Therefore we have to
update multiple places to make new keys known to qemu:

  (1) The QKeyCode definition in qapi-schema.json
  (2) The QKeyCode <-> number mapping table in ui/input-keymap.c

This patch does just that.  With this patch applied you can send those
two keys to the guest using the send-key monitor command.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qapi-schema.json  | 4 +++-
 ui/input-keymap.c | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index f97ffa1..25df463 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2784,6 +2784,7 @@
 # Since: 1.3.0
 #
 # 'unmapped' and 'pause' since 2.0
+# 'ro' and 'kp_comma' since 2.4
 ##
 { 'enum': 'QKeyCode',
   'data': [ 'unmapped',
@@ -2801,7 +2802,8 @@
             'kp_9', 'less', 'f11', 'f12', 'print', 'home', 'pgup', 'pgdn', 'end',
             'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again',
             'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut',
-             'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause' ] }
+            'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', 'ro',
+            'kp_comma' ] }
 
 ##
 # @KeyValue
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 5d29935..2e09177 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -128,6 +128,10 @@ static const int qcode_to_number[] = {
 
     [Q_KEY_CODE_INSERT] = 0xd2,
     [Q_KEY_CODE_DELETE] = 0xd3,
+
+    [Q_KEY_CODE_RO] = 0x73,
+    [Q_KEY_CODE_KP_COMMA] = 0xf0,
+
     [Q_KEY_CODE_MAX] = 0,
 };
 
-- 
1.8.3.1

             reply	other threads:[~2015-05-26 13:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 13:58 Gerd Hoffmann [this message]
2015-05-26 13:58 ` [Qemu-devel] [PATCH 2/2] kbd: add brazil kbd keys to x11 evdev map Gerd Hoffmann
2015-05-27  9:27   ` Joao Luis Meloni Assirati
2015-05-27 14:32     ` Gerd Hoffmann
2015-05-27 19:04       ` Joao Luis Meloni Assirati
2015-05-27 11:19   ` Markus Armbruster
2015-05-27 11:35     ` Daniel P. Berrange
2015-05-27 14:39     ` Gerd Hoffmann
2015-05-27 11:40   ` Daniel P. Berrange
2015-05-27 14:42     ` Gerd Hoffmann
2015-05-28  6:24     ` Gerd Hoffmann
2015-05-28  8:52       ` Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432648685-17925-1-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=772422@bugs.debian.org \
    --cc=armbru@redhat.com \
    --cc=gtk-vnc-list@gnome.org \
    --cc=jlma@nonada.if.usp.br \
    --cc=mjt@tls.msk.ru \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).