diff options
| author | Peter Maydell | 2020-12-11 17:55:52 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-12-11 17:55:52 +0100 |
| commit | f6029bb614cebb0d6c9800990af49d55338231fd (patch) | |
| tree | 9e05320a3d3a50e275ea262f918189819c817082 /include | |
| parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20201210' into... (diff) | |
| parent | sdl2: Add extra mouse buttons (diff) | |
| download | qemu-f6029bb614cebb0d6c9800990af49d55338231fd.tar.gz qemu-f6029bb614cebb0d6c9800990af49d55338231fd.tar.xz qemu-f6029bb614cebb0d6c9800990af49d55338231fd.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201211-pull-request' into staging
ui/console ui_info tweaks.
ui/vnc: alpha cursor support.
ui/vnc: locking fixes.
ui/sdl: add extra mouse buttons.
# gpg: Signature made Fri 11 Dec 2020 09:12:39 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-20201211-pull-request:
sdl2: Add extra mouse buttons
ui/vnc: Add missing lock for send_color_map
vnc: add alpha cursor support
vnc: add pseudo encodings
vnc: drop unused copyrect feature
vnc: use enum for features
console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported
console: drop qemu_console_get_ui_info
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index e7303d8b98..5dd21976a3 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -390,7 +390,6 @@ bool qemu_console_is_gl_blocked(QemuConsole *con); char *qemu_console_get_label(QemuConsole *con); int qemu_console_get_index(QemuConsole *con); uint32_t qemu_console_get_head(QemuConsole *con); -QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con); int qemu_console_get_width(QemuConsole *con, int fallback); int qemu_console_get_height(QemuConsole *con, int fallback); /* Return the low-level window id for the console */ |