From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>,
Anthony Liguori <anthony@codemonkey.ws>,
Lai Jiangshan <eag0628@gmail.com>,
kvm@vger.kernel.org, qemu-devel@nongnu.org,
Avi Kivity <avi@redhat.com>
Subject: [PATCH V2] qemu,qmp: add keydown and keyup command for qmp
Date: Wed, 09 Mar 2011 16:24:35 +0800 [thread overview]
Message-ID: <4D773943.60803@cn.fujitsu.com> (raw)
sendkey is a very good command for human using it in their monitor,
but it is not a good idea to port it to qmp, because qmp is a machine
protocol. So we introduce keydown and keyup command for qmp, they
simulate the events that keyboard send to the system.
Example, simulates ctrl+alt+f1:
{ "execute": "keydown", "arguments": { "keycode": 29 } } #press down ctrl
{ "execute": "keydown", "arguments": { "keycode": 56 } } #press down alt
{ "execute": "keydown", "arguments": { "keycode": 59 } } #press down f1
{ "execute": "keyup", "arguments": { "keycode": 59 } } #release f1
{ "execute": "keyup", "arguments": { "keycode": 56 } } #release alt
{ "execute": "keyup", "arguments": { "keycode": 29 } } #release ctrl
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/monitor.c b/monitor.c
index 22ae3bb..725df83 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1810,16 +1810,25 @@ static uint8_t keycodes[MAX_KEYCODES];
static int nb_pending_keycodes;
static QEMUTimer *key_timer;
-static void release_keys(void *opaque)
+static void keydown(uint8_t keycode)
{
- int keycode;
+ if (keycode & 0x80)
+ kbd_put_keycode(0xe0);
+ kbd_put_keycode(keycode & 0x7f);
+}
+static void keyup(uint8_t keycode)
+{
+ if (keycode & 0x80)
+ kbd_put_keycode(0xe0);
+ kbd_put_keycode(keycode | 0x80);
+}
+
+static void release_keys(void *opaque)
+{
while (nb_pending_keycodes > 0) {
nb_pending_keycodes--;
- keycode = keycodes[nb_pending_keycodes];
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode | 0x80);
+ keyup(keycodes[nb_pending_keycodes]);
}
}
@@ -1866,17 +1875,41 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
}
nb_pending_keycodes = i;
/* key down events */
- for (i = 0; i < nb_pending_keycodes; i++) {
- keycode = keycodes[i];
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode & 0x7f);
- }
+ for (i = 0; i < nb_pending_keycodes; i++)
+ keydown(keycodes[i]);
/* delayed key up events */
qemu_mod_timer(key_timer, qemu_get_clock(vm_clock) +
muldiv64(get_ticks_per_sec(), hold_time, 1000));
}
+static int qmp_keyaction(const QDict *qdict, int down)
+{
+ int keycode = qdict_get_int(qdict, "keycode");
+
+ if (keycode < 0 || keycode >= 256) {
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, "keycode",
+ "a valid keycode");
+ return -1;
+ }
+
+ if (down)
+ keydown(keycode);
+ else
+ keyup(keycode);
+
+ return 0;
+}
+
+static int qmp_keydown(Monitor *mon, const QDict *qdict, QObject **ret_data)
+{
+ return qmp_keyaction(qdict, 1);
+}
+
+static int qmp_keyup(Monitor *mon, const QDict *qdict, QObject **ret_data)
+{
+ return qmp_keyaction(qdict, 0);
+}
+
static int mouse_button_state;
static void do_mouse_move(Monitor *mon, const QDict *qdict)
diff --git a/qmp-commands.hx b/qmp-commands.hx
index df40a3d..4c449bb 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -338,6 +338,58 @@ Example:
EQMP
{
+ .name = "keydown",
+ .args_type = "keycode:i",
+ .params = "keycode",
+ .help = "press down a key",
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = qmp_keydown,
+ },
+
+SQMP
+keydown
+---
+
+Press down a key.
+
+Arguments:
+
+- "keycode": the code of the key to press down (json-int)
+
+Example:
+
+-> { "execute": "keydown", "arguments": { "keycode": 16 } }
+<- { "return": {} }
+
+EQMP
+
+ {
+ .name = "keyup",
+ .args_type = "keycode:i",
+ .params = "keycode",
+ .help = "release a key",
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = qmp_keyup,
+ },
+
+SQMP
+keyup
+---
+
+Release a key.
+
+Arguments:
+
+- "keycode": the code of the key to release (json-int)
+
+Example:
+
+-> { "execute": "keyup", "arguments": { "keycode": 16 } }
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "cpu",
.args_type = "index:i",
.params = "index",
WARNING: multiple messages have this Message-ID (diff)
From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Lai Jiangshan <eag0628@gmail.com>,
kvm@vger.kernel.org, qemu-devel@nongnu.org,
Markus Armbruster <armbru@redhat.com>,
Avi Kivity <avi@redhat.com>
Subject: [Qemu-devel] [PATCH V2] qemu, qmp: add keydown and keyup command for qmp
Date: Wed, 09 Mar 2011 16:24:35 +0800 [thread overview]
Message-ID: <4D773943.60803@cn.fujitsu.com> (raw)
sendkey is a very good command for human using it in their monitor,
but it is not a good idea to port it to qmp, because qmp is a machine
protocol. So we introduce keydown and keyup command for qmp, they
simulate the events that keyboard send to the system.
Example, simulates ctrl+alt+f1:
{ "execute": "keydown", "arguments": { "keycode": 29 } } #press down ctrl
{ "execute": "keydown", "arguments": { "keycode": 56 } } #press down alt
{ "execute": "keydown", "arguments": { "keycode": 59 } } #press down f1
{ "execute": "keyup", "arguments": { "keycode": 59 } } #release f1
{ "execute": "keyup", "arguments": { "keycode": 56 } } #release alt
{ "execute": "keyup", "arguments": { "keycode": 29 } } #release ctrl
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/monitor.c b/monitor.c
index 22ae3bb..725df83 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1810,16 +1810,25 @@ static uint8_t keycodes[MAX_KEYCODES];
static int nb_pending_keycodes;
static QEMUTimer *key_timer;
-static void release_keys(void *opaque)
+static void keydown(uint8_t keycode)
{
- int keycode;
+ if (keycode & 0x80)
+ kbd_put_keycode(0xe0);
+ kbd_put_keycode(keycode & 0x7f);
+}
+static void keyup(uint8_t keycode)
+{
+ if (keycode & 0x80)
+ kbd_put_keycode(0xe0);
+ kbd_put_keycode(keycode | 0x80);
+}
+
+static void release_keys(void *opaque)
+{
while (nb_pending_keycodes > 0) {
nb_pending_keycodes--;
- keycode = keycodes[nb_pending_keycodes];
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode | 0x80);
+ keyup(keycodes[nb_pending_keycodes]);
}
}
@@ -1866,17 +1875,41 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
}
nb_pending_keycodes = i;
/* key down events */
- for (i = 0; i < nb_pending_keycodes; i++) {
- keycode = keycodes[i];
- if (keycode & 0x80)
- kbd_put_keycode(0xe0);
- kbd_put_keycode(keycode & 0x7f);
- }
+ for (i = 0; i < nb_pending_keycodes; i++)
+ keydown(keycodes[i]);
/* delayed key up events */
qemu_mod_timer(key_timer, qemu_get_clock(vm_clock) +
muldiv64(get_ticks_per_sec(), hold_time, 1000));
}
+static int qmp_keyaction(const QDict *qdict, int down)
+{
+ int keycode = qdict_get_int(qdict, "keycode");
+
+ if (keycode < 0 || keycode >= 256) {
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, "keycode",
+ "a valid keycode");
+ return -1;
+ }
+
+ if (down)
+ keydown(keycode);
+ else
+ keyup(keycode);
+
+ return 0;
+}
+
+static int qmp_keydown(Monitor *mon, const QDict *qdict, QObject **ret_data)
+{
+ return qmp_keyaction(qdict, 1);
+}
+
+static int qmp_keyup(Monitor *mon, const QDict *qdict, QObject **ret_data)
+{
+ return qmp_keyaction(qdict, 0);
+}
+
static int mouse_button_state;
static void do_mouse_move(Monitor *mon, const QDict *qdict)
diff --git a/qmp-commands.hx b/qmp-commands.hx
index df40a3d..4c449bb 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -338,6 +338,58 @@ Example:
EQMP
{
+ .name = "keydown",
+ .args_type = "keycode:i",
+ .params = "keycode",
+ .help = "press down a key",
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = qmp_keydown,
+ },
+
+SQMP
+keydown
+---
+
+Press down a key.
+
+Arguments:
+
+- "keycode": the code of the key to press down (json-int)
+
+Example:
+
+-> { "execute": "keydown", "arguments": { "keycode": 16 } }
+<- { "return": {} }
+
+EQMP
+
+ {
+ .name = "keyup",
+ .args_type = "keycode:i",
+ .params = "keycode",
+ .help = "release a key",
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = qmp_keyup,
+ },
+
+SQMP
+keyup
+---
+
+Release a key.
+
+Arguments:
+
+- "keycode": the code of the key to release (json-int)
+
+Example:
+
+-> { "execute": "keyup", "arguments": { "keycode": 16 } }
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "cpu",
.args_type = "index:i",
.params = "index",
next reply other threads:[~2011-03-09 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-09 8:24 Lai Jiangshan [this message]
2011-03-09 8:24 ` [Qemu-devel] [PATCH V2] qemu, qmp: add keydown and keyup command for qmp Lai Jiangshan
2011-03-09 13:11 ` Anthony Liguori
2011-03-09 13:11 ` Anthony Liguori
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=4D773943.60803@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=anthony@codemonkey.ws \
--cc=armbru@redhat.com \
--cc=avi@redhat.com \
--cc=eag0628@gmail.com \
--cc=kvm@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.