From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, Amos Kong <akong@redhat.com>,
eblake@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v5 2/6] monitor: rename keyname '<' to 'less'
Date: Thu, 26 Jul 2012 12:48:57 +0800 [thread overview]
Message-ID: <1343278141-10843-3-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1343278141-10843-1-git-send-email-akong@redhat.com>
There are many maps of keycode 0x56 in pc-bios/keymaps/*
pc-bios/keymaps/common:less 0x56
pc-bios/keymaps/common:greater 0x56 shift
pc-bios/keymaps/common:bar 0x56 altgr
pc-bios/keymaps/common:brokenbar 0x56 shift altgr
This patch just renames '<' to 'less', QAPI would add new
variable by adding a prefix to keyname, '$PREFIX_<' is not
available, '$PREFIX_less' is ok.
For compatibility, convert user inputted '<' to 'less'.
Signed-off-by: Amos Kong <akong@redhat.com>
---
monitor.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index 49dccfe..ffec616 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1403,7 +1403,7 @@ static const KeyDef key_defs[] = {
{ 0x48, "kp_8" },
{ 0x49, "kp_9" },
- { 0x56, "<" },
+ { 0x56, "less" },
{ 0x57, "f11" },
{ 0x58, "f12" },
@@ -1507,6 +1507,13 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "too many keys\n");
return;
}
+
+ /* Be compatible with old interface, convert user inputted "<" */
+ if (!strncmp(keyname_buf, "<", 1) && keyname_len == 1) {
+ pstrcpy(keyname_buf, sizeof(keyname_buf), "less");
+ keyname_len = 4;
+ }
+
keyname_buf[keyname_len] = 0;
keycode = get_keycode(keyname_buf);
if (keycode < 0) {
--
1.7.1
next prev parent reply other threads:[~2012-07-26 4:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 4:48 [Qemu-devel] [PATCH v5 0/6] convert sendkey to qapi Amos Kong
2012-07-26 4:48 ` [Qemu-devel] [PATCH v5 1/6] fix doc of using raw values with sendkey Amos Kong
2012-07-26 4:48 ` Amos Kong [this message]
2012-07-26 4:48 ` [Qemu-devel] [PATCH v5 3/6] hmp: rename arguments Amos Kong
2012-07-26 4:48 ` [Qemu-devel] [PATCH v5 4/6] qapi: generate list struct and visit_list for enum Amos Kong
2012-07-26 4:49 ` [Qemu-devel] [PATCH v5 5/6] ps2: output warning when event queue full Amos Kong
2012-07-27 19:24 ` Blue Swirl
2012-07-26 4:49 ` [Qemu-devel] [PATCH v5 6/6] qapi: convert sendkey Amos Kong
2012-07-26 21:22 ` Eric Blake
2012-08-02 19:57 ` Luiz Capitulino
2012-08-03 1:38 ` Amos Kong
2012-08-03 13:23 ` Luiz Capitulino
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=1343278141-10843-3-git-send-email-akong@redhat.com \
--to=akong@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=eblake@redhat.com \
--cc=lcapitulino@redhat.com \
--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).