Merge branch 'v0.9' of https://github.com/symless/synergy-core into v1.9

v1.9.1
Update OpenSSL to v1.0.2o
2026-02-13 07:06:10 +08:00 · 2018-04-10 11:18:42 +01:00 · 2018-04-10 11:18:28 +01:00 · 2018-04-10 11:18:00 +01:00 · 2018-04-10 11:12:51 +01:00 · 2018-03-29 10:23:13 +01:00
488 changed files with 84375 additions and 970 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -27,6 +27,6 @@ Client: Applesoft Windy OS 10
 * 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-core/wiki/Sending-logs
+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.
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,6 @@ src/gui/gui.pro.user*
 src/gui/.qmake.stash
 src/gui/.rnd
 src/setup/win32/synergy.suo
-CMakeCache.txt
-CMakeLists.txt.user
+/.idea
+/cmake-build-debug
+/CMakeLists.txt.user
--- a/Build.properties
+++ b/Build.properties
@@ -1,7 +1,7 @@
 #
 # Synergy build parameters
 #
-SYNERGY_VERSION_MAJOR = 2
-SYNERGY_VERSION_MINOR = 0
-SYNERGY_VERSION_PATCH = 0
-SYNERGY_VERSION_STAGE = snapshot
+SYNERGY_VERSION_MAJOR = 1
+SYNERGY_VERSION_MINOR = 9
+SYNERGY_VERSION_PATCH = 1
+SYNERGY_VERSION_STAGE = stable
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,9 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 cmake_minimum_required (VERSION 3.4)
-project (synergy-core C CXX)
+project (synergy C CXX)

-option (SYNERGY_CORE_INSTALL "Enable Synergy Core install (Mac and Linux)" OFF)
+option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON)
+option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
+option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON)

 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_EXTENSIONS OFF)
@@ -335,4 +337,42 @@ macro (configure_files srcDir destDir)
    endforeach (templateFile)
 endmacro (configure_files)

+if (${SYNERGY_BUILD_LEGACY_INSTALLER})
+#
+# macOS app Bundle
+#
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
+    set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
+    set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
+    set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
+    set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS)
+
+    configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR})
+endif()
+
+#
+# Windows installer
+#
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+        message (STATUS "Configuring the v1 installer")
+        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
+endif()
+
+#
+# Linux installation
+#
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
+    install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
+    if("${VERSION_MAJOR}" STREQUAL "2") 
+        install(FILES res/synergy2.desktop DESTINATION share/applications)
+    else()
+        install(FILES res/synergy.desktop DESTINATION share/applications)
+    endif()
+endif()
+
+else()
+    message (STATUS "NOT configuring the v1 installer")
+endif()
 add_subdirectory (src)
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.2.1, 2018-03-20T15:31:49. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{d2097749-f678-439b-ab23-75844ed126ff}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.8.0 MSVC2015_64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.8.0 MSVC2015_64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.58.win64_msvc2015_64_kit</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <valuelist type="QVariantList" key="CMake.Configuration"/>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Projects/build-synergy-core-Desktop_Qt_5_8_0_MSVC2015_64bit-Default</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString"></value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
+    </valuelist>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Projects/build-synergy-core-Desktop_Qt_5_8_0_MSVC2015_64bit-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString"></value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Release</value>
+    </valuelist>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Projects/build-synergy-core-Desktop_Qt_5_8_0_MSVC2015_64bit-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString"></value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
+    </valuelist>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Projects/build-synergy-core-Desktop_Qt_5_8_0_MSVC2015_64bit-Release with Debug Information</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString"></value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release with Debug Information</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release with Debug Information</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.4">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=MinSizeRel</value>
+    </valuelist>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Projects/build-synergy-core-Desktop_Qt_5_8_0_MSVC2015_64bit-Minimum Size Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString"></value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Minimum Size Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Minimum Size Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">5</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">18</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">18</value>
+ </data>
+</qtcreator>
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -7,7 +7,7 @@ if (NOT DEFINED SYNERGY_VERSION_MAJOR)
    if (DEFINED ENV{SYNERGY_VERSION_MAJOR})
        set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR})
    else()
-        set (SYNERGY_VERSION_MAJOR 2)
+        set (SYNERGY_VERSION_MAJOR 1)
    endif()
 endif()

@@ -15,7 +15,7 @@ if (NOT DEFINED SYNERGY_VERSION_MINOR)
    if (DEFINED ENV{SYNERGY_VERSION_MINOR})
        set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR})
    else()
-        set (SYNERGY_VERSION_MINOR 0)
+        set (SYNERGY_VERSION_MINOR 9)
    endif()
 endif()

--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -2,8 +2,8 @@
 <Include>
    <?define Name="Synergy" ?>
    <?define Version="@SYNERGY_VERSION@" ?>
-    <?define QtVersion="5.9.1" ?> <!-- TODO: Configure this externally //--> 
-    <?define Author="Symless" ?>
+    <?define QtVersion="5.9.4" ?> <!-- TODO: Configure this externally //--> 
+    <?define Author="Symless Ltd" ?>
    <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
    <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
    <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
--- a/ext/openssl/windows/x64/bin/libeay32.dll
+++ b/ext/openssl/windows/x64/bin/libeay32.dll
--- a/ext/openssl/windows/x64/bin/openssl.exe
+++ b/ext/openssl/windows/x64/bin/openssl.exe
--- a/ext/openssl/windows/x64/bin/ssleay32.dll
+++ b/ext/openssl/windows/x64/bin/ssleay32.dll
--- a/ext/openssl/windows/x64/include/openssl/asn1.h
+++ b/ext/openssl/windows/x64/include/openssl/asn1.h
@@ -1365,6 +1365,7 @@ void ERR_load_ASN1_strings(void);
 # define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
 # define ASN1_R_MSTRING_WRONG_TAG                         140
 # define ASN1_R_NESTED_ASN1_STRING                        197
+# define ASN1_R_NESTED_TOO_DEEP                           219
 # define ASN1_R_NON_HEX_CHARACTERS                        141
 # define ASN1_R_NOT_ASCII_FORMAT                          190
 # define ASN1_R_NOT_ENOUGH_DATA                           142
--- a/ext/openssl/windows/x64/include/openssl/dh.h
+++ b/ext/openssl/windows/x64/include/openssl/dh.h
@@ -257,11 +257,13 @@ DH *DH_get_1024_160(void);
 DH *DH_get_2048_224(void);
 DH *DH_get_2048_256(void);

+# ifndef OPENSSL_NO_CMS
 /* RFC2631 KDF */
 int DH_KDF_X9_42(unsigned char *out, size_t outlen,
                 const unsigned char *Z, size_t Zlen,
                 ASN1_OBJECT *key_oid,
                 const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
+# endif

 # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
--- a/ext/openssl/windows/x64/include/openssl/evp.h
+++ b/ext/openssl/windows/x64/include/openssl/evp.h
@@ -1363,6 +1363,98 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
                                             const char *type,
                                             const char *value));

+void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
+                            int (**pinit) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
+                            int (**pcopy) (EVP_PKEY_CTX *dst,
+                                           EVP_PKEY_CTX *src));
+
+void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
+                               void (**pcleanup) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
+                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
+                                int (**pparamgen) (EVP_PKEY_CTX *ctx,
+                                                   EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
+                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
+                              int (**pkeygen) (EVP_PKEY_CTX *ctx,
+                                               EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
+                            int (**psign_init) (EVP_PKEY_CTX *ctx),
+                            int (**psign) (EVP_PKEY_CTX *ctx,
+                                           unsigned char *sig, size_t *siglen,
+                                           const unsigned char *tbs,
+                                           size_t tbslen));
+
+void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
+                              int (**pverify_init) (EVP_PKEY_CTX *ctx),
+                              int (**pverify) (EVP_PKEY_CTX *ctx,
+                                               const unsigned char *sig,
+                                               size_t siglen,
+                                               const unsigned char *tbs,
+                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
+                                      int (**pverify_recover_init) (EVP_PKEY_CTX
+                                                                    *ctx),
+                                      int (**pverify_recover) (EVP_PKEY_CTX
+                                                               *ctx,
+                                                               unsigned char
+                                                               *sig,
+                                                               size_t *siglen,
+                                                               const unsigned
+                                                               char *tbs,
+                                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
+                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,
+                                                      EVP_MD_CTX *mctx),
+                               int (**psignctx) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *sig,
+                                                 size_t *siglen,
+                                                 EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
+                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
+                                                          EVP_MD_CTX *mctx),
+                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
+                                                     const unsigned char *sig,
+                                                     int siglen,
+                                                     EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,
+                                                   unsigned char *out,
+                                                   size_t *outlen,
+                                                   const unsigned char *in,
+                                                   size_t inlen));
+
+void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *out,
+                                                 size_t *outlen,
+                                                 const unsigned char *in,
+                                                 size_t inlen));
+
+void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
+                              int (**pderive_init) (EVP_PKEY_CTX *ctx),
+                              int (**pderive) (EVP_PKEY_CTX *ctx,
+                                               unsigned char *key,
+                                               size_t *keylen));
+
+void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
+                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
+                                           void *p2),
+                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,
+                                               const char *type,
+                                               const char *value));
+
 void EVP_add_alg_module(void);

 /* BEGIN ERROR CODES */
--- a/ext/openssl/windows/x64/include/openssl/opensslv.h
+++ b/ext/openssl/windows/x64/include/openssl/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
 *  major minor fix final patch/beta)
 */
-# define OPENSSL_VERSION_NUMBER  0x100020cfL
+# define OPENSSL_VERSION_NUMBER  0x100020ffL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2l-fips  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o-fips  27 Mar 2018"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2l  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o  27 Mar 2018"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT

