From patchwork Sun Jun 16 03:39:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 251648 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 883962C00A0 for ; Sun, 16 Jun 2013 13:40:58 +1000 (EST) Received: from localhost ([::1]:41218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3pm-0003Nu-6H for incoming@patchwork.ozlabs.org; Sat, 15 Jun 2013 23:40:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3p9-0003NR-3p for qemu-devel@nongnu.org; Sat, 15 Jun 2013 23:40:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uo3p8-0005LG-7Q for qemu-devel@nongnu.org; Sat, 15 Jun 2013 23:40:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44032 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3p7-0005L3-UM for qemu-devel@nongnu.org; Sat, 15 Jun 2013 23:40:14 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 66257A5077; Sun, 16 Jun 2013 05:40:13 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 16 Jun 2013 05:39:59 +0200 Message-Id: <1371354005-26873-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371354005-26873-1-git-send-email-afaerber@suse.de> References: <1371354005-26873-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Anthony Liguori , Brad Hards , Luiz Capitulino , Gerd Hoffmann , Paolo Bonzini , Ludwig Nussel , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH RFC 2/8] ui/input: Simplify kbd_mouse_event() 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 Now that the field names are bearable, there's no compelling reason to use local variables for the fields. Unify the four callback invokations through variables for the rotated coordinates instead. Signed-off-by: Andreas Färber Reviewed-by: Gerd Hoffmann --- ui/input.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ui/input.c b/ui/input.c index badf6c3..28353b4 100644 --- a/ui/input.c +++ b/ui/input.c @@ -431,9 +431,8 @@ void kbd_put_ledstate(int ledstate) void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) { QEMUPutMouseEntry *entry; - QEMUPutMouseEvent *mouse_event; - void *mouse_event_opaque; int width, height; + int rotated_dx, rotated_dy; if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { return; @@ -444,10 +443,7 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) entry = QTAILQ_FIRST(&mouse_handlers); - mouse_event = entry->put_event; - mouse_event_opaque = entry->opaque; - - if (mouse_event) { + if (entry->put_event) { if (entry->absolute) { width = 0x7fff; height = 0x7fff; @@ -458,22 +454,26 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) switch (graphic_rotate) { case 0: - mouse_event(mouse_event_opaque, - dx, dy, dz, buttons_state); + rotated_dx = dx; + rotated_dy = dy; break; case 90: - mouse_event(mouse_event_opaque, - width - dy, dx, dz, buttons_state); + rotated_dx = width - dy; + rotated_dy = dx; break; case 180: - mouse_event(mouse_event_opaque, - width - dx, height - dy, dz, buttons_state); + rotated_dx = width - dx; + rotated_dy = height - dy; break; case 270: - mouse_event(mouse_event_opaque, - dy, height - dx, dz, buttons_state); + rotated_dx = dy; + rotated_dy = height - dx; break; + default: + return; } + entry->put_event(entry->opaque, + rotated_dx, rotated_dy, dz, buttons_state); } }