diff options
| author | Peter Maydell | 2019-02-05 15:01:29 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-05 15:01:29 +0100 |
| commit | 01a9a51ffaf4699827ea6425cb2b834a356e159d (patch) | |
| tree | 9e068156b4102402649fcbceb8c3a2e462cfae25 /ui/spice-display.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-04' into st... (diff) | |
| parent | keymap: fix keyup mappings (diff) | |
| download | qemu-01a9a51ffaf4699827ea6425cb2b834a356e159d.tar.gz qemu-01a9a51ffaf4699827ea6425cb2b834a356e159d.tar.xz qemu-01a9a51ffaf4699827ea6425cb2b834a356e159d.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190205-pull-request' into staging
ui: add kbd stats tracker.
ui: gtk scroll fixes.
ui: egl cursor scale fix.
ui: more sdl1 cleanup.
# gpg: Signature made Tue 05 Feb 2019 10:57:42 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190205-pull-request:
keymap: fix keyup mappings
keymap: pass full keyboard state to keysym2scancode
kbd-state: use state tracker for vnc
kbd-state: use state tracker for gtk
sdl2: use only QKeyCode in sdl2_process_key()
kbd-state: use state tracker for sdl2
sdl2: remove sdl2_reset_keys() function
kbd-state: add keyboard state tracker
ui/egl-helpers: Augment parameter list of egl_texture_blend() to convey scales of viewport
ui/cocoa.m: Fix macOS 10.14 deprecation warnings
ui/sdl_keysym: Remove obsolete SDL1.2 related code
ui: listen for GDK_SMOOTH_SCROLL events
ui: don't send any event if delta_y == 0
Remove deprecated -no-frame option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-display.c')
| -rw-r--r-- | ui/spice-display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c index 52f8cb5ae1..aea6f6ebce 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1090,7 +1090,7 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl, egl_texture_blit(ssd->gls, &ssd->blit_fb, &ssd->guest_fb, !y_0_top); egl_texture_blend(ssd->gls, &ssd->blit_fb, &ssd->cursor_fb, - !y_0_top, x, y); + !y_0_top, x, y, 1.0, 1.0); glFlush(); } |