qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v7 2/6] monitor: rename keyname '<' to 'less'
Date: Mon, 20 Aug 2012 12:39:25 +0800	[thread overview]
Message-ID: <1345437569-13862-3-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1345437569-13862-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 renamed '<' to 'less', QAPI might 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 ce42466..1082a93 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1400,7 +1400,7 @@ static const KeyDef key_defs[] = {
     { 0x48, "kp_8" },
     { 0x49, "kp_9" },
 
-    { 0x56, "<" },
+    { 0x56, "less" },
 
     { 0x57, "f11" },
     { 0x58, "f12" },
@@ -1504,6 +1504,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

  parent reply	other threads:[~2012-08-20  4:39 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20  4:39 [Qemu-devel] [PATCH v7 0/6] convert sendkey to qapi Amos Kong
2012-08-20  4:39 ` [Qemu-devel] [PATCH v7 1/6] fix doc of using raw values with sendkey Amos Kong
2012-08-20  4:39 ` Amos Kong [this message]
2012-08-20  4:39 ` [Qemu-devel] [PATCH v7 3/6] hmp: rename arguments Amos Kong
2012-08-20  4:39 ` [Qemu-devel] [PATCH v7 4/6] qapi: generate list struct and visit_list for enum Amos Kong
2012-08-20  4:39 ` [Qemu-devel] [PATCH v7 5/6] add the QKeyCode enum and the key_defs table Amos Kong
2012-08-30 17:46   ` Luiz Capitulino
2012-08-31  2:44     ` Amos Kong
2012-08-20  4:39 ` [Qemu-devel] [PATCH v7 6/6] qapi: convert sendkey Amos Kong
2012-08-20 13:25 ` [Qemu-devel] [PATCH v7 0/6] convert sendkey to qapi Eric Blake
2012-08-20 15:08   ` Luiz Capitulino
2012-08-27  7:23     ` Amos Kong
2012-08-27 13:20       ` 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=1345437569-13862-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).