From patchwork Tue Aug 31 14:32:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 63273 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE0B0B7139 for ; Wed, 1 Sep 2010 00:48:16 +1000 (EST) Received: from localhost ([127.0.0.1]:44323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqS8B-0004A2-Tx for incoming@patchwork.ozlabs.org; Tue, 31 Aug 2010 10:48:12 -0400 Received: from [140.186.70.92] (port=36793 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqRtJ-0001SC-EC for qemu-devel@nongnu.org; Tue, 31 Aug 2010 10:33:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqRt8-0002ru-Vk for qemu-devel@nongnu.org; Tue, 31 Aug 2010 10:32:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1027) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqRt8-0002rQ-NH for qemu-devel@nongnu.org; Tue, 31 Aug 2010 10:32:38 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7VEWc2f008500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 Aug 2010 10:32:38 -0400 Received: from rincewind.home.kraxel.org (vpn1-5-233.ams2.redhat.com [10.36.5.233]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7VEWY2S002329; Tue, 31 Aug 2010 10:32:36 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id C2F17412A7; Tue, 31 Aug 2010 16:32:29 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 31 Aug 2010 16:32:26 +0200 Message-Id: <1283265148-15977-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1283265148-15977-1-git-send-email-kraxel@redhat.com> References: <1283265148-15977-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v5 08/10] spice: add mouse X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Open mouse channel. Now you can move the guests mouse pointer. No tablet / absolute positioning (yet) though. Signed-off-by: Gerd Hoffmann --- ui/spice-input.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/ui/spice-input.c b/ui/spice-input.c index 5538a79..91cf18d 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -74,12 +74,64 @@ static void kbd_leds(void *opaque, int ledstate) spice_server_kbd_leds(&kbd->sin, ledstate); } +/* mouse bits */ + +typedef struct QemuSpiceMouse { + SpiceMouseInstance sin; +} QemuSpiceMouse; + +static int map_buttons(int spice_buttons) +{ + int qemu_buttons = 0; + + /* + * Note: SPICE_MOUSE_BUTTON_* specifies the wire protocol but this + * isn't what we get passed in via interface callbacks for the + * middle and right button ... + */ + if (spice_buttons & SPICE_MOUSE_BUTTON_MASK_LEFT) { + qemu_buttons |= MOUSE_EVENT_LBUTTON; + } + if (spice_buttons & 0x04 /* SPICE_MOUSE_BUTTON_MASK_MIDDLE */) { + qemu_buttons |= MOUSE_EVENT_MBUTTON; + } + if (spice_buttons & 0x02 /* SPICE_MOUSE_BUTTON_MASK_RIGHT */) { + qemu_buttons |= MOUSE_EVENT_RBUTTON; + } + return qemu_buttons; +} + +static void mouse_motion(SpiceMouseInstance *sin, int dx, int dy, int dz, + uint32_t buttons_state) +{ + kbd_mouse_event(dx, dy, dz, map_buttons(buttons_state)); +} + +static void mouse_buttons(SpiceMouseInstance *sin, uint32_t buttons_state) +{ + kbd_mouse_event(0, 0, 0, map_buttons(buttons_state)); +} + +static const SpiceMouseInterface mouse_interface = { + .base.type = SPICE_INTERFACE_MOUSE, + .base.description = "mouse", + .base.major_version = SPICE_INTERFACE_MOUSE_MAJOR, + .base.minor_version = SPICE_INTERFACE_MOUSE_MINOR, + .motion = mouse_motion, + .buttons = mouse_buttons, +}; + void qemu_spice_input_init(void) { QemuSpiceKbd *kbd; + QemuSpiceMouse *mouse; kbd = qemu_mallocz(sizeof(*kbd)); kbd->sin.base.sif = &kbd_interface.base; qemu_spice_add_interface(&kbd->sin.base); qemu_add_led_event_handler(kbd_leds, kbd); + + mouse = qemu_mallocz(sizeof(*mouse)); + mouse->sin.base.sif = &mouse_interface.base; + qemu_spice_add_interface(&mouse->sin.base); }