diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-01-12 12:14:12 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-03-01 08:19:07 +0100 |
| commit | f22d0af076b159426c50a7a76ce2a42b8de95b52 (patch) | |
| tree | 2efcba028adb92ddb0f6a6f86796978f23e14815 /ui | |
| parent | b98d26e33327cf3009be5ead5d6dc8bc0c65dea8 (diff) | |
| download | focaccia-qemu-f22d0af076b159426c50a7a76ce2a42b8de95b52.tar.gz focaccia-qemu-f22d0af076b159426c50a7a76ce2a42b8de95b52.zip | |
qapi: rename input buttons
All lowercase, use-dash instead of CamelCase. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/cocoa.m | 4 | ||||
| -rw-r--r-- | ui/gtk.c | 4 | ||||
| -rw-r--r-- | ui/input-legacy.c | 4 | ||||
| -rw-r--r-- | ui/sdl.c | 4 | ||||
| -rw-r--r-- | ui/sdl2.c | 4 | ||||
| -rw-r--r-- | ui/spice-input.c | 4 | ||||
| -rw-r--r-- | ui/vnc.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m index 3ee554908a..7063a025c0 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 3773826277..38ef3fdb42 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 c97eac1778..703f0a6ed1 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 9804ee8dfb..abeef33095 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 e0128ad755..d0424421ec 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 72e406382f..8eeebdbb2e 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 f27df6dbc0..ce4c669ec9 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); |