Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161028-1' into staging

braille fixes and improvements.
curses fix, switch to cursesw.
gtk bugfixes.

# gpg: Signature made Fri 28 Oct 2016 13:05:12 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-ui-20161028-1:
  curses: Use cursesw instead of curses
  curses: fix left/right arrow translation
  ui/gtk: Fix non-working DELETE key
  gtk: fix compilation warning with gtk 3.22.2
  Defer BrlAPI tty acquisition to when guest starts using device
  Add dots keypresses support to the baum braille device

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined configure
index 7b8e77f45bc907f9487bb8ff3da375339ea56482,5e444692b497e56144c2396b7ad0c9d66482ca28..f83cdf88769d3a6f1745389f2ff324a7bdff35ee
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2917,27 -2917,38 +2917,38 @@@ f
  # curses probe
  if test "$curses" != "no" ; then
    if test "$mingw32" = "yes" ; then
-     curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
+     curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
+     curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
    else
-     curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lncurses:-lcurses"
+     curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
+     curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
    fi
    curses_found=no
    cat > $TMPC << EOF
+ #include <locale.h>
  #include <curses.h>
+ #include <wchar.h>
  int main(void) {
    const char *s = curses_version();
+   wchar_t wch = L'w';
+   setlocale(LC_ALL, "");
    resize_term(0, 0);
+   addwstr(L"wide chars\n");
+   addnwstr(&wch, 1);
    return s != 0;
  }
  EOF
    IFS=:
-   for curses_lib in $curses_list; do
-     unset IFS
-     if compile_prog "" "$curses_lib" ; then
-       curses_found=yes
-       libs_softmmu="$curses_lib $libs_softmmu"
-       break
-     fi
+   for curses_inc in $curses_inc_list; do
+     for curses_lib in $curses_lib_list; do
+       unset IFS
+       if compile_prog "$curses_inc" "$curses_lib" ; then
+         curses_found=yes
+         QEMU_CFLAGS="$curses_inc $QEMU_CFLAGS"
+         libs_softmmu="$curses_lib $libs_softmmu"
+         break
+       fi
+     done
    done
    unset IFS
    if test "$curses_found" = "yes" ; then
@@@ -6131,7 -6142,6 +6142,7 @@@ FILES="$FILES roms/seabios/Makefile rom
  FILES="$FILES pc-bios/qemu-icon.bmp"
  for bios_file in \
      $source_path/pc-bios/*.bin \
 +    $source_path/pc-bios/*.lid \
      $source_path/pc-bios/*.aml \
      $source_path/pc-bios/*.rom \
      $source_path/pc-bios/*.dtb \