From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37226 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OovjK-00079o-Tp for qemu-devel@nongnu.org; Fri, 27 Aug 2010 06:00:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OovjE-0008TX-Pu for qemu-devel@nongnu.org; Fri, 27 Aug 2010 06:00:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33875) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OovjE-0008TN-Jn for qemu-devel@nongnu.org; Fri, 27 Aug 2010 06:00:08 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7RA07oT030017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 Aug 2010 06:00:07 -0400 From: Gerd Hoffmann Date: Fri, 27 Aug 2010 11:59:57 +0200 Message-Id: <1282903199-30669-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1282903199-30669-1-git-send-email-kraxel@redhat.com> References: <1282903199-30669-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v4 08/10] spice: add mouse List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/ui/spice-input.c b/ui/spice-input.c index efecc22..afb4d61 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -71,12 +71,61 @@ 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); } -- 1.7.1