From patchwork Tue Jul 12 08:21:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9224799 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9FAD260868 for ; Tue, 12 Jul 2016 08:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 912C727F17 for ; Tue, 12 Jul 2016 08:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85FEC27F7F; Tue, 12 Jul 2016 08:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 209BE27E63 for ; Tue, 12 Jul 2016 08:29:10 +0000 (UTC) Received: from localhost ([::1]:38383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMt41-0006LD-RF for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 04:29:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMsx1-0007RS-7P for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMswx-00049A-Rn for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMswx-000493-Jx for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:51 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47909C01AC7E for ; Tue, 12 Jul 2016 08:21:51 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6C8LlZO015908; Tue, 12 Jul 2016 04:21:49 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 87C2480F76; Tue, 12 Jul 2016 10:21:45 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 10:21:38 +0200 Message-Id: <1468311703-27209-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1468311703-27209-1-git-send-email-kraxel@redhat.com> References: <1468311703-27209-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 12 Jul 2016 08:21:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/8] msmouse: switch to new input interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gerd Hoffmann Message-id: 1467625375-31774-4-git-send-email-kraxel@redhat.com --- backends/msmouse.c | 68 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/backends/msmouse.c b/backends/msmouse.c index 9ade31b..b1e1bea 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c @@ -25,13 +25,16 @@ #include "qemu-common.h" #include "sysemu/char.h" #include "ui/console.h" +#include "ui/input.h" #define MSMOUSE_LO6(n) ((n) & 0x3f) #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) typedef struct { CharDriverState *chr; - QEMUPutMouseEntry *entry; + QemuInputHandlerState *hs; + int axis[INPUT_AXIS__MAX]; + bool btns[INPUT_BUTTON__MAX]; uint8_t outbuf[32]; int outlen; } MouseState; @@ -56,12 +59,16 @@ static void msmouse_chr_accept_input(CharDriverState *chr) } } -static void msmouse_event(void *opaque, - int dx, int dy, int dz, int buttons_state) +static void msmouse_queue_event(MouseState *mouse) { - CharDriverState *chr = (CharDriverState *)opaque; - MouseState *mouse = chr->opaque; unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 }; + int dx, dy; + + dx = mouse->axis[INPUT_AXIS_X]; + mouse->axis[INPUT_AXIS_X] = 0; + + dy = mouse->axis[INPUT_AXIS_Y]; + mouse->axis[INPUT_AXIS_Y] = 0; /* Movement deltas */ bytes[0] |= (MSMOUSE_HI2(dy) << 2) | MSMOUSE_HI2(dx); @@ -69,9 +76,9 @@ static void msmouse_event(void *opaque, bytes[2] |= MSMOUSE_LO6(dy); /* Buttons */ - bytes[0] |= (buttons_state & 0x01 ? 0x20 : 0x00); - bytes[0] |= (buttons_state & 0x02 ? 0x10 : 0x00); - bytes[3] |= (buttons_state & 0x04 ? 0x20 : 0x00); + bytes[0] |= (mouse->btns[INPUT_BUTTON_LEFT] ? 0x20 : 0x00); + bytes[0] |= (mouse->btns[INPUT_BUTTON_RIGHT] ? 0x10 : 0x00); + bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00); if (mouse->outlen <= sizeof(mouse->outbuf) - 4) { /* We always send the packet of, so that we do not have to keep track @@ -82,8 +89,38 @@ static void msmouse_event(void *opaque, } else { /* queue full -> drop event */ } +} - msmouse_chr_accept_input(chr); +static void msmouse_input_event(DeviceState *dev, QemuConsole *src, + InputEvent *evt) +{ + MouseState *mouse = (MouseState *)dev; + InputMoveEvent *move; + InputBtnEvent *btn; + + switch (evt->type) { + case INPUT_EVENT_KIND_REL: + move = evt->u.rel.data; + mouse->axis[move->axis] += move->value; + break; + + case INPUT_EVENT_KIND_BTN: + btn = evt->u.btn.data; + mouse->btns[btn->button] = btn->down; + break; + + default: + /* keep gcc happy */ + break; + } +} + +static void msmouse_input_sync(DeviceState *dev) +{ + MouseState *mouse = (MouseState *)dev; + + msmouse_queue_event(mouse); + msmouse_chr_accept_input(mouse->chr); } static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int len) @@ -96,11 +133,18 @@ static void msmouse_chr_close (struct CharDriverState *chr) { MouseState *mouse = chr->opaque; - qemu_remove_mouse_event_handler(mouse->entry); + qemu_input_handler_unregister(mouse->hs); g_free(mouse); g_free(chr); } +static QemuInputHandler msmouse_handler = { + .name = "QEMU Microsoft Mouse", + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL, + .event = msmouse_input_event, + .sync = msmouse_input_sync, +}; + static CharDriverState *qemu_chr_open_msmouse(const char *id, ChardevBackend *backend, ChardevReturn *ret, @@ -117,8 +161,8 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, chr->explicit_be_open = true; mouse = g_new0(MouseState, 1); - mouse->entry = qemu_add_mouse_event_handler(msmouse_event, chr, 0, - "QEMU Microsoft Mouse"); + mouse->hs = qemu_input_handler_register((DeviceState *)mouse, + &msmouse_handler); mouse->chr = chr; chr->opaque = mouse;