Merge branch 'master' into multicastvnc

Author: bk138

.appveyor.yml

@@ -19,6 +19,14 @@ install:
   - cmake .
   - cmake --build .
   - cd ..
+  # libJPEG
+  - curl -fsSL -o libjpeg.tar.gz https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.4.tar.gz
+  - tar xzf libjpeg.tar.gz
+  - move libjpeg-turbo-2.0.4 libjpeg
+  - cd libjpeg
+  - cmake .
+  - cmake --build .
+  - cd ..
   # libPNG
   - curl -fsSL -o libpng.tar.gz http://prdownloads.sourceforge.net/libpng/libpng-1.6.28.tar.gz?download
   - 7z x libpng.tar.gz -so | 7z x -si -ttar > nul
@@ -37,7 +45,7 @@ install:
   - msbuild /p:Configuration=Release db_dll.vcxproj
   - cd ..\..
   # Cyrus SASL
-  - curl -fsSL -o cyrus-sasl-2.1.26.tar.gz https://www.cyrusimap.org/releases/cyrus-sasl-2.1.26.tar.gz
+  - curl -fsSL -o cyrus-sasl-2.1.26.tar.gz https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.26/cyrus-sasl-2.1.26.tar.gz
   - 7z x cyrus-sasl-2.1.26.tar.gz -so | 7z x -si -ttar > nul
   - move cyrus-sasl-2.1.26 sasl
   - cd sasl
@@ -53,7 +61,7 @@ build_script:
   - mkdir build
   - cd build 
   - cmake --version
-  - cmake .. -DZLIB_INCLUDE_DIR=..\deps\zlib -DZLIB_LIBRARY=..\deps\zlib\debug\zlibstaticd.lib -DPNG_PNG_INCLUDE_DIR=..\deps\libpng -DPNG_LIBRARY=..\deps\libpng\debug\libpng16_staticd.lib -D SASL2_INCLUDE_DIR=c:\cmu\include -D LIBSASL2_LIBRARIES=c:\cmu\lib\libsasl.lib ..
+  - cmake .. -DZLIB_INCLUDE_DIR=..\deps\zlib -DZLIB_LIBRARY=..\deps\zlib\debug\zlibstaticd.lib -DJPEG_INCLUDE_DIR=..\deps\libjpeg -DJPEG_LIBRARY_DEBUG=..\deps\libjpeg\debug\turbojpeg-static.lib -DPNG_PNG_INCLUDE_DIR=..\deps\libpng -DPNG_LIBRARY=..\deps\libpng\debug\libpng16_staticd.lib -D SASL2_INCLUDE_DIR=c:\cmu\include -D LIBSASL2_LIBRARIES=c:\cmu\lib\libsasl.lib ..
   - cmake --build .
   - ctest -C Debug --output-on-failure
 

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+liberapay: LibVNC
+issuehunt: LibVNC/libvncserver

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+If you'd like to put out an incentive for fixing this bug, you can do so at https://issuehunt.io/r/LibVNC/libvncserver
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Done this.
+2. Done that.
+3. Done nothing. 
+-->
+
+**Expected Behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Logs/Backtraces**
+<!-- If applicable, add log output and/or debugger backtraces to help explain your problem. -->
+
+**Your environment (please complete the following information):**
+ - OS and version:
+ - Compiler and version: 
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+If you'd like to put out an incentive for implementing this feature, you can do so at https://issuehunt.io/r/LibVNC/libvncserver
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!--A clear and concise description of what you want to happen.-->
+
+**Describe alternatives you've considered**
+<!--A clear and concise description of any alternative solutions or features you've considered.-->
+
+**Additional context**
+<!--Add any other context or screenshots about the feature request here. -->

.gitignore

@@ -1,15 +1,9 @@
 *.swp
 *~
 Makefile
-Makefile.in
-LibVNCServer.spec.in
-LibVNCServer.spec
-libvncserver-config
 *.pc
 LibVNCServer*.tar.gz
-config.h.in
 rfbconfig.h
-rfbconfig.h.in
 *.o
 *.a
 *.so
@@ -20,10 +14,12 @@ client_examples/gtkvncviewer
 client_examples/ppmtest
 client_examples/vnc2mpg
 build/
+doc/
 examples/zippy
 examples/backchannel
 examples/blooptest
 examples/camera
+examples/cursors
 examples/colourmaptest
 examples/example
 examples/filetransfer
@@ -41,7 +37,6 @@ examples/vncev
 test/blooptest
 test/cargstest
 test/copyrecttest
-test/cursortest
 test/encodingstest
 test/wstest
 /test/tjbench
@@ -58,3 +53,6 @@ CMakeCache.txt
 /rfbproto.rst
 /vencrypt.txt
 /INSTALL
