From patchwork Wed Apr 14 09:55:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 50140 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 3733DB7D0E for ; Wed, 14 Apr 2010 20:22:29 +1000 (EST) Received: from localhost ([127.0.0.1]:53203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1zjd-00053R-Uu for incoming@patchwork.ozlabs.org; Wed, 14 Apr 2010 06:22:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1zKd-0004FD-5z for qemu-devel@nongnu.org; Wed, 14 Apr 2010 05:56:27 -0400 Received: from [140.186.70.92] (port=47850 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1zKI-000455-52 for qemu-devel@nongnu.org; Wed, 14 Apr 2010 05:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1zKD-0007xc-GM for qemu-devel@nongnu.org; Wed, 14 Apr 2010 05:56:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31823) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1zK0-0007vP-Hz for qemu-devel@nongnu.org; Wed, 14 Apr 2010 05:56:00 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3E9tlh4029249 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Apr 2010 05:55:47 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-70.ams2.redhat.com [10.36.4.70]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3E9tXrV026124; Wed, 14 Apr 2010 05:55:36 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id C487F70124; Wed, 14 Apr 2010 11:55:23 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 14 Apr 2010 11:55:21 +0200 Message-Id: <1271238922-10008-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1271238922-10008-1-git-send-email-kraxel@redhat.com> References: <1271238922-10008-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [RfC PATCH 10/11] spice: add tablet support 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 --- spice-display.c | 2 +- spice-input.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/spice-display.c b/spice-display.c index 44c259d..d741d1d 100644 --- a/spice-display.c +++ b/spice-display.c @@ -149,7 +149,7 @@ void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd) surface.width = ds_get_width(ssd->ds); surface.height = ds_get_height(ssd->ds); surface.stride = -surface.width * 4; - surface.mouse_mode = 0; + surface.mouse_mode = true; surface.flags = 0; surface.type = 0; surface.mem = (intptr_t)ssd->buf; diff --git a/spice-input.c b/spice-input.c index c22ab53..6207ca2 100644 --- a/spice-input.c +++ b/spice-input.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -48,9 +49,13 @@ static void kbd_leds(void *opaque, int ledstate) /* mouse bits */ -typedef struct QemuSpiceMouse { - SpiceMouseInstance sin; -} QemuSpiceMouse; +typedef struct QemuSpicePointer { + SpiceMouseInstance mouse; + SpiceTabletInstance tablet; + int width, height, x, y; + Notifier mouse_mode; + bool absolute; +} QemuSpicePointer; static void mouse_motion(SpiceMouseInstance *sin, int dx, int dy, int dz, uint32_t buttons_state) @@ -72,17 +77,93 @@ static SpiceMouseInterface mouse_interface = { .buttons = mouse_buttons, }; +static void tablet_set_logical_size(SpiceTabletInstance* sin, int width, int height) +{ + QemuSpicePointer *pointer = container_of(sin, QemuSpicePointer, tablet); + + fprintf(stderr, "%s: %dx%d\n", __FUNCTION__, width, height); + pointer->width = width; + pointer->height = height; +} + +static void tablet_position(SpiceTabletInstance* sin, int x, int y, + uint32_t buttons_state) +{ + QemuSpicePointer *pointer = container_of(sin, QemuSpicePointer, tablet); + + pointer->x = x * 0x7FFF / (pointer->width - 1); + pointer->y = y * 0x7FFF / (pointer->height - 1); + kbd_mouse_event(pointer->x, pointer->y, 0, buttons_state); +} + + +static void tablet_wheel(SpiceTabletInstance* sin, int wheel, + uint32_t buttons_state) +{ + QemuSpicePointer *pointer = container_of(sin, QemuSpicePointer, tablet); + + kbd_mouse_event(pointer->x, pointer->y, wheel, buttons_state); +} + +static void tablet_buttons(SpiceTabletInstance *sin, + uint32_t buttons_state) +{ + QemuSpicePointer *pointer = container_of(sin, QemuSpicePointer, tablet); + + kbd_mouse_event(pointer->x, pointer->y, 0, buttons_state); +} + +static SpiceTabletInterface tablet_interface = { + .base.type = SPICE_INTERFACE_TABLET, + .base.description = "tablet", + .base.major_version = SPICE_INTERFACE_TABLET_MAJOR, + .base.minor_version = SPICE_INTERFACE_TABLET_MINOR, + .set_logical_size = tablet_set_logical_size, + .position = tablet_position, + .wheel = tablet_wheel, + .buttons = tablet_buttons, +}; + +static void mouse_mode_notifier(Notifier *notifier) +{ + QemuSpicePointer *pointer = container_of(notifier, QemuSpicePointer, mouse_mode); + bool is_absolute = kbd_mouse_is_absolute(); + bool has_absolute = kbd_mouse_has_absolute(); + + fprintf(stderr, "%s: absolute pointer: %s%s\n", __FUNCTION__, + has_absolute ? "present" : "not available", + is_absolute ? "+active" : ""); + + if (pointer->absolute == is_absolute) + return; + + if (is_absolute) { + fprintf(stderr, "%s: using absolute pointer (client mode)\n", __FUNCTION__); + spice_server_add_interface(spice_server, &pointer->tablet.base); + } else { + fprintf(stderr, "%s: using relative pointer (server mode)\n", __FUNCTION__); + spice_server_remove_interface(&pointer->tablet.base); + } + pointer->absolute = is_absolute; +} + void qemu_spice_input_init(void) { QemuSpiceKbd *kbd; - QemuSpiceMouse *mouse; + QemuSpicePointer *pointer; kbd = qemu_mallocz(sizeof(*kbd)); kbd->sin.base.sif = &kbd_interface.base; spice_server_add_interface(spice_server, &kbd->sin.base); qemu_add_led_event_handler(kbd_leds, kbd); - mouse = qemu_mallocz(sizeof(*mouse)); - mouse->sin.base.sif = &mouse_interface.base; - spice_server_add_interface(spice_server, &mouse->sin.base); + pointer = qemu_mallocz(sizeof(*pointer)); + pointer->mouse.base.sif = &mouse_interface.base; + pointer->tablet.base.sif = &tablet_interface.base; + spice_server_add_interface(spice_server, &pointer->mouse.base); + + pointer->absolute = false; + pointer->mouse_mode.notify = mouse_mode_notifier; + qemu_add_mouse_mode_change_notifier(&pointer->mouse_mode); + mouse_mode_notifier(&pointer->mouse_mode); }