Skip to content

Commit

Permalink
input: move input-send-event into experimental namespace
Browse files Browse the repository at this point in the history
Ongoing discussions on how we are going to specify the console,
so tag the command as experiental so we can refine things in
the 2.3 development cycle.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1416923657-10614-1-git-send-email-armbru@redhat.com
[Spell out "not a stable API", and x- the QAPI schema, too]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
kraxel authored and pm215 committed Nov 25, 2014
1 parent ca60281 commit df5b2ad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 4 additions & 2 deletions qapi-schema.json
Expand Up @@ -3245,7 +3245,7 @@
'abs' : 'InputMoveEvent' } }

##
# @input-send-event
# @x-input-send-event
#
# Send input event(s) to guest.
#
Expand All @@ -3257,8 +3257,10 @@
#
# Since: 2.2
#
# Note: this command is experimental, and not a stable API.
#
##
{ 'command': 'input-send-event',
{ 'command': 'x-input-send-event',
'data': { '*console':'int', 'events': [ 'InputEvent' ] } }

##
Expand Down
16 changes: 9 additions & 7 deletions qmp-commands.hx
Expand Up @@ -3791,13 +3791,13 @@ Example:
EQMP

{
.name = "input-send-event",
.name = "x-input-send-event",
.args_type = "console:i?,events:q",
.mhandler.cmd_new = qmp_marshal_input_input_send_event,
.mhandler.cmd_new = qmp_marshal_input_x_input_send_event,
},

SQMP
@input-send-event
@x-input-send-event
-----------------

Send input event to guest.
Expand All @@ -3811,17 +3811,19 @@ The consoles are visible in the qom tree, under
/backend/console[$index]. They have a device link and head property, so
it is possible to map which console belongs to which device and display.

Note: this command is experimental, and not a stable API.

Example (1):

Press left mouse button.

-> { "execute": "input-send-event",
-> { "execute": "x-input-send-event",
"arguments": { "console": 0,
"events": [ { "type": "btn",
"data" : { "down": true, "button": "Left" } } } }
<- { "return": {} }

-> { "execute": "input-send-event",
-> { "execute": "x-input-send-event",
"arguments": { "console": 0,
"events": [ { "type": "btn",
"data" : { "down": false, "button": "Left" } } } }
Expand All @@ -3831,7 +3833,7 @@ Example (2):

Press ctrl-alt-del.

-> { "execute": "input-send-event",
-> { "execute": "x-input-send-event",
"arguments": { "console": 0, "events": [
{ "type": "key", "data" : { "down": true,
"key": {"type": "qcode", "data": "ctrl" } } },
Expand All @@ -3845,7 +3847,7 @@ Example (3):

Move mouse pointer to absolute coordinates (20000, 400).

-> { "execute": "input-send-event" ,
-> { "execute": "x-input-send-event" ,
"arguments": { "console": 0, "events": [
{ "type": "abs", "data" : { "axis": "X", "value" : 20000 } },
{ "type": "abs", "data" : { "axis": "Y", "value" : 400 } } ] } }
Expand Down
4 changes: 2 additions & 2 deletions ui/input.c
Expand Up @@ -122,8 +122,8 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con)
return NULL;
}

void qmp_input_send_event(bool has_console, int64_t console,
InputEventList *events, Error **errp)
void qmp_x_input_send_event(bool has_console, int64_t console,
InputEventList *events, Error **errp)
{
InputEventList *e;
QemuConsole *con;
Expand Down

0 comments on commit df5b2ad

Please sign in to comment.