diff options
| author | Peter Maydell | 2019-03-13 21:11:06 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-13 21:11:06 +0100 |
| commit | 85ce84489a74d4c6046345c7baac94f0a3ffd88f (patch) | |
| tree | dc00f1fb5439c488de78f9fcacd43cff6d9fec7f /qapi | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | curses: add option to specify VGA font encoding (diff) | |
| download | qemu-85ce84489a74d4c6046345c7baac94f0a3ffd88f.tar.gz qemu-85ce84489a74d4c6046345c7baac94f0a3ffd88f.tar.xz qemu-85ce84489a74d4c6046345c7baac94f0a3ffd88f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190313-pull-request' into staging
ui: better unicode support for curses, v2.
# gpg: Signature made Wed 13 Mar 2019 07:29:44 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-20190313-pull-request:
curses: add option to specify VGA font encoding
iconv: detect and make curses depend on it
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/ui.json | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/qapi/ui.json b/qapi/ui.json index c5d1d7f099..59e412139a 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1081,6 +1081,19 @@ 'data' : [ 'off', 'on', 'core', 'es' ] } ## +# @DisplayCurses: +# +# Curses display options. +# +# @charset: Font charset used by guest (default: CP437). +# +# Since: 4.0 +# +## +{ 'struct' : 'DisplayCurses', + 'data' : { '*charset' : 'str' } } + +## # @DisplayType: # # Display (user interface) type. @@ -1142,6 +1155,7 @@ '*gl' : 'DisplayGLMode' }, 'discriminator' : 'type', 'data' : { 'gtk' : 'DisplayGTK', + 'curses' : 'DisplayCurses', 'egl-headless' : 'DisplayEGLHeadless'} } ## |