diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-03 13:50:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-03 13:50:10 +0100 |
| commit | 2c94822167672597d870dbeed9ffc95ea2bf93d3 (patch) | |
| tree | 64360f9d04fe2c6ddec5fffb6272d6f811490d45 /include | |
| parent | be9d199751789fdc96a3febe3f0768f1338d87ca (diff) | |
| parent | 7364dbdabb7824d5bde1e341bb6d928282f01c83 (diff) | |
| download | qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.zip qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.tar.gz qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170929-pull-request' into staging
ui and input patches.
# gpg: Signature made Fri 29 Sep 2017 11:21:45 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/ui-20170929-pull-request:
ui: add tracing of VNC authentication process
ui: add tracing of VNC operations related to QIOChannel
virtio-input: send rel-wheel events for wheel buttons
egl: misc framebuffer helper improvements.
console: purge curses bits from console.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/compat.h | 10 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-input.h | 1 | ||||
| -rw-r--r-- | include/ui/console.h | 23 | ||||
| -rw-r--r-- | include/ui/egl-helpers.h | 5 |
4 files changed, 15 insertions, 24 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h index 9cc14dd..cf389b4 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,7 +2,15 @@ #define HW_COMPAT_H #define HW_COMPAT_2_10 \ - /* empty */ + {\ + .driver = "virtio-mouse-device",\ + .property = "wheel-axis",\ + .value = "false",\ + },{\ + .driver = "virtio-tablet-device",\ + .property = "wheel-axis",\ + .value = "false",\ + }, #define HW_COMPAT_2_9 \ {\ diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-input.h index 91df57e..054c388 100644 --- a/include/hw/virtio/virtio-input.h +++ b/include/hw/virtio/virtio-input.h @@ -89,6 +89,7 @@ struct VirtIOInputHID { QemuInputHandler *handler; QemuInputHandlerState *hs; int ledstate; + bool wheel_axis; }; struct VirtIOInputHost { diff --git a/include/ui/console.h b/include/ui/console.h index 8024878..6966e4b 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -336,29 +336,10 @@ static inline pixman_format_code_t surface_format(DisplaySurface *s) return s->format; } -#ifdef CONFIG_CURSES -/* KEY_EVENT is defined in wincon.h and in curses.h. Avoid redefinition. */ -#undef KEY_EVENT -#include <curses.h> -#undef KEY_EVENT -typedef chtype console_ch_t; -extern chtype vga_to_curses[]; -#else -typedef unsigned long console_ch_t; -#endif +typedef uint32_t console_ch_t; + static inline void console_write_ch(console_ch_t *dest, uint32_t ch) { - uint8_t c = ch; -#ifdef CONFIG_CURSES - if (vga_to_curses[c]) { - ch &= ~(console_ch_t)0xff; - ch |= vga_to_curses[c]; - } -#else - if (c == '\0') { - ch |= ' '; - } -#endif *dest = ch; } diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index be89087..81cb255 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -18,8 +18,9 @@ typedef struct egl_fb { void egl_fb_destroy(egl_fb *fb); void egl_fb_setup_default(egl_fb *fb, int width, int height); -void egl_fb_create_for_tex(egl_fb *fb, int width, int height, GLuint texture); -void egl_fb_create_new_tex(egl_fb *fb, int width, int height); +void egl_fb_setup_for_tex(egl_fb *fb, int width, int height, + GLuint texture, bool delete); +void egl_fb_setup_new_tex(egl_fb *fb, int width, int height); void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip); void egl_fb_read(void *dst, egl_fb *src); |