This reverts commit fc697d2.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+### Operating Systems ###
+
+Server: microOS Tiara
+Client: Applesoft Windy OS 10
+
+**READ ME, DELETE ME**: On Windows, hold the Windows key and press 'r', type 'winver' and hit return to get your OS version. On Mac, hit the Apple menu (top left of the screen) and check 'About this Mac'. Linux users... you know what you're using ;)
+
+### Synergy Version ###
+
+1.8.π
+
+**READ ME, DELETE ME**: Go to the 'Help' (on Windows) or 'Synergy' (on macOS) menu and then 'About Synergy' to check your version. Verify that you are using the same version across all of your machines, and that your issue still occurs with the latest release available at https://symless.com/account/login
+
+### Steps to reproduce bug ###
+
+**READ ME, DELETE ME**: Try to be succinct. If your bug is intermittent, try and describe what you're doing when it happens most.
+
+1. Click things.
+2. Type things.
+3. Bug occurs.
+4. ... 
+5. Profit?
+
+### Other info ###
+
+* When did the problem start to occur? When I...
+* Is there a way to work around it? No/Yes, you can...
+* Does this bug prevent you from using Synergy entirely? Yes/No
+
+Please follow the link below to send us logs from both your server and client sides if it's appropriate. https://github.com/symless/synergy/wiki/Sending-logs
+
+Put anything else you can think of here.

.gitignore

@@ -1,10 +1,14 @@
 config.h
+.DS_Store
 *.pyc
+*.o
 *~
 \.*.swp
+*build-gui-Desktop_Qt*
 /bin
 /lib
 /build
+/CMakeFiles
 /ext/cryptopp562
 /ext/gmock-1.6.0
 /ext/gtest-1.6.0

CMakeLists.txt

@@ -1,5 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2012 Synergy Si Ltd.
+# Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
@@ -16,8 +16,9 @@
 
 # Version number for Synergy
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 7)
-set(VERSION_REV 4)
+set(VERSION_MINOR 8)
+set(VERSION_REV 7)
+set(VERSION_STAGE stable)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
 
 cmake_minimum_required(VERSION 2.6)
@@ -76,7 +77,7 @@ if (UNIX)
 
 	# warnings as errors:
 	# we have a problem with people checking in code with warnings.
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedefs")
 
 	if (NOT APPLE)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -204,7 +205,10 @@ if (UNIX)
 		set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}:/usr/local/include")
 
 		set(XKBlib "X11/Xlib.h;X11/XKBlib.h")
