diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-19 18:35:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-19 18:35:07 +0100 |
| commit | 30ff7d1d0b3484bb91385853909476d4e4b2b988 (patch) | |
| tree | 468010cbc47700244195cd1af1f4dd6323d877ed /include | |
| parent | cef8fd68364ad754d4f0050a215376cdf0ec744a (diff) | |
| parent | fe5c44f9c95be3f74fb58902077ac587998d1392 (diff) | |
| download | qemu-30ff7d1d0b3484bb91385853909476d4e4b2b988.zip qemu-30ff7d1d0b3484bb91385853909476d4e4b2b988.tar.gz qemu-30ff7d1d0b3484bb91385853909476d4e4b2b988.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170614-1' into staging
ui: prefer gtk3 and sdl2, various fixes.
# gpg: Signature made Wed 14 Jun 2017 08:54:22 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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/pull-ui-20170614-1:
spice: don't enter opengl mode in case another UI provides opengl support
sdl: prefer sdl2 over sdl1
gtk: prefer gtk3 over gtk2
spice: Use proper enum type for kbd led state
Improve Cocoa modifier key handling
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/spice-display.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 184d4c3..4ba9444 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -140,6 +140,8 @@ struct SimpleSpiceCursor { QXLCursor cursor; }; +extern bool spice_opengl; + int qemu_spice_rect_is_empty(const QXLRect* r); void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r); |