diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 19:06:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 19:06:08 +0100 |
| commit | 3f9d69ba12da6f2874631f6e426a7ef148ba4c82 (patch) | |
| tree | e6930403420136db38882edfd320e2185c8bd1f0 /include | |
| parent | 0d81cdddaa40a1988b24657aeac19959cfad0fde (diff) | |
| parent | 1a01716a307387e5cf1336f61a96f772dddadc90 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150427-1' into staging
gtk: support text consoles without vte, bugfixes.
# gpg: Signature made Mon Apr 27 14:34:15 2015 BST using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-gtk-20150427-1:
gtk: Avoid accel key leakage into guest on console switch
gtk: Fix VTE focus grabbing
console/gtk: add qemu_console_get_label
gtk: bind to text terminal consoles too
gtk: handle switch_surface(NULL) properly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 2f5b9f0634..03cd665a8f 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -307,6 +307,7 @@ QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head); bool qemu_console_is_visible(QemuConsole *con); bool qemu_console_is_graphic(QemuConsole *con); bool qemu_console_is_fixedsize(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); |