diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-10 02:51:14 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-10 02:51:14 +0000 |
commit | a648c137383d84bc4f95696e5293978d9541a26e (patch) | |
tree | 8cd92d2637867d1830af14fc6426518c5fa692fd /ui/vnc.c | |
parent | 4ba364b47275fe428723442987b57b260b215dba (diff) | |
parent | 58aa7d8e443c7f79710a4f5757966f6c511f2242 (diff) | |
download | qemu-a648c137383d84bc4f95696e5293978d9541a26e.zip qemu-a648c137383d84bc4f95696e5293978d9541a26e.tar.gz qemu-a648c137383d84bc4f95696e5293978d9541a26e.tar.bz2 |
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 'ui/vnc.c')
-rw-r--r-- | ui/vnc.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2046,6 +2046,9 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) break; case VNC_ENCODING_RICH_CURSOR: vs->features |= VNC_FEATURE_RICH_CURSOR_MASK; + if (vs->vd->cursor) { + vnc_cursor_define(vs); + } break; case VNC_ENCODING_EXT_KEY_EVENT: send_ext_key_event_ack(vs); |