--- a/ext/openssl/windows/x64/include/openssl/ssl.h
+++ b/ext/openssl/windows/x64/include/openssl/ssl.h
@@ -1727,7 +1727,7 @@ extern "C" {
 # define SSL_ST_BEFORE                   0x4000
 # define SSL_ST_OK                       0x03
 # define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-# define SSL_ST_ERR                      0x05
+# define SSL_ST_ERR                      (0x05|SSL_ST_INIT)

 # define SSL_CB_LOOP                     0x01
 # define SSL_CB_EXIT                     0x02
--- a/ext/openssl/windows/x64/include/openssl/symhacks.h
+++ b/ext/openssl/windows/x64/include/openssl/symhacks.h
@@ -280,6 +280,8 @@
 #  define OPENSSL_add_all_algorithms_conf         OPENSSL_add_all_algo_conf
 #  undef EVP_PKEY_meth_set_verify_recover
 #  define EVP_PKEY_meth_set_verify_recover        EVP_PKEY_meth_set_vrfy_recover
+#  undef EVP_PKEY_meth_get_verify_recover
+#  define EVP_PKEY_meth_get_verify_recover        EVP_PKEY_meth_get_vrfy_recover

 /* Hack some long EC names */
 #  undef EC_GROUP_set_point_conversion_form
--- a/ext/openssl/windows/x64/include/openssl/tls1.h
+++ b/ext/openssl/windows/x64/include/openssl/tls1.h
@@ -317,7 +317,7 @@ int SSL_get_servername_type(const SSL *s);
 */
 int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                               const char *label, size_t llen,
-                               const unsigned char *p, size_t plen,
+                               const unsigned char *context, size_t contextlen,
                               int use_context);

 int SSL_get_sigalgs(SSL *s, int idx,
--- a/ext/openssl/windows/x64/lib/engines/4758cca.dll
+++ b/ext/openssl/windows/x64/lib/engines/4758cca.dll
--- a/ext/openssl/windows/x64/lib/engines/aep.dll
+++ b/ext/openssl/windows/x64/lib/engines/aep.dll
--- a/ext/openssl/windows/x64/lib/engines/atalla.dll
+++ b/ext/openssl/windows/x64/lib/engines/atalla.dll
--- a/ext/openssl/windows/x64/lib/engines/capi.dll
+++ b/ext/openssl/windows/x64/lib/engines/capi.dll
--- a/ext/openssl/windows/x64/lib/engines/chil.dll
+++ b/ext/openssl/windows/x64/lib/engines/chil.dll
--- a/ext/openssl/windows/x64/lib/engines/cswift.dll
+++ b/ext/openssl/windows/x64/lib/engines/cswift.dll
--- a/ext/openssl/windows/x64/lib/engines/gmp.dll
+++ b/ext/openssl/windows/x64/lib/engines/gmp.dll
--- a/ext/openssl/windows/x64/lib/engines/gost.dll
+++ b/ext/openssl/windows/x64/lib/engines/gost.dll
--- a/ext/openssl/windows/x64/lib/engines/nuron.dll
+++ b/ext/openssl/windows/x64/lib/engines/nuron.dll
--- a/ext/openssl/windows/x64/lib/engines/padlock.dll
+++ b/ext/openssl/windows/x64/lib/engines/padlock.dll
--- a/ext/openssl/windows/x64/lib/engines/sureware.dll
+++ b/ext/openssl/windows/x64/lib/engines/sureware.dll
--- a/ext/openssl/windows/x64/lib/engines/ubsec.dll
+++ b/ext/openssl/windows/x64/lib/engines/ubsec.dll
--- a/ext/openssl/windows/x64/lib/libeay32.lib
+++ b/ext/openssl/windows/x64/lib/libeay32.lib
--- a/ext/openssl/windows/x64/lib/ssleay32.lib
+++ b/ext/openssl/windows/x64/lib/ssleay32.lib
--- a/ext/openssl/windows/x86/bin/libeay32.dll
+++ b/ext/openssl/windows/x86/bin/libeay32.dll
--- a/ext/openssl/windows/x86/bin/openssl.exe
+++ b/ext/openssl/windows/x86/bin/openssl.exe
--- a/ext/openssl/windows/x86/bin/ssleay32.dll
+++ b/ext/openssl/windows/x86/bin/ssleay32.dll
--- a/ext/openssl/windows/x86/include/openssl/asn1.h
+++ b/ext/openssl/windows/x86/include/openssl/asn1.h
@@ -1365,6 +1365,7 @@ void ERR_load_ASN1_strings(void);
 # define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
 # define ASN1_R_MSTRING_WRONG_TAG                         140
 # define ASN1_R_NESTED_ASN1_STRING                        197
+# define ASN1_R_NESTED_TOO_DEEP                           219
 # define ASN1_R_NON_HEX_CHARACTERS                        141
 # define ASN1_R_NOT_ASCII_FORMAT                          190
 # define ASN1_R_NOT_ENOUGH_DATA                           142
--- a/ext/openssl/windows/x86/include/openssl/dh.h
+++ b/ext/openssl/windows/x86/include/openssl/dh.h
@@ -257,11 +257,13 @@ DH *DH_get_1024_160(void);
 DH *DH_get_2048_224(void);
 DH *DH_get_2048_256(void);

+# ifndef OPENSSL_NO_CMS
 /* RFC2631 KDF */
 int DH_KDF_X9_42(unsigned char *out, size_t outlen,
                 const unsigned char *Z, size_t Zlen,
                 ASN1_OBJECT *key_oid,
                 const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
+# endif

 # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
--- a/ext/openssl/windows/x86/include/openssl/evp.h
+++ b/ext/openssl/windows/x86/include/openssl/evp.h
@@ -1363,6 +1363,98 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
                                             const char *type,
                                             const char *value));

+void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
+                            int (**pinit) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
+                            int (**pcopy) (EVP_PKEY_CTX *dst,
+                                           EVP_PKEY_CTX *src));
+
+void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
+                               void (**pcleanup) (EVP_PKEY_CTX *ctx));
+
+void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
+                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
+                                int (**pparamgen) (EVP_PKEY_CTX *ctx,
+                                                   EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
+                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
+                              int (**pkeygen) (EVP_PKEY_CTX *ctx,
+                                               EVP_PKEY *pkey));
+
+void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
+                            int (**psign_init) (EVP_PKEY_CTX *ctx),
+                            int (**psign) (EVP_PKEY_CTX *ctx,
+                                           unsigned char *sig, size_t *siglen,
+                                           const unsigned char *tbs,
+                                           size_t tbslen));
+
+void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
+                              int (**pverify_init) (EVP_PKEY_CTX *ctx),
+                              int (**pverify) (EVP_PKEY_CTX *ctx,
+                                               const unsigned char *sig,
+                                               size_t siglen,
+                                               const unsigned char *tbs,
+                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
+                                      int (**pverify_recover_init) (EVP_PKEY_CTX
+                                                                    *ctx),
+                                      int (**pverify_recover) (EVP_PKEY_CTX
+                                                               *ctx,
+                                                               unsigned char
+                                                               *sig,
+                                                               size_t *siglen,
+                                                               const unsigned
+                                                               char *tbs,
+                                                               size_t tbslen));
+
+void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
+                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,
+                                                      EVP_MD_CTX *mctx),
+                               int (**psignctx) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *sig,
+                                                 size_t *siglen,
+                                                 EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
+                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
+                                                          EVP_MD_CTX *mctx),
+                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
+                                                     const unsigned char *sig,
+                                                     int siglen,
+                                                     EVP_MD_CTX *mctx));
+
+void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,
+                                                   unsigned char *out,
+                                                   size_t *outlen,
+                                                   const unsigned char *in,
+                                                   size_t inlen));
+
+void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
+                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
+                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,
+                                                 unsigned char *out,
+                                                 size_t *outlen,
+                                                 const unsigned char *in,
+                                                 size_t inlen));
+
+void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
+                              int (**pderive_init) (EVP_PKEY_CTX *ctx),
+                              int (**pderive) (EVP_PKEY_CTX *ctx,
+                                               unsigned char *key,
+                                               size_t *keylen));
+
+void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
+                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
+                                           void *p2),
+                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,
+                                               const char *type,
+                                               const char *value));
+
 void EVP_add_alg_module(void);

 /* BEGIN ERROR CODES */
--- a/ext/openssl/windows/x86/include/openssl/opensslv.h
+++ b/ext/openssl/windows/x86/include/openssl/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
 *  major minor fix final patch/beta)
 */
-# define OPENSSL_VERSION_NUMBER  0x100020cfL
+# define OPENSSL_VERSION_NUMBER  0x100020ffL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2l-fips  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o-fips  27 Mar 2018"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2l  25 May 2017"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2o  27 Mar 2018"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT

