From patchwork Tue Jul 12 08:21:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9224771 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 B417060871 for ; Tue, 12 Jul 2016 08:22:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4B7427E63 for ; Tue, 12 Jul 2016 08:22:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9171D27E66; Tue, 12 Jul 2016 08:22:26 +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 23E3E27E66 for ; Tue, 12 Jul 2016 08:22:25 +0000 (UTC) Received: from localhost ([::1]:38348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMsxU-0007SB-Kt for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 04:22:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMsx1-0007RU-7R 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-00048y-7L for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMswx-00048i-1t for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:51 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 B2862C01AC7E for ; Tue, 12 Jul 2016 08:21:50 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6C8LlbJ001185; Tue, 12 Jul 2016 04:21:49 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 967CB80F9F; Tue, 12 Jul 2016 10:21:45 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 10:21:39 +0200 Message-Id: <1468311703-27209-5-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.23 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:50 +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 4/8] msmouse: send short messages if possible. 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 Keep track of button changes. Send the extended 4-byte messages for three button mice only in case we have something to report for the middle button. Use the short 3-byte messages (original protocol for two-button microsoft mouse) otherwise. Signed-off-by: Gerd Hoffmann Message-id: 1467625375-31774-5-git-send-email-kraxel@redhat.com --- backends/msmouse.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/backends/msmouse.c b/backends/msmouse.c index b1e1bea..aeb9055 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c @@ -35,6 +35,7 @@ typedef struct { QemuInputHandlerState *hs; int axis[INPUT_AXIS__MAX]; bool btns[INPUT_BUTTON__MAX]; + bool btnc[INPUT_BUTTON__MAX]; uint8_t outbuf[32]; int outlen; } MouseState; @@ -62,7 +63,7 @@ static void msmouse_chr_accept_input(CharDriverState *chr) static void msmouse_queue_event(MouseState *mouse) { unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 }; - int dx, dy; + int dx, dy, count = 3; dx = mouse->axis[INPUT_AXIS_X]; mouse->axis[INPUT_AXIS_X] = 0; @@ -78,14 +79,16 @@ static void msmouse_queue_event(MouseState *mouse) /* Buttons */ 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->btns[INPUT_BUTTON_MIDDLE] || + mouse->btnc[INPUT_BUTTON_MIDDLE]) { + bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00); + mouse->btnc[INPUT_BUTTON_MIDDLE] = false; + count = 4; + } - if (mouse->outlen <= sizeof(mouse->outbuf) - 4) { - /* We always send the packet of, so that we do not have to keep track - of previous state of the middle button. This can potentially confuse - some very old drivers for two button mice though. */ - memcpy(mouse->outbuf + mouse->outlen, bytes, 4); - mouse->outlen += 4; + if (mouse->outlen <= sizeof(mouse->outbuf) - count) { + memcpy(mouse->outbuf + mouse->outlen, bytes, count); + mouse->outlen += count; } else { /* queue full -> drop event */ } @@ -107,6 +110,7 @@ static void msmouse_input_event(DeviceState *dev, QemuConsole *src, case INPUT_EVENT_KIND_BTN: btn = evt->u.btn.data; mouse->btns[btn->button] = btn->down; + mouse->btnc[btn->button] = true; break; default: