diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 15:44:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 15:44:30 +0100 |
| commit | a2ef4d9e95400cd387ab4ae19a317741e458fb07 (patch) | |
| tree | 9f459ad57b06799ad83de5885fdbdb60dc76b295 /qapi | |
| parent | 24c3833717d2528b98833bb5ebf4397a5512043f (diff) | |
| parent | e8b1386ea1719525a1a92df03377764703fe8c64 (diff) | |
| download | qemu-a2ef4d9e95400cd387ab4ae19a317741e458fb07.zip qemu-a2ef4d9e95400cd387ab4ae19a317741e458fb07.tar.gz qemu-a2ef4d9e95400cd387ab4ae19a317741e458fb07.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181001-pull-request' into staging
ui: some small fixes/improvements.
# gpg: Signature made Mon 01 Oct 2018 11:42:16 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20181001-pull-request:
gtk: add zoom-to-fit to gtk options.
vnc: call sasl_server_init() only when required
sdl2: show console #0 unconditionally
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/ui.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/qapi/ui.json b/qapi/ui.json index 4ca91bb..bf9e157 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1022,12 +1022,20 @@ # GTK display options. # # @grab-on-hover: Grab keyboard input on mouse hover. +# @zoom-to-fit: Zoom guest display to fit into the host window. When +# turned off the host window will be resized instead. +# In case the display device can notify the guest on +# window resizes (virtio-gpu) this will default to "on", +# assuming the guest will resize the display to match +# the window size then. Otherwise it defaults to "off". +# Since 3.1 # # Since: 2.12 # ## { 'struct' : 'DisplayGTK', - 'data' : { '*grab-on-hover' : 'bool' } } + 'data' : { '*grab-on-hover' : 'bool', + '*zoom-to-fit' : 'bool' } } ## # @DisplayGLMode: |