--- a/ext/openssl/windows/x86/include/openssl/ssl.h
+++ b/ext/openssl/windows/x86/include/openssl/ssl.h
@@ -1727,7 +1727,7 @@ extern "C" {
 # define SSL_ST_BEFORE                   0x4000
 # define SSL_ST_OK                       0x03
 # define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-# define SSL_ST_ERR                      0x05
+# define SSL_ST_ERR                      (0x05|SSL_ST_INIT)

 # define SSL_CB_LOOP                     0x01
 # define SSL_CB_EXIT                     0x02
--- a/ext/openssl/windows/x86/include/openssl/symhacks.h
+++ b/ext/openssl/windows/x86/include/openssl/symhacks.h
@@ -280,6 +280,8 @@
 #  define OPENSSL_add_all_algorithms_conf         OPENSSL_add_all_algo_conf
 #  undef EVP_PKEY_meth_set_verify_recover
 #  define EVP_PKEY_meth_set_verify_recover        EVP_PKEY_meth_set_vrfy_recover
+#  undef EVP_PKEY_meth_get_verify_recover
+#  define EVP_PKEY_meth_get_verify_recover        EVP_PKEY_meth_get_vrfy_recover

 /* Hack some long EC names */
 #  undef EC_GROUP_set_point_conversion_form
--- a/ext/openssl/windows/x86/include/openssl/tls1.h
+++ b/ext/openssl/windows/x86/include/openssl/tls1.h
@@ -317,7 +317,7 @@ int SSL_get_servername_type(const SSL *s);
 */
 int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                               const char *label, size_t llen,
-                               const unsigned char *p, size_t plen,
+                               const unsigned char *context, size_t contextlen,
                               int use_context);

 int SSL_get_sigalgs(SSL *s, int idx,
--- a/ext/openssl/windows/x86/lib/engines/4758cca.dll
+++ b/ext/openssl/windows/x86/lib/engines/4758cca.dll
--- a/ext/openssl/windows/x86/lib/engines/aep.dll
+++ b/ext/openssl/windows/x86/lib/engines/aep.dll
--- a/ext/openssl/windows/x86/lib/engines/atalla.dll
+++ b/ext/openssl/windows/x86/lib/engines/atalla.dll
--- a/ext/openssl/windows/x86/lib/engines/capi.dll
+++ b/ext/openssl/windows/x86/lib/engines/capi.dll
--- a/ext/openssl/windows/x86/lib/engines/chil.dll
+++ b/ext/openssl/windows/x86/lib/engines/chil.dll
--- a/ext/openssl/windows/x86/lib/engines/cswift.dll
+++ b/ext/openssl/windows/x86/lib/engines/cswift.dll
--- a/ext/openssl/windows/x86/lib/engines/gmp.dll
+++ b/ext/openssl/windows/x86/lib/engines/gmp.dll
--- a/ext/openssl/windows/x86/lib/engines/gost.dll
+++ b/ext/openssl/windows/x86/lib/engines/gost.dll
--- a/ext/openssl/windows/x86/lib/engines/nuron.dll
+++ b/ext/openssl/windows/x86/lib/engines/nuron.dll
--- a/ext/openssl/windows/x86/lib/engines/padlock.dll
+++ b/ext/openssl/windows/x86/lib/engines/padlock.dll
--- a/ext/openssl/windows/x86/lib/engines/sureware.dll
+++ b/ext/openssl/windows/x86/lib/engines/sureware.dll
--- a/ext/openssl/windows/x86/lib/engines/ubsec.dll
+++ b/ext/openssl/windows/x86/lib/engines/ubsec.dll
--- a/ext/openssl/windows/x86/lib/libeay32.lib
+++ b/ext/openssl/windows/x86/lib/libeay32.lib
--- a/ext/openssl/windows/x86/lib/ssleay32.lib
+++ b/ext/openssl/windows/x86/lib/ssleay32.lib
--- a/res/Readme.txt
+++ b/res/Readme.txt
@@ -3,8 +3,8 @@ http://symless.com/

 Synergy allows you to share your keyboard and mouse between computers over a network.

-For FAQ, setup, and usage instructions, please visit our wiki:
-https://github.com/symless/synergy-core/wiki
+For FAQ, setup, and usage instructions, please visit our online Readme:
+http://symless.com/pm/projects/synergy/wiki/Readme

 Have fun!

--- a/res/synergy.desktop
+++ b/res/synergy.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Synergy
+Comment=Keyboard and mouse sharing solution
+Path=/usr/bin
+Exec=/usr/bin/synergy
+Icon=synergy
+Terminal=false
+Categories=Utility;
+Keywords=keyboard;mouse;sharing;network;share;
+
--- a/res/synergy2.desktop
+++ b/res/synergy2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Synergy
+Comment=Keyboard and mouse sharing solution
+Path=/usr/bin
+Exec=/usr/bin/synergy2
+Icon=synergy
+Terminal=false
+Categories=Utility;
+Keywords=keyboard;mouse;sharing;network;share;
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,3 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)

 add_subdirectory(lib)
 add_subdirectory(cmd)
+if (SYNERGY_BUILD_LEGACY_GUI)
+add_subdirectory(gui)
+endif (SYNERGY_BUILD_LEGACY_GUI)
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-add_subdirectory(core)
 add_subdirectory(synergyc)
 add_subdirectory(synergys)
+add_subdirectory(syntool)
+
+if (SYNERGY_BUILD_LEGACY_SERVICE)
+	add_subdirectory(synergyd)
+endif (SYNERGY_BUILD_LEGACY_SERVICE)
+
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -19,6 +19,8 @@ set(sources
 )

 if (WIN32)
+    file(GLOB arch_headers "MSWindows*.h")
+    file(GLOB arch_sources "MSWindows*.cpp")
    list(APPEND sources
        resource.h
        synergyc.ico
@@ -28,6 +30,12 @@ if (WIN32)
        tb_run.ico
        tb_wait.ico
    )
+elseif (APPLE)
+    file(GLOB arch_headers "OSX*.h")
+    file(GLOB arch_sources "OSX*.cpp")
+elseif (UNIX)
+    file(GLOB arch_headers "XWindows*.h")
+    file(GLOB arch_sources "XWindows*.cpp")
 endif()

 list(APPEND sources ${arch_sources})
