From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 18 Oct 2019 10:52:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20191018-pull-request' into... 
X-Git-Tag: qemu-xen-4.14.0~341
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=51cd65b18fbb105fda1a38081053f023a32cc7a9;p=qemu-xen.git

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>
---

51cd65b18fbb105fda1a38081053f023a32cc7a9