+.ccls-cache
+.log
+compile_commands.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "webclients/novnc"]
+	path = webclients/novnc
+	url = https://github.com/novnc/noVNC.git

.travis.yml

@@ -6,17 +6,27 @@ os:
   - linux
   - osx
 
-compiler:
-  - gcc
-  - clang
+env:
+  - CMAKE_OPTIONS="-DWITH_OPENSSL=ON  -DWITH_GNUTLS=OFF -DWITH_GCRYPT=OFF" # build with OpenSSL
+  - CMAKE_OPTIONS="-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON  -DWITH_GCRYPT=ON"  # build with GnuTLS and Libgrypt
+  - CMAKE_OPTIONS="-DWITH_OPENSSL=OFF -DWITH_GNUTLS=OFF -DWITH_GCRYPT=OFF" # build without external encryption libraries
+  - CMAKE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-mingw32-linux.cmake" # crosscompile with MinGW toolchain
+
+jobs:
+  exclude:
+    - os: osx
+      env: CMAKE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-mingw32-linux.cmake" # don't test MinGW from OSX
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update; sudo apt-get --no-install-suggests --no-install-recommends install libsdl2-dev liblzo2-dev gnutls-dev libgcrypt-dev wine; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install sdl2 lzo; fi
 
-# Build steps
 script:
   - mkdir build
   - cd build
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; sudo apt-get --no-install-suggests --no-install-recommends install libsdl2-dev liblzo2-dev; fi
-  - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; brew install sdl2; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl; else cmake ..; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake $CMAKE_OPTIONS .. ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake $CMAKE_OPTIONS -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl .. ; fi
   - cmake --build .
+  - cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll test/ || true # used only for MinGW tests, ok to fail for other cases
   - ctest --output-on-failure
 

AUTHORS

@@ -11,20 +11,18 @@ The ZRLE compression scheme is from
 * RealVNC (James "Wez" Weatherall, who helped also with regions)
 
 The good folks from
-* KRFB (I think it was Tim Jansen)
+* KRFB (Dscho thinks it was Tim Jansen)
 helped also a lot (some *big* bugs!).
 
-Karl Runge provides an x11vnc, which is a much, much improved version of my
+Karl Runge provided an x11vnc, which is a much, much improved version of Dscho's
 original proof-of-concept. It really deserves to replace the old version,
-as it is a state-of-the-art, fast and usable program by now! However, he
-maintains it and improves it still in amazing ways!
+as it is a state-of-the-art, fast and usable program by now!
 
 The file transfer protocol from TightVNC was implemented by Rohit Kumar.
 This includes an implementation of RFB protocol version 3.7t.
 
-Occasional important patches were sent by (in order I found the names in my
-archives and please don't beat me, if I forgot you, but just send me an
-email!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing,
+Important contributions were done by (in order of appearance, if we forgot you,
+just open an issue!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing,
 Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
 Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz,
 Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
@@ -38,9 +36,17 @@ George Fleury, Kan-Ru Chen, Steve Guo, Luca Stauble, Peter Watkins,
 Kyle J. McKay, Mateus Cesar Groess, Philip Van Hoof, D. R. Commander,
 Rostislav Lisovy, Oliver Loch, Raphael Kubo da Costa, Amandeep Singh,
 Brian Bidulock, Daniel Cohen Gindi, David Verbeiren, Luca Falavigna,
-Matthias Treydte, Nicolas Ruff, Robbert Klarenbeek and Floris Bos.
-
-
-Probably I forgot quite a few people sending a patch here and there, which
+Matthias Treydte, Nicolas Ruff, Robbert Klarenbeek, Floris Bos,
+Zac Medico, Wu Zongyong, Wiki Wang, Wen Shuguang, Volker Ruppert,
+Timothy Pearson, Thomas Anderson, Sebastian Kranz, Rex Dieter, Rajesh Sahoo,
+Michał Kępień, Jocelyn Le Sage, Jay Carlson, Jae Hyun Yoo, Eddie James,
+Christian Häggström, Bastiaan Olij, Balazs Ludmany, Andrzej Szombierski,
+Alexander Tsoy, Albert Astals Cid, Iordan Iordanov, Samuel Mannehed,
+Remi Gacogne, Petr Písař, Peter Spiess-Knafl, Kyle Russell, Josef Gajdusek,
+Fabien Proriol, Bert van Hall, Benjamin Dürholt, Quentin Buathier,
+Fabrice Fontaine, Cédric Georges, Stefan Weil, Rolf Eike Beer, Andreas Weigel,
+Gaurav Ujjwal and Tobias Junghans.
+
+Probably we forgot quite a few people sending a patch here and there, which
 really made a difference. Without those, some obscure bugs still would
 be unfound.