Merge branch 'regions' of https://github.com/CendioOssman/tigervnc

diff --cc .travis.yml
index 222241cfc8bc1d122801e91bf841cd9982ec1b41,ee03e1da972268d06d3fa7cb939ad3a638047c4d..b245d5ed21d8c9bfffa0e187af94b20a979c16ee
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -16,50 -16,6 +16,50 @@@ matrix
      script:
      - cmake -DCMAKE_BUILD_TYPE=Debug . && make
  
-       $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-fltk mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-gnutls
 +  - language: cpp
 +    os: windows
 +    env:
 +    # From https://docs.travis-ci.com/user/reference/windows/
 +    before_install:
 +    - |-
 +      [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
 +      choco uninstall -y mingw
 +      choco upgrade --no-progress -y msys2
 +      export msys2='cmd //C RefreshEnv.cmd '
 +      export msys2+='& set MSYS=winsymlinks:nativestrict '
 +      export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
 +      export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
 +      export msys2+=" -msys2 -c "\"\$@"\" --"
 +      $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain
++      $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-fltk mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-gnutls mingw-w64-x86_64-pixman
 +      taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
 +      export PATH=/C/tools/msys64/mingw64/bin:$PATH
 +      export MAKE=mingw32-make  # so that Autotools can find it
 +    script:
 +    - cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_C_COMPILER=gcc -DCMAKE=CXX_COMPILER=g++ . && mingw32-make
 +    before_cache:
 +    - |-
 +      # https://unix.stackexchange.com/a/137322/107554
 +      $msys2 pacman --sync --clean --noconfirm
 +    cache:
 +      directories:
 +      - $HOME/AppData/Local/Temp/chocolatey
 +      - /C/tools/msys64
 +
 +  - language: cpp
 +    os: osx
 +    # The default image is buggy ATM, use the latest
 +    osx_image: xcode11.5
 +    env:
 +    addons:
 +      homebrew:
 +        packages:
 +          - gettext
 +          - fltk
 +    before_install:
 +    script:
 +    - cmake -DCMAKE_BUILD_TYPE=Debug . && make
 +
    - language: java
      # compile with java 8 for backwards compatibility
      dist: xenial

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/StaticBuild.cmake
Simple merge

diff --cc unix/xserver/hw/vnc/vncExtInit.cc
index e2dd4eee9ea2137c5a2280607b6097f8c0aff1b3,d05bf85b5fe14e86e146ba564883a6469cc3d957..1d08f86e5f1869368b123b723f98e87df8e46b70
--- 1/unix/xserver/hw/vnc/vncExtInit.cc
--- 2/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@@ -148,11 -148,8 +148,8 @@@ void vncExtensionInit(void
    vncExtGeneration = vncGetServerGeneration();
  
    if (vncGetScreenCount() > MAXSCREENS)
 -    vncFatalError("vncExtensionInit: too many screens");
 +    vncFatalError("vncExtensionInit: too many screens\n");
  
-   if (sizeof(ShortRect) != sizeof(struct UpdateRect))
-     vncFatalError("vncExtensionInit: Incompatible ShortRect size\n");
- 
    vncAddExtension();
  
    vncSelectionInit();

diff --cc unix/xserver/hw/vnc/xvnc.c
Simple merge