diff options
| author | Peter Maydell | 2016-03-10 03:51:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-10 03:51:14 +0100 |
| commit | a648c137383d84bc4f95696e5293978d9541a26e (patch) | |
| tree | 8cd92d2637867d1830af14fc6426518c5fa692fd /include | |
| parent | Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff) | |
| parent | ui/console: add escape sequence \e[5, 6n (diff) | |
| download | qemu-a648c137383d84bc4f95696e5293978d9541a26e.tar.gz qemu-a648c137383d84bc4f95696e5293978d9541a26e.tar.xz qemu-a648c137383d84bc4f95696e5293978d9541a26e.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging
add linux evdev support, vnc and console fixes.
# gpg: Signature made Wed 09 Mar 2016 09:02:47 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-ui-20160309-1:
ui/console: add escape sequence \e[5, 6n
input-linux: add switch to enable auto-repeat events
input-linux: add option to toggle grab on all devices
input: linux evdev support
vnc: send cursor when a new client is connecting
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/input.h b/include/ui/input.h index d06a12dd4c..102d8a3341 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -65,4 +65,6 @@ void qemu_input_check_mode_change(void); void qemu_add_mouse_mode_change_notifier(Notifier *notify); void qemu_remove_mouse_mode_change_notifier(Notifier *notify); +int input_linux_init(void *opaque, QemuOpts *opts, Error **errp); + #endif /* INPUT_H */ |