diff options
| author | Peter Maydell | 2016-03-01 12:15:00 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-01 12:15:00 +0100 |
| commit | 0b85d735831d69ff4ba776e7067ef2e285b234cf (patch) | |
| tree | 4c6ab9473a345766c3e6fe3f8742426a80c5242f /ui/sdl.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into s... (diff) | |
| parent | qapi: promote input-send-event to stable (diff) | |
| download | qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.gz qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.xz qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160301-1' into staging
qapi: fix input-send-event and promote to stable
# gpg: Signature made Tue 01 Mar 2016 08:19:52 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-input-20160301-1:
qapi: promote input-send-event to stable
qapi: rename InputAxis values.
qapi: rename input buttons
qapi: switch x-input-send-event from console to device+head
console: add & use qemu_console_lookup_by_device_name
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl.c')
| -rw-r--r-- | ui/sdl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |