From patchwork Tue Mar 1 08:22:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 8463021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C4A6E9F9A0 for ; Tue, 1 Mar 2016 08:24:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D300520304 for ; Tue, 1 Mar 2016 08:24:49 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 110EF202EC for ; Tue, 1 Mar 2016 08:24:48 +0000 (UTC) Received: from localhost ([::1]:41583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafbr-0002IM-DY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 01 Mar 2016 03:24:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafaG-00089x-0t for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aafaD-0002VN-4B for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafaC-0002VG-R0 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:05 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 73D12486A2; Tue, 1 Mar 2016 08:23:04 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u218N2RU011633; Tue, 1 Mar 2016 03:23:03 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 0E10A808DA; Tue, 1 Mar 2016 09:23:02 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 1 Mar 2016 09:22:58 +0100 Message-Id: <1456820580-19156-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1456820580-19156-1-git-send-email-kraxel@redhat.com> References: <1456820580-19156-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , "Michael S. Tsirkin" , Michael Roth , Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann , Luiz Capitulino Subject: [Qemu-devel] [PULL 3/5] qapi: rename input buttons 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All lowercase, use-dash instead of CamelCase. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake --- hw/input/hid.c | 4 ++-- hw/input/ps2.c | 4 ++-- hw/input/virtio-input-hid.c | 4 ++-- monitor.c | 2 +- qapi-schema.json | 5 +---- qmp-commands.hx | 4 ++-- scripts/qapi.py | 1 - ui/cocoa.m | 4 ++-- ui/gtk.c | 4 ++-- ui/input-legacy.c | 4 ++-- ui/sdl.c | 4 ++-- ui/sdl2.c | 4 ++-- ui/spice-input.c | 4 ++-- ui/vnc.c | 4 ++-- 14 files changed, 24 insertions(+), 28 deletions(-) diff --git a/hw/input/hid.c b/hw/input/hid.c index b41efbb..81a85fb 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -140,9 +140,9 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src, case INPUT_EVENT_KIND_BTN: if (evt->u.btn->down) { e->buttons_state |= bmap[evt->u.btn->button]; - if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) { + if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) { e->dz--; - } else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) { + } else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) { e->dz++; } } else { diff --git a/hw/input/ps2.c b/hw/input/ps2.c index b6f0e8d..1bd0dde 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -406,9 +406,9 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, case INPUT_EVENT_KIND_BTN: if (evt->u.btn->down) { s->mouse_buttons |= bmap[evt->u.btn->button]; - if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) { + if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) { s->mouse_dz--; - } else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) { + } else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) { s->mouse_dz++; } } else { diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index c4af0be..9ca5395 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -143,8 +143,8 @@ static const unsigned int keymap_button[INPUT_BUTTON__MAX] = { [INPUT_BUTTON_LEFT] = BTN_LEFT, [INPUT_BUTTON_RIGHT] = BTN_RIGHT, [INPUT_BUTTON_MIDDLE] = BTN_MIDDLE, - [INPUT_BUTTON_WHEELUP] = BTN_GEAR_UP, - [INPUT_BUTTON_WHEELDOWN] = BTN_GEAR_DOWN, + [INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP, + [INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN, }; static const unsigned int axismap_rel[INPUT_AXIS__MAX] = { diff --git a/monitor.c b/monitor.c index 73eac17..e99ca8c 100644 --- a/monitor.c +++ b/monitor.c @@ -1375,7 +1375,7 @@ static void hmp_mouse_move(Monitor *mon, const QDict *qdict) if (dz_str) { dz = strtol(dz_str, NULL, 0); if (dz != 0) { - button = (dz > 0) ? INPUT_BUTTON_WHEELUP : INPUT_BUTTON_WHEELDOWN; + button = (dz > 0) ? INPUT_BUTTON_WHEEL_UP : INPUT_BUTTON_WHEEL_DOWN; qemu_input_queue_btn(NULL, button, true); qemu_input_event_sync(); qemu_input_queue_btn(NULL, button, false); diff --git a/qapi-schema.json b/qapi-schema.json index b632239..011fdb6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3743,12 +3743,9 @@ # Button of a pointer input device (mouse, tablet). # # Since: 2.0 -# -# Note that the spelling of these values may change when the -# x-input-send-event is promoted out of experimental status. ## { 'enum' : 'InputButton', - 'data' : [ 'Left', 'Middle', 'Right', 'WheelUp', 'WheelDown' ] } + 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down' ] } ## # @InputAxis diff --git a/qmp-commands.hx b/qmp-commands.hx index b1a2b97..cd4d142 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4688,13 +4688,13 @@ Press left mouse button. -> { "execute": "x-input-send-event", "arguments": { "device": "video0", "events": [ { "type": "btn", - "data" : { "down": true, "button": "Left" } } ] } } + "data" : { "down": true, "button": "left" } } ] } } <- { "return": {} } -> { "execute": "x-input-send-event", "arguments": { "device": "video0", "events": [ { "type": "btn", - "data" : { "down": false, "button": "Left" } } ] } } + "data" : { "down": false, "button": "left" } } ] } } <- { "return": {} } Example (2): diff --git a/scripts/qapi.py b/scripts/qapi.py index 8497777..941d7c9 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -67,7 +67,6 @@ case_whitelist = [ 'CpuInfoMIPS', # PC, visible through query-cpu 'CpuInfoTricore', # PC, visible through query-cpu 'InputAxis', # TODO: drop when x-input-send-event is fixed - 'InputButton', # TODO: drop when x-input-send-event is fixed 'QapiErrorClass', # all members, visible through errors 'UuidInfo', # UUID, visible through query-uuid 'X86CPURegister32', # all members, visible indirectly through qom-get diff --git a/ui/cocoa.m b/ui/cocoa.m index 3ee5549..7063a02 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -739,8 +739,8 @@ QemuCocoaView *cocoaView; [INPUT_BUTTON_LEFT] = MOUSE_EVENT_LBUTTON, [INPUT_BUTTON_MIDDLE] = MOUSE_EVENT_MBUTTON, [INPUT_BUTTON_RIGHT] = MOUSE_EVENT_RBUTTON, - [INPUT_BUTTON_WHEELUP] = MOUSE_EVENT_WHEELUP, - [INPUT_BUTTON_WHEELDOWN] = MOUSE_EVENT_WHEELDN, + [INPUT_BUTTON_WHEEL_UP] = MOUSE_EVENT_WHEELUP, + [INPUT_BUTTON_WHEEL_DOWN] = MOUSE_EVENT_WHEELDN, }; qemu_input_update_buttons(dcl->con, bmap, last_buttons, buttons); last_buttons = buttons; diff --git a/ui/gtk.c b/ui/gtk.c index 3773826..38ef3fd 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -966,9 +966,9 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll, InputButton btn; if (scroll->direction == GDK_SCROLL_UP) { - btn = INPUT_BUTTON_WHEELUP; + btn = INPUT_BUTTON_WHEEL_UP; } else if (scroll->direction == GDK_SCROLL_DOWN) { - btn = INPUT_BUTTON_WHEELDOWN; + btn = INPUT_BUTTON_WHEEL_DOWN; } else { return TRUE; } diff --git a/ui/input-legacy.c b/ui/input-legacy.c index c97eac1..703f0a6 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -158,7 +158,7 @@ static void legacy_mouse_event(DeviceState *dev, QemuConsole *src, } else { s->buttons &= ~bmap[evt->u.btn->button]; } - if (evt->u.btn->down && evt->u.btn->button == INPUT_BUTTON_WHEELUP) { + if (evt->u.btn->down && evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) { s->qemu_put_mouse_event(s->qemu_put_mouse_event_opaque, s->axis[INPUT_AXIS_X], s->axis[INPUT_AXIS_Y], @@ -166,7 +166,7 @@ static void legacy_mouse_event(DeviceState *dev, QemuConsole *src, s->buttons); } if (evt->u.btn->down && - evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) { + evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) { s->qemu_put_mouse_event(s->qemu_put_mouse_event_opaque, s->axis[INPUT_AXIS_X], s->axis[INPUT_AXIS_Y], diff --git a/ui/sdl.c b/ui/sdl.c index 9804ee8..abeef33 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -475,8 +475,8 @@ static void sdl_send_mouse_event(int dx, int dy, int x, int y, int state) [INPUT_BUTTON_LEFT] = SDL_BUTTON(SDL_BUTTON_LEFT), [INPUT_BUTTON_MIDDLE] = SDL_BUTTON(SDL_BUTTON_MIDDLE), [INPUT_BUTTON_RIGHT] = SDL_BUTTON(SDL_BUTTON_RIGHT), - [INPUT_BUTTON_WHEELUP] = SDL_BUTTON(SDL_BUTTON_WHEELUP), - [INPUT_BUTTON_WHEELDOWN] = SDL_BUTTON(SDL_BUTTON_WHEELDOWN), + [INPUT_BUTTON_WHEEL_UP] = SDL_BUTTON(SDL_BUTTON_WHEELUP), + [INPUT_BUTTON_WHEEL_DOWN] = SDL_BUTTON(SDL_BUTTON_WHEELDOWN), }; static uint32_t prev_state; diff --git a/ui/sdl2.c b/ui/sdl2.c index e0128ad..d042442 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -509,9 +509,9 @@ static void handle_mousewheel(SDL_Event *ev) InputButton btn; if (wev->y > 0) { - btn = INPUT_BUTTON_WHEELUP; + btn = INPUT_BUTTON_WHEEL_UP; } else if (wev->y < 0) { - btn = INPUT_BUTTON_WHEELDOWN; + btn = INPUT_BUTTON_WHEEL_DOWN; } else { return; } diff --git a/ui/spice-input.c b/ui/spice-input.c index 72e4063..8eeebdb 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -108,8 +108,8 @@ static void spice_update_buttons(QemuSpicePointer *pointer, [INPUT_BUTTON_LEFT] = 0x01, [INPUT_BUTTON_MIDDLE] = 0x04, [INPUT_BUTTON_RIGHT] = 0x02, - [INPUT_BUTTON_WHEELUP] = 0x10, - [INPUT_BUTTON_WHEELDOWN] = 0x20, + [INPUT_BUTTON_WHEEL_UP] = 0x10, + [INPUT_BUTTON_WHEEL_DOWN] = 0x20, }; if (wheel < 0) { diff --git a/ui/vnc.c b/ui/vnc.c index f27df6d..ce4c669 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1593,8 +1593,8 @@ static void pointer_event(VncState *vs, int button_mask, int x, int y) [INPUT_BUTTON_LEFT] = 0x01, [INPUT_BUTTON_MIDDLE] = 0x02, [INPUT_BUTTON_RIGHT] = 0x04, - [INPUT_BUTTON_WHEELUP] = 0x08, - [INPUT_BUTTON_WHEELDOWN] = 0x10, + [INPUT_BUTTON_WHEEL_UP] = 0x08, + [INPUT_BUTTON_WHEEL_DOWN] = 0x10, }; QemuConsole *con = vs->vd->dcl.con; int width = pixman_image_get_width(vs->vd->server);