Commit f22d0af0 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

qapi: rename input buttons 



All lowercase, use-dash instead of CamelCase.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent b98d26e3

hw/input/hid.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {

hw/input/ps2.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {

hw/input/virtio-input-hid.c

+2 −2
Original line number Diff line number Diff line
@@ -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] = {

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

qapi-schema.json

+1 −4
Original line number Diff line number Diff line
@@ -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