From patchwork Wed Jan 22 16:20:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 313342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 85D892C00A8 for ; Thu, 23 Jan 2014 04:43:58 +1100 (EST) Received: from localhost ([::1]:36183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W60lf-0000xX-Hw for incoming@patchwork.ozlabs.org; Wed, 22 Jan 2014 11:35:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W60YD-0006Xf-Uo for qemu-devel@nongnu.org; Wed, 22 Jan 2014 11:21:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W60Y3-0005ti-37 for qemu-devel@nongnu.org; Wed, 22 Jan 2014 11:21:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W60Y2-0005tU-RN for qemu-devel@nongnu.org; Wed, 22 Jan 2014 11:21:03 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0MGL1Rt028055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 22 Jan 2014 11:21:01 -0500 Received: from nilsson.home.kraxel.org (vpn1-5-23.ams2.redhat.com [10.36.5.23]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0MGKwsB013354; Wed, 22 Jan 2014 11:21:00 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 545DB80ED8; Wed, 22 Jan 2014 17:20:55 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 22 Jan 2014 17:20:39 +0100 Message-Id: <1390407647-8659-35-git-send-email-kraxel@redhat.com> In-Reply-To: <1390407647-8659-1-git-send-email-kraxel@redhat.com> References: <1390407647-8659-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , Anthony Liguori Subject: [Qemu-devel] [PATCH v2 34/42] input-legacy: remove kbd_mouse_is_absolute X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- include/ui/console.h | 1 - ui/input-legacy.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 53e956d..21b32e4 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -50,7 +50,6 @@ void kbd_put_ledstate(int ledstate); void kbd_mouse_event(int dx, int dy, int dz, int buttons_state); /* Does the current mouse generate absolute events */ -int kbd_mouse_is_absolute(void); void qemu_add_mouse_mode_change_notifier(Notifier *notify); void qemu_remove_mouse_mode_change_notifier(Notifier *notify); diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 22796fa..412d401 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -369,7 +369,7 @@ static void check_mode_change(void) static int current_is_absolute; int is_absolute; - is_absolute = kbd_mouse_is_absolute(); + is_absolute = qemu_input_is_absolute(); if (is_absolute != current_is_absolute) { notifier_list_notify(&mouse_mode_notifiers, NULL); @@ -554,15 +554,6 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) } } -int kbd_mouse_is_absolute(void) -{ - if (QTAILQ_EMPTY(&mouse_handlers)) { - return 0; - } - - return QTAILQ_FIRST(&mouse_handlers)->qemu_put_mouse_event_absolute; -} - MouseInfoList *qmp_query_mice(Error **errp) { MouseInfoList *mice_list = NULL;