From patchwork Sun Jun 16 03:39:58 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: 251647 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 5CEB62C0087 for ; Sun, 16 Jun 2013 13:40:58 +1000 (EST) Received: from localhost ([::1]:41219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3pm-0003O7-Aa for incoming@patchwork.ozlabs.org; Sat, 15 Jun 2013 23:40:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3p9-0003NS-3s 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-0005LF-6p for qemu-devel@nongnu.org; Sat, 15 Jun 2013 23:40:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44025 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo3p7-0005Ky-UJ for qemu-devel@nongnu.org; Sat, 15 Jun 2013 23:40:14 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 95E49A4EB7; Sun, 16 Jun 2013 05:40:12 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 16 Jun 2013 05:39:58 +0200 Message-Id: <1371354005-26873-2-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 1/8] ui/input: Clean up QEMUPutMouseEntry struct 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 Shorten field names to not duplicate struct name. Signed-off-by: Andreas Färber Reviewed-by: Gerd Hoffmann --- ui/input.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ui/input.c b/ui/input.c index 92c44ca..badf6c3 100644 --- a/ui/input.c +++ b/ui/input.c @@ -31,10 +31,10 @@ #include "ui/keymaps.h" struct QEMUPutMouseEntry { - QEMUPutMouseEvent *qemu_put_mouse_event; - void *qemu_put_mouse_event_opaque; - int qemu_put_mouse_event_absolute; - char *qemu_put_mouse_event_name; + QEMUPutMouseEvent *put_event; + void *opaque; + int absolute; + char *name; int index; @@ -355,10 +355,10 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, s = g_malloc0(sizeof(QEMUPutMouseEntry)); - s->qemu_put_mouse_event = func; - s->qemu_put_mouse_event_opaque = opaque; - s->qemu_put_mouse_event_absolute = absolute; - s->qemu_put_mouse_event_name = g_strdup(name); + s->put_event = func; + s->opaque = opaque; + s->absolute = absolute; + s->name = g_strdup(name); s->index = mouse_index++; QTAILQ_INSERT_TAIL(&mouse_handlers, s, node); @@ -380,7 +380,7 @@ void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry) { QTAILQ_REMOVE(&mouse_handlers, entry, node); - g_free(entry->qemu_put_mouse_event_name); + g_free(entry->name); g_free(entry); check_mode_change(); @@ -444,11 +444,11 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) entry = QTAILQ_FIRST(&mouse_handlers); - mouse_event = entry->qemu_put_mouse_event; - mouse_event_opaque = entry->qemu_put_mouse_event_opaque; + mouse_event = entry->put_event; + mouse_event_opaque = entry->opaque; if (mouse_event) { - if (entry->qemu_put_mouse_event_absolute) { + if (entry->absolute) { width = 0x7fff; height = 0x7fff; } else { @@ -483,7 +483,7 @@ int kbd_mouse_is_absolute(void) return 0; } - return QTAILQ_FIRST(&mouse_handlers)->qemu_put_mouse_event_absolute; + return QTAILQ_FIRST(&mouse_handlers)->absolute; } int kbd_mouse_has_absolute(void) @@ -491,7 +491,7 @@ int kbd_mouse_has_absolute(void) QEMUPutMouseEntry *entry; QTAILQ_FOREACH(entry, &mouse_handlers, node) { - if (entry->qemu_put_mouse_event_absolute) { + if (entry->absolute) { return 1; } } @@ -508,9 +508,9 @@ MouseInfoList *qmp_query_mice(Error **errp) QTAILQ_FOREACH(cursor, &mouse_handlers, node) { MouseInfoList *info = g_malloc0(sizeof(*info)); info->value = g_malloc0(sizeof(*info->value)); - info->value->name = g_strdup(cursor->qemu_put_mouse_event_name); + info->value->name = g_strdup(cursor->name); info->value->index = cursor->index; - info->value->absolute = !!cursor->qemu_put_mouse_event_absolute; + info->value->absolute = !!cursor->absolute; info->value->current = current; current = false;