From patchwork Tue Jun 17 16:22:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 360649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D2167140081 for ; Wed, 18 Jun 2014 02:25:29 +1000 (EST) Received: from localhost ([::1]:51823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwCN-0000tx-FP for incoming@patchwork.ozlabs.org; Tue, 17 Jun 2014 12:25:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwBy-0000XD-PI for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwwBr-0003R2-TH for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:25:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwBr-0003Qo-LZ for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:24:55 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5HGOpFI022550 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 17 Jun 2014 12:24:54 -0400 Received: from amt.cnet (vpn1-6-118.gru2.redhat.com [10.97.6.118]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5HGOntp013208; Tue, 17 Jun 2014 12:24:50 -0400 Received: from amt.cnet (localhost [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 3821910038E; Tue, 17 Jun 2014 13:24:37 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.7/8.14.7/Submit) id s5HGOaPq007409; Tue, 17 Jun 2014 13:24:36 -0300 Resent-From: Marcelo Tosatti Resent-Date: Tue, 17 Jun 2014 13:24:28 -0300 Resent-Message-ID: <20140617162428.GB6405@amt.cnet> Resent-To: kraxel@redhat.com, qemu-devel@nongnu.org, eblake@redhat.com Date: Tue, 17 Jun 2014 13:22:09 -0300 From: Marcelo Tosatti To: Gerd Hoffmann Message-ID: <20140617162209.GA6405@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id s5HGOpFI022550 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Luiz Capitulino , emu-devel , Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2] add input-send-event command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Which allows specification of absolute/relative, up/down and console parameters. Suggested by Gerd Hoffman. Signed-off-by: Marcelo Tosatti Reviewed-by: Eric Blake --- qapi-schema.json | 18 +++++++++++++++ qmp-commands.hx | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/input.c | 31 +++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) Index: qemu/qapi-schema.json =================================================================== --- qemu.orig/qapi-schema.json 2014-06-17 12:49:55.427233304 -0300 +++ qemu/qapi-schema.json 2014-06-17 12:49:56.525230400 -0300 @@ -4722,3 +4722,21 @@ 'btn' : 'InputBtnEvent', 'rel' : 'InputMoveEvent', 'abs' : 'InputMoveEvent' } } + +## +# @input-send-event +# +# Send input event(s) to guest. +# +# @console: Which console to send event(s) to. +# +# @events: List of InputEvent union. +# +# Returns: Nothing on success. +# +# Since: 2.1 +# +## +{ 'command': 'input-send-event', + 'data': { 'console':'int', 'events': [ 'InputEvent' ] } } + Index: qemu/qmp-commands.hx =================================================================== --- qemu.orig/qmp-commands.hx 2014-06-17 12:49:55.429233299 -0300 +++ qemu/qmp-commands.hx 2014-06-17 13:16:42.073873217 -0300 @@ -3572,3 +3572,66 @@ } } ] } EQMP + + { + .name = "input-send-event", + .args_type = "console:i,events:q", + .mhandler.cmd_new = qmp_marshal_input_input_send_event, + }, + +SQMP +@input-send-event +----------------- + +Send input event to guest. + +Arguments: + +- "console": console index. +- "events": list of input events. + +The consoles are visible in the qom tree, under +/backend/console[$index]. They have a device link and head property, so +its possible to map which console belongs to which device and display. + +Example (1): + +Press left mouse button. + +-> { "execute": "input-send-event", + "arguments": { "console": 0, + "events": [ { "type": "btn", + "data" : { "down": true, "button": "Left" } } } } +<- { "return": {} } + +-> { "execute": "input-send-event", + "arguments": { "console": 0, + "events": [ { "type": "btn", + "data" : { "down": false, "button": "Left" } } } } +<- { "return": {} } + +Example (2): + +Press ctrl-alt-del. + +-> { "execute": "input-send-event", + "arguments": { "console": 0, "events": [ + { "type": "key", "data" : { "down": true, + "key": {"type": "qcode", "data": "ctrl" } } }, + { "type": "key", "data" : { "down": true, + "key": {"type": "qcode", "data": "alt" } } }, + { "type": "key", "data" : { "down": true, + "key": {"type": "qcode", "data": "delete" } } } ] } } +<- { "return": {} } + +Example (3): + +Move mouse pointer to absolute coordinates (20000, 400). + +-> { "execute": "input-send-event" , + "arguments": { "console": 0, "events": [ + { "type": "abs", "data" : { "axis": "X", "value" : 20000 } }, + { "type": "abs", "data" : { "axis": "Y", "value" : 400 } } ] } } +<- { "return": {} } + +EQMP Index: qemu/ui/input.c =================================================================== --- qemu.orig/ui/input.c 2014-06-17 12:43:43.000000000 -0300 +++ qemu/ui/input.c 2014-06-17 13:17:16.403779074 -0300 @@ -102,6 +102,37 @@ return NULL; } +void qmp_input_send_event(int64_t console, InputEventList *events, + Error **errp) +{ + InputEventList *e; + QemuConsole *con; + + con = qemu_console_lookup_by_index(console); + if (!con) { + error_setg(errp, "console %" PRId64 " not found", console); + return; + } + + if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { + error_setg(errp, "VM not running"); + return; + } + + for (e = events; e != NULL; e = e->next) { + InputEvent *event = e->value; + + if (!qemu_input_find_handler(1 << event->kind, con)) { + error_setg(errp, "Input handler not found for " + "event type %s", + InputEventKind_lookup[event->kind]); + return; + } + qemu_input_event_send(con, event); + } + qemu_input_event_sync(); +} + static void qemu_input_transform_abs_rotate(InputEvent *evt) { switch (graphic_rotate) {