diff options
| author | Peter Maydell | 2019-10-18 12:52:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-10-18 12:52:05 +0200 |
| commit | 51cd65b18fbb105fda1a38081053f023a32cc7a9 (patch) | |
| tree | adfe9a6875b99dc1aced8eb264da9d949a5dcd20 /ui/input-barrier.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request... (diff) | |
| parent | ui: fix keymap file search in input-barrier object (diff) | |
| download | qemu-51cd65b18fbb105fda1a38081053f023a32cc7a9.tar.gz qemu-51cd65b18fbb105fda1a38081053f023a32cc7a9.tar.xz qemu-51cd65b18fbb105fda1a38081053f023a32cc7a9.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20191018-pull-request' into staging
ui: bugfixes for cocoa, curses and input-barrier.
# gpg: Signature made Fri 18 Oct 2019 11:16:53 BST
# 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-20191018-pull-request:
ui: fix keymap file search in input-barrier object
curses: correctly pass the color pair to setcchar()
curses: use the bit mask constants provided by curses
ui: Fix hanging up Cocoa display on macOS 10.15 (Catalina)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-barrier.c')
| -rw-r--r-- | ui/input-barrier.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/input-barrier.c b/ui/input-barrier.c index a2c961f285..fe35049b83 100644 --- a/ui/input-barrier.c +++ b/ui/input-barrier.c @@ -682,6 +682,13 @@ static void input_barrier_instance_init(Object *obj) { InputBarrier *ib = INPUT_BARRIER(obj); + /* always use generic keymaps */ + if (keyboard_layout && !kbd_layout) { + /* We use X11 key id, so use VNC name2keysym */ + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout, + &error_fatal); + } + ib->saddr.type = SOCKET_ADDRESS_TYPE_INET; ib->saddr.u.inet.host = g_strdup("localhost"); ib->saddr.u.inet.port = g_strdup("24800"); @@ -719,13 +726,6 @@ static void input_barrier_class_init(ObjectClass *oc, void *data) UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); ucc->complete = input_barrier_complete; - - /* always use generic keymaps */ - if (keyboard_layout) { - /* We use X11 key id, so use VNC name2keysym */ - kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout, - &error_fatal); - } } static const TypeInfo input_barrier_info = { |