From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiAX6-0005G7-Mf for qemu-devel@nongnu.org; Wed, 07 May 2014 18:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiAX0-00032h-Hd for qemu-devel@nongnu.org; Wed, 07 May 2014 18:41:48 -0400 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:61287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiAX0-00032O-Ae for qemu-devel@nongnu.org; Wed, 07 May 2014 18:41:42 -0400 Received: by mail-wi0-f178.google.com with SMTP id hm4so2157636wib.17 for ; Wed, 07 May 2014 15:41:41 -0700 (PDT) From: Hani Benhabiles Date: Wed, 7 May 2014 23:41:27 +0100 Message-Id: <1399502492-6188-2-git-send-email-kroosec@gmail.com> In-Reply-To: <1399502492-6188-1-git-send-email-kroosec@gmail.com> References: <1399502492-6188-1-git-send-email-kroosec@gmail.com> Subject: [Qemu-devel] [PATCH 1/6] monitor: Convert sendkey to use command_completion. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, lcapitulino@redhat.com Signed-off-by: Hani Benhabiles --- hmp-commands.hx | 1 + hmp.h | 1 + monitor.c | 32 +++++++++++++++++++++++--------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8971f1b..b4b23c8 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -556,6 +556,7 @@ ETEXI .params = "keys [hold_ms]", .help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)", .mhandler.cmd = hmp_send_key, + .command_completion = sendkey_completion, }, STEXI diff --git a/hmp.h b/hmp.h index 20ef454..12e21e7 100644 --- a/hmp.h +++ b/hmp.h @@ -97,5 +97,6 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); void device_add_completion(ReadLineState *rs, int nb_args, const char *str); void device_del_completion(ReadLineState *rs, int nb_args, const char *str); +void sendkey_completion(ReadLineState *rs, int nb_args, const char *str); #endif diff --git a/monitor.c b/monitor.c index 2d3fb3f..7ef251c 100644 --- a/monitor.c +++ b/monitor.c @@ -4359,6 +4359,28 @@ void object_del_completion(ReadLineState *rs, int nb_args, const char *str) qapi_free_ObjectPropertyInfoList(start); } +void sendkey_completion(ReadLineState *rs, int nb_args, const char *str) +{ + int i; + char *sep; + size_t len; + + if (nb_args != 2) { + return; + } + sep = strrchr(str, '-'); + if (sep) { + str = sep + 1; + } + len = strlen(str); + readline_set_completion_index(rs, len); + for (i = 0; i < Q_KEY_CODE_MAX; i++) { + if (!strncmp(str, QKeyCode_lookup[i], len)) { + readline_add_completion(rs, QKeyCode_lookup[i]); + } + } +} + static void monitor_find_completion_by_table(Monitor *mon, const mon_cmd_t *cmd_table, char **args, @@ -4427,15 +4449,7 @@ static void monitor_find_completion_by_table(Monitor *mon, break; case 's': case 'S': - if (!strcmp(cmd->name, "sendkey")) { - char *sep = strrchr(str, '-'); - if (sep) - str = sep + 1; - readline_set_completion_index(mon->rs, strlen(str)); - for (i = 0; i < Q_KEY_CODE_MAX; i++) { - cmd_completion(mon, str, QKeyCode_lookup[i]); - } - } else if (!strcmp(cmd->name, "help|?")) { + if (!strcmp(cmd->name, "help|?")) { monitor_find_completion_by_table(mon, cmd_table, &args[1], nb_args - 1); } -- 1.8.3.2