From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShCpE-0000fs-SM for qemu-devel@nongnu.org; Wed, 20 Jun 2012 00:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ShCpC-0002vY-Tx for qemu-devel@nongnu.org; Wed, 20 Jun 2012 00:47:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShCpC-0002vJ-Lz for qemu-devel@nongnu.org; Wed, 20 Jun 2012 00:47:26 -0400 From: Amos Kong Date: Wed, 20 Jun 2012 12:47:37 +0800 Message-Id: <1340167661-25499-3-git-send-email-akong@redhat.com> In-Reply-To: <1340167661-25499-1-git-send-email-akong@redhat.com> References: <1340167661-25499-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/6] monitor: rename keyname '<' to 'less' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, eblake@redhat.com, berrange@redhat.com, lcapitulino@redhat.com, qemu-devel@nongnu.org Cc: Amos Kong 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 --- monitor.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index f6107ba..e87677d 100644 --- a/monitor.c +++ b/monitor.c @@ -1431,7 +1431,7 @@ static const KeyDef key_defs[] = { { 0x48, "kp_8" }, { 0x49, "kp_9" }, - { 0x56, "<" }, + { 0x56, "less" }, { 0x57, "f11" }, { 0x58, "f12" }, @@ -1535,6 +1535,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