From patchwork Fri Dec 23 14:50:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: OGAWA Hirofumi X-Patchwork-Id: 708461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3tlWYy1kl0z9tlB for ; Sat, 24 Dec 2016 01:51:42 +1100 (AEDT) Received: from localhost ([::1]:39521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKRC1-00078f-5Z for incoming@patchwork.ozlabs.org; Fri, 23 Dec 2016 09:51:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKRBL-0006m0-KX for qemu-devel@nongnu.org; Fri, 23 Dec 2016 09:50:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKRBI-0001tK-FX for qemu-devel@nongnu.org; Fri, 23 Dec 2016 09:50:51 -0500 Received: from mail.parknet.co.jp ([210.171.160.6]:38967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKRBI-0001sr-6d for qemu-devel@nongnu.org; Fri, 23 Dec 2016 09:50:48 -0500 Received: from ibmpc.myhome.or.jp (server.parknet.ne.jp [210.171.168.39]) by mail.parknet.co.jp (Postfix) with ESMTP id DA4E11E0049; Fri, 23 Dec 2016 23:50:45 +0900 (JST) Received: from devron.myhome.or.jp (root@devron.myhome.or.jp [192.168.0.3]) by ibmpc.myhome.or.jp (8.15.2/8.15.2/Debian-8) with ESMTPS id uBNEoiGB008602 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2016 23:50:45 +0900 Received: from devron.myhome.or.jp (hirofumi@localhost [127.0.0.1]) by devron.myhome.or.jp (8.15.2/8.15.2/Debian-8) with ESMTPS id uBNEoimK017963 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2016 23:50:44 +0900 Received: (from hirofumi@localhost) by devron.myhome.or.jp (8.15.2/8.15.2/Submit) id uBNEofJq017961; Fri, 23 Dec 2016 23:50:41 +0900 From: OGAWA Hirofumi To: qemu-devel@nongnu.org Date: Fri, 23 Dec 2016 23:50:41 +0900 Message-ID: <87bmw2vgvy.fsf@mail.parknet.co.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 210.171.160.6 Subject: [Qemu-devel] [PATCH] ui/gtk: Fix mouse wheel on 3.4.0 or later 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On 3.4.0 or later, send GDK_SCROLL_SMOOTH event, instead of GDK_SCROLL_UP/DOWN. This fixes it by converting any smooth scroll to up/down. (I.e. without smooth support) Signed-off-by: OGAWA Hirofumi --- ui/gtk.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN ui/gtk.c~mouse-wheel-fix ui/gtk.c --- qemu/ui/gtk.c~mouse-wheel-fix 2016-12-23 23:39:24.419659012 +0900 +++ qemu-hirofumi/ui/gtk.c 2016-12-23 23:39:37.540735673 +0900 @@ -1015,6 +1015,16 @@ static gboolean gd_scroll_event(GtkWidge btn = INPUT_BUTTON_WHEEL_UP; } else if (scroll->direction == GDK_SCROLL_DOWN) { btn = INPUT_BUTTON_WHEEL_DOWN; +#if GTK_CHECK_VERSION(3, 4, 0) + } else if (scroll->direction == GDK_SCROLL_SMOOTH) { + gdouble delta_x, delta_y; + if (!gdk_event_get_scroll_deltas((GdkEvent*)scroll, &delta_x, &delta_y)) + return TRUE; + if (delta_y > 0) + btn = INPUT_BUTTON_WHEEL_DOWN; + else + btn = INPUT_BUTTON_WHEEL_UP; +#endif } else { return TRUE; }