@@ -39,4 +47,11 @@ endif()

 add_executable(synergyc ${sources})
 target_link_libraries(synergyc
-    arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS})
+    arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install (TARGETS synergyc DESTINATION bin)
+endif()
+
--- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
@@ -0,0 +1,376 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MSWindowsClientTaskBarReceiver.h"
+
+#include "resource.h"
+#include "client/Client.h"
+#include "platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsScreen.h"
+#include "arch/win32/ArchTaskBarWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/log_outputters.h"
+#include "base/EventTypes.h"
+
+//
+// MSWindowsClientTaskBarReceiver
+//
+
+const UINT MSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] =
+{
+    IDI_TASKBAR_NOT_RUNNING,
+    IDI_TASKBAR_NOT_WORKING,
+    IDI_TASKBAR_NOT_CONNECTED,
+    IDI_TASKBAR_NOT_CONNECTED,
+    IDI_TASKBAR_CONNECTED
+};
+
+MSWindowsClientTaskBarReceiver::MSWindowsClientTaskBarReceiver(
+                HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
+    ClientTaskBarReceiver(events),
+    m_appInstance(appInstance),
+    m_window(NULL),
+    m_logBuffer(logBuffer)
+{
+    for (UInt32 i = 0; i < kMaxState; ++i) {
+        m_icon[i] = loadIcon(s_stateToIconID[i]);
+    }
+    m_menu = LoadMenu(m_appInstance, MAKEINTRESOURCE(IDR_TASKBAR));
+
+    // don't create the window yet.  we'll create it on demand.  this
+    // has the side benefit of being created in the thread used for
+    // the task bar.  that's good because it means the existence of
+    // the window won't prevent changing the main thread's desktop.
+
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+MSWindowsClientTaskBarReceiver::~MSWindowsClientTaskBarReceiver()
+{
+    cleanup();
+}
+
+void
+MSWindowsClientTaskBarReceiver::cleanup()
+{
+    ARCH->removeReceiver(this);
+    for (UInt32 i = 0; i < kMaxState; ++i) {
+        deleteIcon(m_icon[i]);
+    }
+    DestroyMenu(m_menu);
+    destroyWindow();
+}
+
+void
+MSWindowsClientTaskBarReceiver::showStatus()
+{
+    // create the window
+    createWindow();
+
+    // lock self while getting status
+    lock();
+
+    // get the current status
+    std::string status = getToolTip();
+
+    // done getting status
+    unlock();
+
+    // update dialog
+    HWND child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_STATUS);
+    SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
+
+    if (!IsWindowVisible(m_window)) {
+        // position it by the mouse
+        POINT cursorPos;
+        GetCursorPos(&cursorPos);
+        RECT windowRect;
+        GetWindowRect(m_window, &windowRect);
+        int  x = cursorPos.x;
+        int  y = cursorPos.y;
+        int fw = GetSystemMetrics(SM_CXDLGFRAME);
+        int fh = GetSystemMetrics(SM_CYDLGFRAME);
+        int ww = windowRect.right  - windowRect.left;
+        int wh = windowRect.bottom - windowRect.top;
+        int sw = GetSystemMetrics(SM_CXFULLSCREEN);
+        int sh = GetSystemMetrics(SM_CYFULLSCREEN);
+        if (fw < 1) {
+            fw = 1;
+        }
+        if (fh < 1) {
+            fh = 1;
+        }
+        if (x + ww - fw > sw) {
+            x -= ww - fw;
+        }
+        else {
+            x -= fw;
+        }
+        if (x < 0) {
+            x = 0;
+        }
+        if (y + wh - fh > sh) {
+            y -= wh - fh;
+        }
+        else {
+            y -= fh;
+        }
+        if (y < 0) {
+            y = 0;
+        }
+        SetWindowPos(m_window, HWND_TOPMOST, x, y, ww, wh,
+                            SWP_SHOWWINDOW);
+    }
+}
+
+void
+MSWindowsClientTaskBarReceiver::runMenu(int x, int y)
+{
+    // do popup menu.  we need a window to pass to TrackPopupMenu().
+    // the SetForegroundWindow() and SendMessage() calls around
+    // TrackPopupMenu() are to get the menu to be dismissed when
+    // another window gets activated and are just one of those
+    // win32 weirdnesses.
+    createWindow();
+    SetForegroundWindow(m_window);
+    HMENU menu = GetSubMenu(m_menu, 0);
+    SetMenuDefaultItem(menu, IDC_TASKBAR_STATUS, FALSE);
+    HMENU logLevelMenu = GetSubMenu(menu, 3);
+    CheckMenuRadioItem(logLevelMenu, 0, 6,
+                            CLOG->getFilter() - kERROR, MF_BYPOSITION);
+    int n = TrackPopupMenu(menu,
+                            TPM_NONOTIFY |
+                            TPM_RETURNCMD |
+                            TPM_LEFTBUTTON |
+                            TPM_RIGHTBUTTON,
+                            x, y, 0, m_window, NULL);
+    SendMessage(m_window, WM_NULL, 0, 0);
+
+    // perform the requested operation
+    switch (n) {
+    case IDC_TASKBAR_STATUS:
+        showStatus();
+        break;
+
+    case IDC_TASKBAR_LOG:
+        copyLog();
+        break;
+
+    case IDC_TASKBAR_SHOW_LOG:
+        ARCH->showConsole(true);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_ERROR:
+        CLOG->setFilter(kERROR);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_WARNING:
+        CLOG->setFilter(kWARNING);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_NOTE:
+        CLOG->setFilter(kNOTE);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_INFO:
+        CLOG->setFilter(kINFO);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG:
+        CLOG->setFilter(kDEBUG);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG1:
+        CLOG->setFilter(kDEBUG1);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG2:
+        CLOG->setFilter(kDEBUG2);
+        break;
+
+    case IDC_TASKBAR_QUIT:
+        quit();
+        break;
+    }
+}
+
+void
+MSWindowsClientTaskBarReceiver::primaryAction()
+{
+    showStatus();
+}
+
+const IArchTaskBarReceiver::Icon
+MSWindowsClientTaskBarReceiver::getIcon() const
+{
+    return static_cast<Icon>(m_icon[getStatus()]);
+}
+
+void
+MSWindowsClientTaskBarReceiver::copyLog() const
+{
+    if (m_logBuffer != NULL) {
+        // collect log buffer
+        String data;
+        for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
+                                index != m_logBuffer->end(); ++index) {
+            data += *index;
+            data += "\n";
+        }
+
+        // copy log to clipboard
+        if (!data.empty()) {
+            MSWindowsClipboard clipboard(m_window);
+            clipboard.open(0);
+            clipboard.emptyUnowned();
+            clipboard.add(IClipboard::kText, data);
+            clipboard.close();
+        }
+    }
+}
+
+void
+MSWindowsClientTaskBarReceiver::onStatusChanged()
+{
+    if (IsWindowVisible(m_window)) {
+        showStatus();
+    }
+}
+
+HICON
+MSWindowsClientTaskBarReceiver::loadIcon(UINT id)
+{
+    HANDLE icon = LoadImage(m_appInstance,
+                            MAKEINTRESOURCE(id),
+                            IMAGE_ICON,
+                            0, 0,
+                            LR_DEFAULTCOLOR);
+    return static_cast<HICON>(icon);
+}
+
+void
+MSWindowsClientTaskBarReceiver::deleteIcon(HICON icon)
+{
+    if (icon != NULL) {
+        DestroyIcon(icon);
+    }
+}
+
+void
+MSWindowsClientTaskBarReceiver::createWindow()
+{
+    // ignore if already created
+    if (m_window != NULL) {
+        return;
+    }
+
+    // get the status dialog
+    m_window = CreateDialogParam(m_appInstance,
+                            MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
+                            NULL,
+                            (DLGPROC)&MSWindowsClientTaskBarReceiver::staticDlgProc,
+                            reinterpret_cast<LPARAM>(
+                                static_cast<void*>(this)));
+
+    // window should appear on top of everything, including (especially)
+    // the task bar.
+    LONG_PTR style = GetWindowLongPtr(m_window, GWL_EXSTYLE);
+    style |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
+    SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
+
+    // tell the task bar about this dialog
+    ArchTaskBarWindows::addDialog(m_window);
+}
+
+void
+MSWindowsClientTaskBarReceiver::destroyWindow()
+{
+    if (m_window != NULL) {
+        ArchTaskBarWindows::removeDialog(m_window);
+        DestroyWindow(m_window);
+        m_window = NULL;
+    }
+}
+
+BOOL
+MSWindowsClientTaskBarReceiver::dlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM)
+{
+    switch (msg) {
+    case WM_INITDIALOG:
+        // use default focus
+        return TRUE;
+
+    case WM_ACTIVATE:
+        // hide when another window is activated
+        if (LOWORD(wParam) == WA_INACTIVE) {
+            ShowWindow(hwnd, SW_HIDE);
+        }
+        break;
+    }
+    return FALSE;
+}
+
+BOOL CALLBACK
+MSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    // if msg is WM_INITDIALOG, extract the MSWindowsClientTaskBarReceiver*
+    // and put it in the extra window data then forward the call.
+    MSWindowsClientTaskBarReceiver* self = NULL;
+    if (msg == WM_INITDIALOG) {
+        self = static_cast<MSWindowsClientTaskBarReceiver*>(
+                            reinterpret_cast<void*>(lParam));
+        SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) lParam);
+    }
+    else {
+        // get the extra window data and forward the call
+        LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+        if (data != 0) {
+            self = (MSWindowsClientTaskBarReceiver*) data;
+        }
+    }
+
+    // forward the message
+    if (self != NULL) {
+        return self->dlgProc(hwnd, msg, wParam, lParam);
+    }
+    else {
+        return (msg == WM_INITDIALOG) ? TRUE : FALSE;
+    }
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    ArchMiscWindows::setIcons(
+        (HICON)LoadImage(ArchMiscWindows::instanceWin32(),
+        MAKEINTRESOURCE(IDI_SYNERGY),
+        IMAGE_ICON,
+        32, 32, LR_SHARED),
+        (HICON)LoadImage(ArchMiscWindows::instanceWin32(),
+        MAKEINTRESOURCE(IDI_SYNERGY),
+        IMAGE_ICON,
+        16, 16, LR_SHARED));
+
+    return new MSWindowsClientTaskBarReceiver(
+        MSWindowsScreen::getWindowInstance(), logBuffer, events);
+}
--- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h
@@ -0,0 +1,68 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ClientTaskBarReceiver.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+class BufferedLogOutputter;
+class IEventQueue;
+
+//! Implementation of ClientTaskBarReceiver for Microsoft Windows
+class MSWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
+public:
+    MSWindowsClientTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~MSWindowsClientTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+    void cleanup();
+
+protected:
+    void                copyLog() const;
+
+    // ClientTaskBarReceiver overrides
+    virtual void        onStatusChanged();
+
+private:
+    HICON                loadIcon(UINT);
+    void                deleteIcon(HICON);
+    void                createWindow();
+    void                destroyWindow();
+
+    BOOL                dlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam);
+    static BOOL CALLBACK
+                        staticDlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam);
+
+private:
+    HINSTANCE            m_appInstance;
+    HWND                m_window;
+    HMENU                m_menu;
+    HICON                m_icon[kMaxState];
+    const BufferedLogOutputter*    m_logBuffer;
+
+    static const UINT    s_stateToIconID[];
+};
--- a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
@@ -0,0 +1,69 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "OSXClientTaskBarReceiver.h"
+#include "arch/Arch.h"
+
+//
+// OSXClientTaskBarReceiver
+//
+
+OSXClientTaskBarReceiver::OSXClientTaskBarReceiver(
+        const BufferedLogOutputter*,
+        IEventQueue* events) :
+    ClientTaskBarReceiver(events)
+{
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+OSXClientTaskBarReceiver::~OSXClientTaskBarReceiver()
+{
+    ARCH->removeReceiver(this);
+}
+
+void
+OSXClientTaskBarReceiver::showStatus()
+{
+    // do nothing
+}
+
+void
+OSXClientTaskBarReceiver::runMenu(int, int)
+{
+    // do nothing
+}
+
+void
+OSXClientTaskBarReceiver::primaryAction()
+{
+    // do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+OSXClientTaskBarReceiver::getIcon() const
+{
+    return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    return new OSXClientTaskBarReceiver(logBuffer, events);
+}
+
--- a/src/cmd/synergyc/OSXClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/OSXClientTaskBarReceiver.h
@@ -0,0 +1,37 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ClientTaskBarReceiver.h"
+
+class BufferedLogOutputter;
+class IEventQueue;
+
+//! Implementation of ClientTaskBarReceiver for OS X
+class OSXClientTaskBarReceiver : public ClientTaskBarReceiver {
+public:
+    OSXClientTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~OSXClientTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+};
--- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
@@ -0,0 +1,68 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "XWindowsClientTaskBarReceiver.h"
+#include "arch/Arch.h"
+
+//
+// CXWindowsClientTaskBarReceiver
+//
+
+CXWindowsClientTaskBarReceiver::CXWindowsClientTaskBarReceiver(
+        const BufferedLogOutputter*,
+        IEventQueue* events) :
+    ClientTaskBarReceiver(events)
+{
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+CXWindowsClientTaskBarReceiver::~CXWindowsClientTaskBarReceiver()
+{
+    ARCH->removeReceiver(this);
+}
+
+void
+CXWindowsClientTaskBarReceiver::showStatus()
+{
+    // do nothing
+}
+
+void
+CXWindowsClientTaskBarReceiver::runMenu(int, int)
+{
+    // do nothing
+}
+
+void
+CXWindowsClientTaskBarReceiver::primaryAction()
+{
+    // do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+CXWindowsClientTaskBarReceiver::getIcon() const
+{
+    return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    return new CXWindowsClientTaskBarReceiver(logBuffer, events);
+}
--- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ClientTaskBarReceiver.h"
+
+class BufferedLogOutputter;
+class IEventQueue;
+
+//! Implementation of ClientTaskBarReceiver for X Windows
+class CXWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
+public:
+    CXWindowsClientTaskBarReceiver(
+        const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~CXWindowsClientTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+};
--- a/src/cmd/synergyc/synergyc.cpp
+++ b/src/cmd/synergyc/synergyc.cpp
@@ -16,18 +16,24 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "core/ClientApp.h"
+#include "synergy/ClientApp.h"
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/EventQueue.h"

-#include <iostream>
+#if WINAPI_MSWINDOWS
+#include "MSWindowsClientTaskBarReceiver.h"
+#elif WINAPI_XWINDOWS
+#include "XWindowsClientTaskBarReceiver.h"
+#elif WINAPI_CARBON
+#include "OSXClientTaskBarReceiver.h"
+#else
+#error Platform not supported.
+#endif

 int
 main(int argc, char** argv) 
 {
-    std::cerr << "warning: synergyc is deprecated. instead, use: synergy-core --client" << std::endl;
-
 #if SYSAPI_WIN32
    // record window instance for tray icon, etc
    ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
@@ -39,6 +45,6 @@ main(int argc, char** argv)
    Log log;
    EventQueue events;

-    ClientApp app(&events);
+    ClientApp app(&events, createTaskBarReceiver);
    return app.run(argc, argv);
 }
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -0,0 +1,27 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012-2016 Symless Ltd.
+# Copyright (C) 2012 Nick Bolton
+#
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file LICENSE that should have accompanied this file.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+file(GLOB headers "*.h")
+file(GLOB sources "*.cpp")
+
+if (WIN32)
+  add_executable (synergyd WIN32 ${sources})
+else()
+  add_executable (synergyd ${sources})
+endif()
+
+target_link_libraries (synergyd
+    arch base common io ipc mt net platform synlib shared ${libs} ${OPENSSL_LIBS})
--- a/src/cmd/synergyd/synergyd.cpp
+++ b/src/cmd/synergyd/synergyd.cpp
@@ -0,0 +1,44 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2012 Nick Bolton
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "synergy/DaemonApp.h"
+
+#include <iostream>
+
+#ifdef SYSAPI_UNIX
+
+int
+main(int argc, char** argv)
+{
+    DaemonApp app;
+    return app.run(argc, argv);
+}
+
+#elif SYSAPI_WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+int WINAPI
+WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    DaemonApp app;
+    return app.run(__argc, __argv);
+}
+
+#endif
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -19,6 +19,8 @@ set(sources
 )

 if (WIN32)
+    file(GLOB arch_headers "MSWindows*.h")
+    file(GLOB arch_sources "MSWindows*.cpp")
    list(APPEND sources
        resource.h
        synergys.ico
@@ -28,12 +30,29 @@ if (WIN32)
        tb_run.ico
        tb_wait.ico
    )
+elseif (APPLE)
+    file(GLOB arch_headers "OSX*.h")
+    file(GLOB arch_sources "OSX*.cpp")
+elseif (UNIX)
+    file(GLOB arch_headers "XWindows*.h")
+    file(GLOB arch_sources "XWindows*.cpp")
 endif()

+list(APPEND sources ${arch_sources})
+list(APPEND headers ${arch_headers})
+
 if (SYNERGY_ADD_HEADERS)
    list(APPEND sources ${headers})
 endif()

 add_executable(synergys ${sources})
 target_link_libraries(synergys
-    arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS})
+    arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    install (TARGETS synergys DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install (TARGETS synergys DESTINATION bin)
+endif()
+
+
--- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
@@ -0,0 +1,408 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MSWindowsServerTaskBarReceiver.h"
+
+#include "resource.h"
+#include "server/Server.h"
+#include "platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsScreen.h"
+#include "arch/win32/ArchTaskBarWindows.h"
+#include "arch/win32/ArchMiscWindows.h"
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/IEventQueue.h"
+#include "base/log_outputters.h"
+#include "base/EventTypes.h"
+
+//
+// MSWindowsServerTaskBarReceiver
+//
+
+const UINT MSWindowsServerTaskBarReceiver::s_stateToIconID[kMaxState] =
+{
+    IDI_TASKBAR_NOT_RUNNING,
+    IDI_TASKBAR_NOT_WORKING,
+    IDI_TASKBAR_NOT_CONNECTED,
+    IDI_TASKBAR_CONNECTED
+};
+
+MSWindowsServerTaskBarReceiver::MSWindowsServerTaskBarReceiver(
+                HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
+    ServerTaskBarReceiver(events),
+    m_events(events),
+    m_appInstance(appInstance),
+    m_window(NULL),
+    m_logBuffer(logBuffer)
+{
+    for (UInt32 i = 0; i < kMaxState; ++i) {
+        m_icon[i] = loadIcon(s_stateToIconID[i]);
+    }
+    m_menu = LoadMenu(m_appInstance, MAKEINTRESOURCE(IDR_TASKBAR));
+
+    // don't create the window yet.  we'll create it on demand.  this
+    // has the side benefit of being created in the thread used for
+    // the task bar.  that's good because it means the existence of
+    // the window won't prevent changing the main thread's desktop.
+
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+void
+MSWindowsServerTaskBarReceiver::cleanup()
+{
+    ARCH->removeReceiver(this);
+    for (UInt32 i = 0; i < kMaxState; ++i) {
+        deleteIcon(m_icon[i]);
+    }
+    DestroyMenu(m_menu);
+    destroyWindow();
+}
+
+MSWindowsServerTaskBarReceiver::~MSWindowsServerTaskBarReceiver()
+{
+    cleanup();
+}
+
+void
+MSWindowsServerTaskBarReceiver::showStatus()
+{
+    // create the window
+    createWindow();
+
+    // lock self while getting status
+    lock();
+
+    // get the current status
+    std::string status = getToolTip();
+
+    // get the connect clients, if any
+    const Clients& clients = getClients();
+
+    // done getting status
+    unlock();
+
+    // update dialog
+    HWND child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_STATUS);
+    SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
+    child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_CLIENTS);
+    SendMessage(child, LB_RESETCONTENT, 0, 0);
+    for (Clients::const_iterator index = clients.begin();
+                            index != clients.end(); ) {
+        const char* client = index->c_str();
+        if (++index == clients.end()) {
+            SendMessage(child, LB_ADDSTRING, 0, (LPARAM)client);
+        }
+        else {
+            SendMessage(child, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)client);
+        }
+    }
+
+    if (!IsWindowVisible(m_window)) {
+        // position it by the mouse
+        POINT cursorPos;
+        GetCursorPos(&cursorPos);
+        RECT windowRect;
+        GetWindowRect(m_window, &windowRect);
+        int  x = cursorPos.x;
+        int  y = cursorPos.y;
+        int fw = GetSystemMetrics(SM_CXDLGFRAME);
+        int fh = GetSystemMetrics(SM_CYDLGFRAME);
+        int ww = windowRect.right  - windowRect.left;
+        int wh = windowRect.bottom - windowRect.top;
+        int sw = GetSystemMetrics(SM_CXFULLSCREEN);
+        int sh = GetSystemMetrics(SM_CYFULLSCREEN);
+        if (fw < 1) {
+            fw = 1;
+        }
+        if (fh < 1) {
+            fh = 1;
+        }
+        if (x + ww - fw > sw) {
+            x -= ww - fw;
+        }
+        else {
+            x -= fw;
+        }
+        if (x < 0) {
+            x = 0;
+        }
+        if (y + wh - fh > sh) {
+            y -= wh - fh;
+        }
+        else {
+            y -= fh;
+        }
+        if (y < 0) {
+            y = 0;
+        }
+        SetWindowPos(m_window, HWND_TOPMOST, x, y, ww, wh,
+                            SWP_SHOWWINDOW);
+    }
+}
+
+void
+MSWindowsServerTaskBarReceiver::runMenu(int x, int y)
+{
+    // do popup menu.  we need a window to pass to TrackPopupMenu().
+    // the SetForegroundWindow() and SendMessage() calls around
+    // TrackPopupMenu() are to get the menu to be dismissed when
+    // another window gets activated and are just one of those
+    // win32 weirdnesses.
+    createWindow();
+    SetForegroundWindow(m_window);
+    HMENU menu = GetSubMenu(m_menu, 0);
+    SetMenuDefaultItem(menu, IDC_TASKBAR_STATUS, FALSE);
+    HMENU logLevelMenu = GetSubMenu(menu, 3);
+    CheckMenuRadioItem(logLevelMenu, 0, 6,
+                            CLOG->getFilter() - kERROR, MF_BYPOSITION);
+    int n = TrackPopupMenu(menu,
+                            TPM_NONOTIFY |
+                            TPM_RETURNCMD |
+                            TPM_LEFTBUTTON |
+                            TPM_RIGHTBUTTON,
+                            x, y, 0, m_window, NULL);
+    SendMessage(m_window, WM_NULL, 0, 0);
+
+    // perform the requested operation
+    switch (n) {
+    case IDC_TASKBAR_STATUS:
+        showStatus();
+        break;
+
+    case IDC_TASKBAR_LOG:
+        copyLog();
+        break;
+
+    case IDC_TASKBAR_SHOW_LOG:
+        ARCH->showConsole(true);
+        break;
+
+    case IDC_RELOAD_CONFIG:
+        m_events->addEvent(Event(m_events->forServerApp().reloadConfig(),
+                            m_events->getSystemTarget()));
+        break;
+
+    case IDC_FORCE_RECONNECT:
+        m_events->addEvent(Event(m_events->forServerApp().forceReconnect(),
+                            m_events->getSystemTarget()));
+        break;
+
+    case ID_SYNERGY_RESETSERVER:
+        m_events->addEvent(Event(m_events->forServerApp().resetServer(),
+                            m_events->getSystemTarget()));
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_ERROR:
+        CLOG->setFilter(kERROR);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_WARNING:
+        CLOG->setFilter(kWARNING);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_NOTE:
+        CLOG->setFilter(kNOTE);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_INFO:
+        CLOG->setFilter(kINFO);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG:
+        CLOG->setFilter(kDEBUG);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG1:
+        CLOG->setFilter(kDEBUG1);
+        break;
+
+    case IDC_TASKBAR_LOG_LEVEL_DEBUG2:
+        CLOG->setFilter(kDEBUG2);
+        break;
+
+    case IDC_TASKBAR_QUIT:
+        quit();
+        break;
+    }
+}
+
+void
+MSWindowsServerTaskBarReceiver::primaryAction()
+{
+    showStatus();
+}
+
+const IArchTaskBarReceiver::Icon
+MSWindowsServerTaskBarReceiver::getIcon() const
+{
+    return static_cast<Icon>(m_icon[getStatus()]);
+}
+
+void
+MSWindowsServerTaskBarReceiver::copyLog() const
+{
+    if (m_logBuffer != NULL) {
+        // collect log buffer
+        String data;
+        for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
+                                index != m_logBuffer->end(); ++index) {
+            data += *index;
+            data += "\n";
+        }
+
+        // copy log to clipboard
+        if (!data.empty()) {
+            MSWindowsClipboard clipboard(m_window);
+            clipboard.open(0);
+            clipboard.emptyUnowned();
+            clipboard.add(IClipboard::kText, data);
+            clipboard.close();
+        }
+    }
+}
+
+void
+MSWindowsServerTaskBarReceiver::onStatusChanged()
+{
+    if (IsWindowVisible(m_window)) {
+        showStatus();
+    }
+}
+
+HICON
+MSWindowsServerTaskBarReceiver::loadIcon(UINT id)
+{
+    HANDLE icon = LoadImage(m_appInstance,
+                            MAKEINTRESOURCE(id),
+                            IMAGE_ICON,
+                            0, 0,
+                            LR_DEFAULTCOLOR);
+    return static_cast<HICON>(icon);
+}
+
+void
+MSWindowsServerTaskBarReceiver::deleteIcon(HICON icon)
+{
+    if (icon != NULL) {
+        DestroyIcon(icon);
+    }
+}
+
+void
+MSWindowsServerTaskBarReceiver::createWindow()
+{
+    // ignore if already created
+    if (m_window != NULL) {
+        return;
+    }
+
+    // get the status dialog
+    m_window = CreateDialogParam(m_appInstance,
+                            MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
+                            NULL,
+                            (DLGPROC)&MSWindowsServerTaskBarReceiver::staticDlgProc,
+                            reinterpret_cast<LPARAM>(
+                                static_cast<void*>(this)));
+
+    // window should appear on top of everything, including (especially)
+    // the task bar.
+    LONG_PTR style = GetWindowLongPtr(m_window, GWL_EXSTYLE);
+    style |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
+    SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
+
+    // tell the task bar about this dialog
+    ArchTaskBarWindows::addDialog(m_window);
+}
+
+void
+MSWindowsServerTaskBarReceiver::destroyWindow()
+{
+    if (m_window != NULL) {
+        ArchTaskBarWindows::removeDialog(m_window);
+        DestroyWindow(m_window);
+        m_window = NULL;
+    }
+}
+
+BOOL
+MSWindowsServerTaskBarReceiver::dlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM)
+{
+    switch (msg) {
+    case WM_INITDIALOG:
+        // use default focus
+        return TRUE;
+
+    case WM_ACTIVATE:
+        // hide when another window is activated
+        if (LOWORD(wParam) == WA_INACTIVE) {
+            ShowWindow(hwnd, SW_HIDE);
+        }
+        break;
+    }
+    return FALSE;
+}
+
+BOOL CALLBACK
+MSWindowsServerTaskBarReceiver::staticDlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    // if msg is WM_INITDIALOG, extract the MSWindowsServerTaskBarReceiver*
+    // and put it in the extra window data then forward the call.
+    MSWindowsServerTaskBarReceiver* self = NULL;
+    if (msg == WM_INITDIALOG) {
+        self = static_cast<MSWindowsServerTaskBarReceiver*>(
+                            reinterpret_cast<void*>(lParam));
+        SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
+    }
+    else {
+        // get the extra window data and forward the call
+        LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+        if (data != 0) {
+            self = static_cast<MSWindowsServerTaskBarReceiver*>(
+                            reinterpret_cast<void*>(data));
+        }
+    }
+
+    // forward the message
+    if (self != NULL) {
+        return self->dlgProc(hwnd, msg, wParam, lParam);
+    }
+    else {
+        return (msg == WM_INITDIALOG) ? TRUE : FALSE;
+    }
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    ArchMiscWindows::setIcons(
+        (HICON)LoadImage(ArchMiscWindows::instanceWin32(),
+        MAKEINTRESOURCE(IDI_SYNERGY),
+        IMAGE_ICON,
+        32, 32, LR_SHARED),
+        (HICON)LoadImage(ArchMiscWindows::instanceWin32(),
+        MAKEINTRESOURCE(IDI_SYNERGY),
+        IMAGE_ICON,
+        16, 16, LR_SHARED));
+
+    return new MSWindowsServerTaskBarReceiver(
+        MSWindowsScreen::getWindowInstance(), logBuffer, events);
+}
--- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h
+++ b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h
@@ -0,0 +1,69 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ServerTaskBarReceiver.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+class BufferedLogOutputter;
+class IEventQueue;
+
+//! Implementation of ServerTaskBarReceiver for Microsoft Windows
+class MSWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
+public:
+    MSWindowsServerTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~MSWindowsServerTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+    void cleanup();
+
+protected:
+    void                copyLog() const;
+
+    // ServerTaskBarReceiver overrides
+    virtual void        onStatusChanged();
+
+private:
+    HICON                loadIcon(UINT);
+    void                deleteIcon(HICON);
+    void                createWindow();
+    void                destroyWindow();
+
+    BOOL                dlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam);
+    static BOOL CALLBACK
+                        staticDlgProc(HWND hwnd,
+                            UINT msg, WPARAM wParam, LPARAM lParam);
+
+private:
+    HINSTANCE            m_appInstance;
+    HWND                m_window;
+    HMENU                m_menu;
+    HICON                m_icon[kMaxState];
+    const BufferedLogOutputter*    m_logBuffer;
+    IEventQueue*        m_events;
+
+    static const UINT    s_stateToIconID[];
+};
--- a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/OSXServerTaskBarReceiver.cpp
@@ -0,0 +1,67 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "OSXServerTaskBarReceiver.h"
+#include "arch/Arch.h"
+
+//
+// OSXServerTaskBarReceiver
+//
+
+OSXServerTaskBarReceiver::OSXServerTaskBarReceiver(
+        const BufferedLogOutputter*, IEventQueue* events) :
+    ServerTaskBarReceiver(events)
+{
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+OSXServerTaskBarReceiver::~OSXServerTaskBarReceiver()
+{
+    ARCH->removeReceiver(this);
+}
+
+void
+OSXServerTaskBarReceiver::showStatus()
+{
+    // do nothing
+}
+
+void
+OSXServerTaskBarReceiver::runMenu(int, int)
+{
+    // do nothing
+}
+
+void
+OSXServerTaskBarReceiver::primaryAction()
+{
+    // do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+OSXServerTaskBarReceiver::getIcon() const
+{
+    return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    return new OSXServerTaskBarReceiver(logBuffer, events);
+}
--- a/src/cmd/synergys/OSXServerTaskBarReceiver.h
+++ b/src/cmd/synergys/OSXServerTaskBarReceiver.h
@@ -0,0 +1,36 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ServerTaskBarReceiver.h"
+
+class BufferedLogOutputter;
+
+//! Implementation of ServerTaskBarReceiver for OS X
+class OSXServerTaskBarReceiver : public ServerTaskBarReceiver {
+public:
+    OSXServerTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~OSXServerTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+};
--- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
@@ -0,0 +1,67 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "XWindowsServerTaskBarReceiver.h"
+#include "arch/Arch.h"
+
+//
+// CXWindowsServerTaskBarReceiver
+//
+
+CXWindowsServerTaskBarReceiver::CXWindowsServerTaskBarReceiver(
+        const BufferedLogOutputter*, IEventQueue* events) :
+    ServerTaskBarReceiver(events)
+{
+    // add ourself to the task bar
+    ARCH->addReceiver(this);
+}
+
+CXWindowsServerTaskBarReceiver::~CXWindowsServerTaskBarReceiver()
+{
+    ARCH->removeReceiver(this);
+}
+
+void
+CXWindowsServerTaskBarReceiver::showStatus()
+{
+    // do nothing
+}
+
+void
+CXWindowsServerTaskBarReceiver::runMenu(int, int)
+{
+    // do nothing
+}
+
+void
+CXWindowsServerTaskBarReceiver::primaryAction()
+{
+    // do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+CXWindowsServerTaskBarReceiver::getIcon() const
+{
+    return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
+{
+    return new CXWindowsServerTaskBarReceiver(logBuffer, events);
+}
--- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h
+++ b/src/cmd/synergys/XWindowsServerTaskBarReceiver.h
@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012-2016 Symless Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "synergy/ServerTaskBarReceiver.h"
+
+class BufferedLogOutputter;
+class IEventQueue;
+
+//! Implementation of ServerTaskBarReceiver for X Windows
+class CXWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
+public:
+    CXWindowsServerTaskBarReceiver(
+        const BufferedLogOutputter*, IEventQueue* events);
+    virtual ~CXWindowsServerTaskBarReceiver();
+
+    // IArchTaskBarReceiver overrides
+    virtual void        showStatus();
+    virtual void        runMenu(int x, int y);
+    virtual void        primaryAction();
+    virtual const Icon    getIcon() const;
+};
--- a/src/cmd/synergys/synergys.cpp
+++ b/src/cmd/synergys/synergys.cpp
@@ -16,18 +16,24 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "core/ServerApp.h"
+#include "synergy/ServerApp.h"
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "base/EventQueue.h"

-#include <iostream>
+#if WINAPI_MSWINDOWS
+#include "MSWindowsServerTaskBarReceiver.h"
+#elif WINAPI_XWINDOWS
+#include "XWindowsServerTaskBarReceiver.h"
+#elif WINAPI_CARBON
+#include "OSXServerTaskBarReceiver.h"
+#else
+#error Platform not supported.
+#endif

 int
 main(int argc, char** argv) 
 {
-    std::cerr << "warning: synergys is deprecated. instead, use: synergy-core --server" << std::endl;
-
 #if SYSAPI_WIN32
    // record window instance for tray icon, etc
    ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
@@ -39,6 +45,6 @@ main(int argc, char** argv)
    Log log;
    EventQueue events;

-    ServerApp app(&events);
+    ServerApp app(&events, createTaskBarReceiver);
    return app.run(argc, argv);
 }
--- a/src/cmd/syntool/CMakeLists.txt
+++ b/src/cmd/syntool/CMakeLists.txt
@@ -1,5 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2017 Symless Ltd.
+# Copyright (C) 2014-2016 Symless Ltd.
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -13,14 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-add_executable(synergy-core main.cpp)
-target_link_libraries(synergy-core
-    arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS})
+file(GLOB headers "*.h")
+file(GLOB sources "*.cpp")

-if (SYNERGY_CORE_INSTALL)
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        install (TARGETS synergy-core DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
-    elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-        install (TARGETS synergy-core DESTINATION bin)
-    endif()
+add_executable(syntool ${sources})
+target_link_libraries(syntool
+    synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    install (TARGETS syntool DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install (TARGETS syntool DESTINATION bin)
 endif()
--- a/src/cmd/syntool/syntool.cpp
+++ b/src/cmd/syntool/syntool.cpp
@@ -1,7 +1,6 @@
 /*
 * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
+ * Copyright (C) 2014-2016 Symless Ltd.
 * 
 * This package is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -16,46 +15,17 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "core/ClientApp.h"
-#include "core/ServerApp.h"
+#include "synergy/ToolApp.h"
 #include "arch/Arch.h"
-#include "base/Log.h"
-#include "base/EventQueue.h"
-
-#include <iostream>

 int
 main(int argc, char** argv) 
 {
-    // TODO: use existing arg parse code
-    bool server, client;
-    if (argc > 1) {
-        server = std::string(argv[1]) == "--server";
-        client = std::string(argv[1]) == "--client";
-    }
-
 #if SYSAPI_WIN32
    // record window instance for tray icon, etc
    ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
 #endif

-    Arch arch;
-    arch.init();
-
-    Log log;
-    EventQueue events;
-
-    if (server) {
-        ServerApp app(&events);
-        return app.run(argc, argv);
-    }
-    else if (client) {
-        ClientApp app(&events);
-        return app.run(argc, argv);
-    }
-    else {
-        // TODO: use common error code
-        std::cerr << "error: use --client or --server args" << std::endl;
-        return 1;
-    }
+    ToolApp app;
+    return app.run(argc, argv);
 }
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -0,0 +1,55 @@
+cmake_minimum_required (VERSION 3.4)
+
+find_package (Qt5 COMPONENTS Core Widgets Network)
+set (CMAKE_AUTOMOC ON)
+set (CMAKE_AUTORCC ON)
+set (CMAKE_AUTOUIC ON)
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+
+file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
+file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
+
+if (WIN32)
+    set (LEGACY_GUI_RC_FILES res/win/Synergy.rc)
+endif()
+
+add_executable (synergy WIN32
+    ${LEGACY_GUI_SOURCE_FILES}
+    ${LEGACY_GUI_UI_FILES}
+    ${LEGACY_GUI_RC_FILES}
+    res/Synergy.qrc
+)
+
+include_directories (./src)
+target_link_libraries (synergy shared)
+
+if (WIN32)
+    include_directories ($ENV{BONJOUR_SDK_HOME}/Include)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        find_library (DNSSD_LIB dnssd.lib 
+                  HINTS ENV BONJOUR_SDK_HOME
+                  PATH_SUFFIXES "Lib/x64")
+    else()
+        find_library (DNSSD_LIB dnssd.lib 
+                  HINTS ENV BONJOUR_SDK_HOME
+                  PATH_SUFFIXES "Lib/Win32")
+    endif()
+    
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    target_link_libraries (synergy dns_sd)
+endif()
+
+qt5_use_modules (synergy Core Widgets Network)
+target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}")
+target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}")
+
+if (WIN32)
+    target_link_libraries (synergy ${DNSSD_LIB})
+    set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
+endif()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    install (TARGETS synergy DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install (TARGETS synergy DESTINATION bin)
+endif()
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -0,0 +1,162 @@
+QT += widgets \
+    network
+TEMPLATE = app
+TARGET = synergy
+DEFINES += VERSION_STAGE=\\\"$$QMAKE_VERSION_STAGE\\\"
+DEFINES += VERSION_REVISION=\\\"$$QMAKE_VERSION_REVISION\\\"
+DEFINES -= UNICODE
+DEFINES += _MBCS
+DEPENDPATH += . \
+    res
+INCLUDEPATH += . \
+    src \
+    ../lib/shared/
+FORMS += src/MainWindowBase.ui \
+    src/AboutDialogBase.ui \
+    src/ServerConfigDialogBase.ui \
+    src/ScreenSettingsDialogBase.ui \
+    src/ActionDialogBase.ui \
+    src/HotkeyDialogBase.ui \
+    src/SettingsDialogBase.ui \
+    src/SetupWizardBase.ui \
+    src/AddClientDialogBase.ui \
+    src/ActivationDialog.ui \
+    src/CancelActivationDialog.ui \
+    src/FailedLoginDialog.ui
+SOURCES += src/main.cpp \
+    src/MainWindow.cpp \
+    src/AboutDialog.cpp \
+    src/ServerConfig.cpp \
+    src/ServerConfigDialog.cpp \
+    src/ScreenSetupView.cpp \
+    src/Screen.cpp \
+    src/ScreenSetupModel.cpp \
+    src/NewScreenWidget.cpp \
+    src/TrashScreenWidget.cpp \
+    src/ScreenSettingsDialog.cpp \
+    src/BaseConfig.cpp \
+    src/HotkeyDialog.cpp \
+    src/ActionDialog.cpp \
+    src/Hotkey.cpp \
+    src/Action.cpp \
+    src/KeySequence.cpp \
+    src/KeySequenceWidget.cpp \
+    src/SettingsDialog.cpp \
+    src/AppConfig.cpp \
+    src/QSynergyApplication.cpp \
+    src/VersionChecker.cpp \
+    src/SetupWizard.cpp \
+    src/IpcClient.cpp \
+    src/IpcReader.cpp \
+    src/Ipc.cpp \
+    src/SynergyLocale.cpp \
+    src/QUtility.cpp \
+    src/ZeroconfServer.cpp \
+    src/ZeroconfThread.cpp \
+    src/ZeroconfRegister.cpp \
+    src/ZeroconfBrowser.cpp \
+    src/ZeroconfService.cpp \
+    src/DataDownloader.cpp \
+    src/AddClientDialog.cpp \
+    src/CommandProcess.cpp \
+    src/CoreInterface.cpp \
+    src/Fingerprint.cpp \
+    src/SslCertificate.cpp \
+    src/WebClient.cpp \
+    src/ActivationNotifier.cpp \
+    src/ActivationDialog.cpp \
+    src/CancelActivationDialog.cpp \
+    src/FailedLoginDialog.cpp \
+    ../lib/shared/SerialKey.cpp \
+    src/LicenseManager.cpp
+HEADERS += src/MainWindow.h \
+    src/AboutDialog.h \
+    src/ServerConfig.h \
+    src/ServerConfigDialog.h \
+    src/ScreenSetupView.h \
+    src/Screen.h \
+    src/ScreenSetupModel.h \
+    src/NewScreenWidget.h \
+    src/TrashScreenWidget.h \
+    src/ScreenSettingsDialog.h \
+    src/BaseConfig.h \
+    src/HotkeyDialog.h \
+    src/ActionDialog.h \
+    src/Hotkey.h \
+    src/Action.h \
+    src/KeySequence.h \
+    src/KeySequenceWidget.h \
+    src/SettingsDialog.h \
+    src/AppConfig.h \
+    src/QSynergyApplication.h \
+    src/VersionChecker.h \
+    src/SetupWizard.h \
+    src/IpcClient.h \
+    src/IpcReader.h \
+    src/Ipc.h \
+    src/SynergyLocale.h \
+    src/QUtility.h \
+    src/ZeroconfServer.h \
+    src/ZeroconfThread.h \
+    src/ZeroconfRegister.h \
+    src/ZeroconfRecord.h \
+    src/ZeroconfBrowser.h \
+    src/ZeroconfService.h \
+    src/DataDownloader.h \
+    src/AddClientDialog.h \
+    src/CommandProcess.h \
+    src/ProcessorArch.h \
+    src/CoreInterface.h \
+    src/Fingerprint.h \
+    src/SslCertificate.h \
+    src/WebClient.h \
+    src/ActivationNotifier.h \
+    src/ElevateMode.h \
+    src/ActivationDialog.h \
+    src/CancelActivationDialog.h \
+    src/FailedLoginDialog.h \
+    ../lib/shared/EditionType.h \
+    ../lib/shared/SerialKey.h \
+    src/LicenseManager.h
+RESOURCES += res/Synergy.qrc
+RC_FILE = res/win/Synergy.rc
+macx { 
+    QMAKE_INFO_PLIST = res/mac/Info.plist
+    TARGET = Synergy
+    QSYNERGY_ICON.files = res/mac/Synergy.icns
+    QSYNERGY_ICON.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += QSYNERGY_ICON
+    LIBS += $$MACX_LIBS
+}
+unix:!macx:LIBS += -ldns_sd
+debug { 
+    OBJECTS_DIR = tmp/debug
+    MOC_DIR = tmp/debug
+    RCC_DIR = tmp/debug
+}
+release { 
+    OBJECTS_DIR = tmp/release
+    MOC_DIR = tmp/release
+    RCC_DIR = tmp/release
+}
+win32-msvc2015 {
+    LIBS += -lAdvapi32
+    QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMT
+}
+win32-msvc* {
+    contains(QMAKE_HOST.arch, x86):{
+        QMAKE_LFLAGS *= /MACHINE:X86
+        LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/Win32" -ldnssd
+    }
+
+    contains(QMAKE_HOST.arch, x86_64):{
+        QMAKE_LFLAGS *= /MACHINE:X64
+        LIBS += -L"$$(BONJOUR_SDK_HOME)/Lib/x64" -ldnssd
+    }
+}
+win32 { 
+    Debug:DESTDIR = ../../bin/Debug
+    Release:DESTDIR = ../../bin/Release
+    INCLUDEPATH += "$$(BONJOUR_SDK_HOME)/Include"
+}
+else:DESTDIR = ../../bin
--- a/src/gui/gui.ts
+++ b/src/gui/gui.ts
--- a/src/gui/lang.cmd
+++ b/src/gui/lang.cmd
@@ -0,0 +1 @@
+lupdate -noobsolete gui.pro -ts gui.ts
--- a/src/gui/langbuild.cmd
+++ b/src/gui/langbuild.cmd
@@ -0,0 +1,2 @@
+cd res/lang
+lrelease *.ts
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@@ -0,0 +1,58 @@
+<RCC>
+    <qresource prefix="/res">
+        <file>icons/16x16/synergy-connected.png</file>
+        <file>icons/16x16/synergy-disconnected.png</file>
+        <file>icons/64x64/video-display.png</file>
+        <file>icons/64x64/user-trash.png</file>
+        <file>icons/16x16/warning.png</file>
+        <file>icons/256x256/synergy.ico</file>
+        <file>image/about.png</file>
+        <file>lang/gui_ar.qm</file>
+        <file>lang/gui_bg-BG.qm</file>
+        <file>lang/gui_ca-AD.qm</file>
+        <file>lang/gui_cs-CZ.qm</file>
+        <file>lang/gui_cy.qm</file>
+        <file>lang/gui_da.qm</file>
+        <file>lang/gui_de.qm</file>
+        <file>lang/gui_es.qm</file>
+        <file>lang/gui_fi.qm</file>
+        <file>lang/gui_fr.qm</file>
+        <file>lang/gui_grk.qm</file>
+        <file>lang/gui_he.qm</file>
+        <file>lang/gui_hr-HR.qm</file>
+        <file>lang/gui_hu-HU.qm</file>
+        <file>lang/gui_id.qm</file>
+        <file>lang/gui_it.qm</file>
+        <file>lang/gui_ja-JP.qm</file>
+        <file>lang/gui_ko.qm</file>
+        <file>lang/gui_lt.qm</file>
+        <file>lang/gui_lv.qm</file>
+        <file>lang/gui_nl-NL.qm</file>
+        <file>lang/gui_no.qm</file>
+        <file>lang/gui_pes-IR.qm</file>
+        <file>lang/gui_pl-PL.qm</file>
+        <file>lang/gui_pt-BR.qm</file>
+        <file>lang/gui_pt-PT.qm</file>
+        <file>lang/gui_ro.qm</file>
+        <file>lang/gui_ru.qm</file>
+        <file>lang/gui_si.qm</file>
+        <file>lang/gui_sk-SK.qm</file>
+        <file>lang/gui_sl-SI.qm</file>
+        <file>lang/gui_sq-AL.qm</file>
+        <file>lang/gui_sr.qm</file>
+        <file>lang/gui_sv.qm</file>
+        <file>lang/gui_th-TH.qm</file>
+        <file>lang/gui_tr-TR.qm</file>
+        <file>lang/gui_uk.qm</file>
+        <file>lang/gui_ur.qm</file>
+        <file>lang/gui_mr.qm</file>
+        <file>lang/gui_vi.qm</file>
+        <file>lang/gui_zh-CN.qm</file>
+        <file>lang/gui_zh-TW.qm</file>
+        <file>lang/Languages.xml</file>
+        <file>icons/16x16/money.png</file>
+        <file>image/spinning-wheel.gif</file>
+        <file>icons/16x16/padlock.png</file>
+        <file>icons/16x16/synergy-transfering.png</file>
+    </qresource>
+</RCC>
--- a/src/gui/res/icons/16x16/money.png
+++ b/src/gui/res/icons/16x16/money.png
--- a/src/gui/res/icons/16x16/padlock.png
+++ b/src/gui/res/icons/16x16/padlock.png
--- a/src/gui/res/icons/16x16/synergy-connected.png
+++ b/src/gui/res/icons/16x16/synergy-connected.png
--- a/src/gui/res/icons/16x16/synergy-connected.psd
+++ b/src/gui/res/icons/16x16/synergy-connected.psd
--- a/src/gui/res/icons/16x16/synergy-disconnected.png
+++ b/src/gui/res/icons/16x16/synergy-disconnected.png
--- a/src/gui/res/icons/16x16/synergy-disconnected.psd
+++ b/src/gui/res/icons/16x16/synergy-disconnected.psd
--- a/src/gui/res/icons/16x16/synergy-transfering.png
+++ b/src/gui/res/icons/16x16/synergy-transfering.png
--- a/src/gui/res/icons/16x16/warning.png
+++ b/src/gui/res/icons/16x16/warning.png
--- a/src/gui/res/icons/256x256/synergy.ico
+++ b/src/gui/res/icons/256x256/synergy.ico
--- a/src/gui/res/icons/64x64/user-trash.png
+++ b/src/gui/res/icons/64x64/user-trash.png
--- a/src/gui/res/icons/64x64/video-display.png
+++ b/src/gui/res/icons/64x64/video-display.png
--- a/src/gui/res/image/about.png
+++ b/src/gui/res/image/about.png
--- a/src/gui/res/image/spinning-wheel.gif
+++ b/src/gui/res/image/spinning-wheel.gif
--- a/src/gui/res/lang/Languages.xml
+++ b/src/gui/res/lang/Languages.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<languages>
+  <language ietfCode="en" name="English" />
+	<language ietfCode="ca-AD" name="Català (Andorra)" />
+	<language ietfCode="cs-CZ" name="Čeština" />
+	<language ietfCode="cy" name="Cymraeg" />
+	<language ietfCode="da" name="Dansk" />
+	<language ietfCode="de" name="Deutsch" />
+	<language ietfCode="es" name="Español" />
+	<language ietfCode="fr" name="Français" />
+	<language ietfCode="hr-HR" name="Hrvatski" />
+	<language ietfCode="id" name="Indonesia" />
+	<language ietfCode="it" name="Italiano" />
+	<language ietfCode="lv" name="Latvijas" />
+	<language ietfCode="lt" name="Lietuvos" />
+	<language ietfCode="hu-HU" name="Magyar" />
+	<language ietfCode="nl-NL" name="Nederlands" />
+	<language ietfCode="no" name="Norsk" />
+	<language ietfCode="pl-PL" name="Polski" />
+	<language ietfCode="pt-PT" name="Português" />
+	<language ietfCode="pt-BR" name="Português (Brasil)" />
+	<language ietfCode="ro" name="Română" />
+	<language ietfCode="sq-AL" name="Shqiptar" />
+	<language ietfCode="sl-SI" name="Slovenščina" />
+	<language ietfCode="sk-SK" name="Slovenčina" />
+	<language ietfCode="fi" name="Suomi" />
+	<language ietfCode="sv" name="Svenska" />
+	<language ietfCode="vi" name="Tiếng Việt" />
+	<language ietfCode="tr-TR" name="Türkçe" />
+	<language ietfCode="bg-BG" name="български" />
+	<language ietfCode="ru" name="Русский" />
+	<language ietfCode="sr" name="српски" />
+	<language ietfCode="uk" name="Український" />
+	<language ietfCode="grk" name="Ελληνικά" />
+	<language ietfCode="he" name="עברית" />
+	<language ietfCode="ar" name="العربية" />
+	<language ietfCode="pes-IR" name="فارسی" />
+	<language ietfCode="ur" name="اردو" />
+	<language ietfCode="mr" name="मराठी" />
+	<language ietfCode="si" name="Sඉන්හල" />
+	<language ietfCode="th-TH" name="ภาษาไทย" />
+	<language ietfCode="zh-CN" name="中文 (简体)" />
+	<language ietfCode="zh-TW" name="中文 (繁體)" />
+	<language ietfCode="ja-JP" name="日本語" />
+	<language ietfCode="ko" name="한국어" />
+</languages>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Nelless	2a0225c105	Merge branch 'v0.9' of https://github.com/symless/synergy-core into v1.9	2018-04-10 11:18:42 +01:00
Andrew Nelless	ccea7624e5	v1.9.1	2018-04-10 11:18:28 +01:00
Andrew Nelless	5da6d3fb47	Update OpenSSL to v1.0.2o	2018-04-10 11:18:00 +01:00
Andrew Nelless	fb3de294ec	Merge branch 'v0.9-macsleep' into v1.9	2018-04-10 11:12:51 +01:00
Steve Williams	b46714957f	Merge pull request #6278 from symless/v1.9-macsleep @mrsixw #5964 Can't click on client after sleep	2018-03-29 10:23:13 +01:00
Steve Williams	67c7d0993f	#5964 Fix multiplatform sleep	2018-03-29 10:08:48 +01:00
Steve Williams	eb4047b9fb	#5964 Can't click on client after sleep	2018-03-29 09:54:53 +01:00
Andrew Nelless	35fb8c3389	Make macOS screen shape detection code more robust	2018-03-23 14:05:49 +00:00
Jerry (Xinyu Hou)	5697da164b	#6178 Check if we should use secure socket for listening	2018-03-21 11:26:06 +00:00
Jerry (Xinyu Hou)	0ef8838e88	#6178 Specifically specify IPv4 for IPC socket	2018-03-21 10:55:02 +00:00
Jerry (Xinyu Hou)	fa82f5cdf3	#6178 Fix compiling error for adding IPv6 for secure socket	2018-03-20 16:05:30 +00:00
Jerry (Xinyu Hou)	e01acb30b6	#6178 Fix include syntax	2018-03-20 15:22:52 +00:00
Jerry (Xinyu Hou)	8446fe5395	#6178 Merge IPv6 PR	2018-03-20 13:53:38 +00:00
Jerry (Xinyu Hou)	1e8e48d65b	Use corresponding Bonjour libs for different versions of OS	2018-03-20 11:41:38 +00:00
Steve Williams	82edfe087c	Ignore idea files	2018-03-20 10:13:39 +00:00
Andrew Nelless	5bd12f2376	v1.9.0-stable	2018-03-19 12:21:20 +00:00
Andrew Nelless	1d3e86dd55	Update OpenSSL to v1.0.2n	2018-03-19 11:27:34 +00:00
Andrew Nelless	4a3a5d5b0f	#6251 Attempt to fix Windows event loop hang	2018-03-18 20:50:26 +00:00
Andrew Nelless	a2929a7920	Bump Qt version	2018-02-28 01:14:41 +00:00
Andrew Nelless	f51ec97b3b	Update Qt version	2017-11-26 20:09:57 +00:00
Andrew Nelless	2600cb303d	Bump Qt 5 version	2017-11-16 00:27:35 +00:00
Nick Bolton	d61d2c0d6c	#6116 Change log level for unknown quartz event type to DEBUG3	2017-08-09 19:59:44 +01:00