-		check_symbol_exists("XRRNotifyEvent" "${XKBlib};X11/extensions/Xrandr.h" HAVE_X11_EXTENSIONS_XRANDR_H)
+		set(CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
+		check_type_size("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
+		set(HAVE_X11_EXTENSIONS_XRANDR_H "${X11_EXTENSIONS_XRANDR_H}")
+		set(CMAKE_EXTRA_INCLUDE_FILES)
 
 		check_include_files("${XKBlib};X11/extensions/dpms.h" HAVE_X11_EXTENSIONS_DPMS_H)
 		check_include_files("X11/extensions/Xinerama.h" HAVE_X11_EXTENSIONS_XINERAMA_H)

COMPILE

@@ -1 +1 @@
-Compiling: http://synergy-project.org/wiki/Compiling
+Compiling: https://github.com/symless/synergy/wiki/Compiling

ChangeLog

@@ -1,22 +1,107 @@
+v1.8.7-stable
+=============
+Bug #5784 - Edition changes when reopening GUI
+
+v1.8.6-stable
+=============
+Bug #5592 - Some keys don't work for macOS Sierra clients
+Bug #5186 - Cursor stuck on client when using multi-DPI server
+Bug #5722 - Malformed serial key in registry will crash GUI on startup
+Bug #5752 - Tab order is incorrect on Settings dialog
+Enhancement #5699 - Unified installers on macOS
+Feature #4836 - macOS Sierra build
+
+v1.8.5-stable
+=============
+Bug #5680 - Server crashes when disconnecting SSL clients
+Bug #5626 - Build fails using Xcode 8 and macOS SDK 10.12
+Feature #5657 - Trial version support
+Feature #5707 - User upgrade statistics
+
+v1.8.4-stable
+=============
+Bug #5183 - Slowly moving the cursor has no effect on high DPI clients
+Bug #4041 - UHD/4K DPI scaling broken on Windows servers
+Bug #4420 - When XRandR adds a screen, it is inaccessible
+Bug #5603 - Activation notification depends on existence of /etc/os-release
+Bug #5624 - Update notification sometimes requests a downgrade
+Bug #5329 - Current date is shown for build date in the about dialog
+Enhancement #5617 - Remove redundant plugin infrastructure
+Enhancement #5627 - Move SSL certificate generation to main window
+Enhancement #5628 - Move SSL implementation into core binary
+Enhancement #5629 - Move activation from wizard into new dialog window
+
+v1.8.3-stable
+=============
+Bug #2765 - A letter appears on macOS clients when the spacebar is pressed
+Bug #3241 - Windows UAC disconnects clients when elevated
+Bug #4740 - Linux client crashes with "Assertion '!m_open' failed"
+Bug #4879 - Memory leak caused by IpcReader
+Bug #5373 - Tab behaves like shift tab on client
+Bug #5502 - Copy and paste from server to client doesn't work
+Enhancement #123 - Option to disable clipboard sharing
+Enhancement #3305 - Media key support on macOS
+Enhancement #4323 - Make automatic elevation on Windows optional
+
+v1.8.2-stable
+=============
+Bug #3044 - Unable to drag-select in MS Office
+Bug #4768 - Copy paste causes 'server is dead' error on switching
+Bug #4792 - Server logging crashes when switching with clipboard data
+Bug #2975 - Middle click does not close Chrome tab on Mac client
+Bug #5087 - Linux client fails to start due to invalid cursor size
+Bug #5471 - Serial key textbox on activation screen overflows on Mac
+Bug #4836 - Stop button resets to Start when settings dialog canceled
+Enhancement #5277 - Auto restart service when synwinhk.dll fails on Windows
+Enhancement #4913 - Future-proof GUI login by using newer auth URL
+Enhancement #4922 - Add --enable-crypto argument to help text
+Enhancement #5299 - High resolution App icon on Mac
+Enhancement #4894 - Improve grammar in connection notification dialog
+
+v1.8.1-stable
+=============
+Bug #5461 - GUI crash during activation on Mac
+
+v1.8.0-beta
+=============
+Enhancement #4696 - Include 'ns' plugin in installers (instead of wizard download)
+Enhancement #4715 - Activation dialog which also accepts a serial key
+Enhancement #5020 - Recommend using serial key when online activation fails
+Enhancement #4893 - Show detailed version info on GUI about screen
+Enhancement #4327 - GUI setting to disable drag and drop feature
+Enhancement #4793 - Additional logging to output OpenSSL version
+Enhancement #4932 - Notify activation system when wizard finishes
+Enhancement #4716 - Allow software to be time limited with serial key
+
+v1.7.6-stable
+=============
+Bug #451 - Fast cursor on any client with Mac server
+Bug #5041 - Copying from the Chrome web browser doesn't work
+Bug #4735 - Clipboard doesn't work from client to server
+Bug #2909 - Clipboard copies only plaintext between Mac and Windows
+Bug #4353 - Large clipboard causes crash
+Bug #3774 - Missing MinGW dependencies after install on Windows
+Bug #4723 - Waiting for active desktop result freezes Windows service
+
+v1.7.5-stable
+=============
+Bug #5030 - Display scaling breaks edge detection on Windows
+Bug #5064 - Compile fails on Mac OS X 10.11 (unused typedef)
+
 v1.7.4-stable
 =============
-Bug #4809 - Intermittent freeze caused by mutex deadlock in logging code
-Bug #4721 - High CPU usage for Windows service on client
-Bug #4712 - Unable to send clipboard with size above 1KB when using SSL
+Bug #4721 - High CPU usage for Windows service
+Bug #4750 - SSL connect error 'passive ssl error limit'
 Bug #4584 - Drag and drop with SSL causes crash
-Bug #3774 - Missing MinGW dependencies after install on Windows
 Bug #4749 - Clipboard thread race condition causes assertion failure
-Bug #4723 - Waiting for active desktop result freezes Windows service
-Bug #4690 - Log line 'activeDesktop' does not use logging system
 Bug #4720 - Plugin download shows 'Could not get Linux package type' error
-Bug #4737 - Using error log level does not show SSL fingerprint dialog
-Bug #451  - Fast cursor on any client with Mac server
-Bug #4810 - Non-existent file listed in Qt gui.pro file
-Enhancement #4696 - Include 'ns' plugin in installers instead of wizard download
-Enhancement #4796 - Improve secure socket intensive try operations
-Enhancement #4327 - GUI setting to disable drag and drop feature
-Enhancement #4745 - Tray icon notification for clipboard data transfer progress
-Enhancement #4793 - Additional logging to output OpenSSL version
+Bug #4712 - Unable to send clipboard with size above 1KB when using SSL
+Bug #4642 - Connecting causes SSL23_GET_SERVER_HELLO error
+Bug #4690 - Log line 'activeDesktop' does not use logging system
+Bug #4866 - Wrong ns plugin version can be loaded
+Enhancement #4901 - Auto restart when running from GUI in desktop mode
+Enhancement #4845 - Add timestamp to log output
+Enhancement #4898 - Move version stage name to build config
 
 v1.7.3-stable
 =============

INSTALL

@@ -1,2 +1,2 @@
-Help: http://synergy-project.org/help/
-Wiki: http://synergy-project.org/wiki/
+Help: http://symless.com/help/
+Wiki: https://github.com/symless/synergy/wiki/

LICENSE

@@ -1,8 +1,11 @@
 synergy -- mouse and keyboard sharing utility
-Copyright (C) 2012-2014 Synergy Si Ltd.
+Copyright (C) 2012-2016 Symless Ltd.
 Copyright (C) 2008-2014 Nick Bolton
 Copyright (C) 2002-2014 Chris Schoeneman
 
+This program is released under the GPL with the additional exemption 
+that compiling, linking, and/or using OpenSSL is allowed.
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

README

@@ -11,6 +11,6 @@ Just use "hm conf" and "hm build" to compile (./hm.sh on
 Linux and Mac).
 
 For detailed compile instructions:
-http://synergy-project.org/wiki/Compiling
+https://github.com/symless/synergy/wiki/Compiling
 
 Happy hacking!

doc/MacReadme.txt

@@ -5,14 +5,14 @@ To install on Mac OS X with the .zip distribution (first seen in 1.3.6) you must
 
   1. Extract the zip file to any location (usually double click will do this)
   2. Open Terminal, and cd to the extracted directory (e.g. /Users/my-name/Downloads/extracted-dir/)
-  3. Change to super user (use the su command)
-  4. Copy the binaries to /usr/bin using: cp synergy* /usr/bin
+  3. Copy the binaries to /usr/bin using: sudo cp synergy* /usr/bin
+  4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/synergy*; sudo chmod 555 /usr/bin/synergy*
 
-How to enable the root user in Mac OS X:
+Alternatively, you can copy the binaries as root. How to enable the root user in Mac OS X:
   http://support.apple.com/en-us/ht1528
 
 Once the binaries have been copied to /usr/bin, you should follow the configuration guide:
   http://synergy2.sourceforge.net/configuration.html
 
 If you have any problems, see the [[Support]] page:
-  http://synergy-project.org/help/
+  http://symless.com/help/

doc/org.synergy-foss.org.synergyc.plist

@@ -5,7 +5,7 @@
 <!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy client automatically. Make sure you change the IP below. -->
 <dict>
      <key>Label</key>
-     <string>org.synergy-project.org.synergyc.plist</string>
+     <string>org.symless.com.synergyc.plist</string>
      <key>OnDemand</key>
      <false/>
      <key>ProgramArguments</key>

doc/org.synergy-foss.org.synergys.plist

@@ -5,7 +5,7 @@
 <!-- Mac OSX only: Copy this plist file into [~]/Library/LaunchAgents to start synergy server automatically. Make sure you change configuration file below -->
 <dict>
      <key>Label</key>
-     <string>org.synergy-project.org.synergys.plist</string>
+     <string>org.symless.com.synergys.plist</string>
      <key>OnDemand</key>
      <false/>
      <key>ProgramArguments</key>

ext/toolchain/__init__.py

@@ -1,5 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2012 Synergy Si Ltd.
+# Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or