diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 11:15:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 11:15:00 +0000 |
| commit | 0b85d735831d69ff4ba776e7067ef2e285b234cf (patch) | |
| tree | 4c6ab9473a345766c3e6fe3f8742426a80c5242f /ui/spice-input.c | |
| parent | d9c7737e57d1c5d8505d09b2803ca140875c9657 (diff) | |
| parent | 6575ccddf4e7c2484bc14b10d5e89f57506c3953 (diff) | |
| download | focaccia-qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.gz focaccia-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/spice-input.c')
| -rw-r--r-- | ui/spice-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |