[2.3.2-alpha]

CMakeLists.txt

@@ -53,7 +53,7 @@ include_directories (BEFORE SYSTEM ./ext/gtest/include)
 
 if (UNIX)
     if (NOT APPLE)
-        set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
     endif()
 
     # For config.h, detect the libraries, functions, etc.

README.md

@@ -1,9 +1,7 @@
 # Barrier
 
 Eliminate the barrier between your machines. 
-Find [releases for windows and macOS here](https://github.com/debauchee/barrier/releases).
-Your distro probably already has barrier packaged for it, see [distro specific packages](#distro-specific-packages)
-below for a list. Alternatively, we also provide a [flatpak](https://github.com/flathub/com.github.debauchee.barrier).
+Find [releases here](https://github.com/debauchee/barrier/releases).
 
 ### Contact info:
 
@@ -16,9 +14,8 @@ Master branch overall build status: [![Build Status](https://dev.azure.com/debau
 * Mac Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Mac%20Build)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
 * Windows Debug Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Debug)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
 * Windows Release Build Status: [![Build Status](https://dev.azure.com/debauchee/Barrier/_apis/build/status/debauchee.barrier?branchName=master&jobName=Windows%20Build&configuration=Windows%20Build%20Release%20with%20Release%20Installer)](https://dev.azure.com/debauchee/Barrier/_build/latest?definitionId=1&branchName=master)
-* Snap: [![Snap Status](https://build.snapcraft.io/badge/debauchee/barrier.svg)](https://build.snapcraft.io/user/debauchee/barrier)
 
-Our CI Builds are provided by Microsoft Azure Pipelines, Flathub, and Canonical.
+Our CI Builds are provided by Microsoft Azure Pipelines.
 
 ### What is it?
 
@@ -46,13 +43,6 @@ For short and simple questions or to just say hello find us on the Freenode IRC
 
 At this time we are looking for developers to help fix the issues found in the issue tracker. Submit pull requests once you've polished up your patch and we'll review and possibly merge it.
 
-## Distro specific packages
-
-While not a comprehensive list, repology provides a decent list of distro
-specific packages.
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/barrier.svg)](https://repology.org/project/barrier/versions)
-
 ### FAQ
 
 Q: Does drag and drop work on linux?

azure-pipelines/build_env_tmpl.bat

@@ -1,6 +1,6 @@
 set B_BUILD_TYPE=%CI_ENV_BUILD_TYPE%
 set B_QT_ROOT=%cd%\deps\Qt
-set B_QT_VER=Qt5.13.0\5.13.0
+set B_QT_VER=Qt5.12.3\5.12.3
 set B_QT_MSVC=msvc2017_64
 set B_BONJOUR=%cd%\deps\BonjourSDKLike
 

azure-pipelines/download_install_qt.ps1

@@ -1,7 +1,7 @@
 $ErrorActionPreference = "Stop"
 
 $qli_install_version = '2019.05.26.1'
-$qt_version = '5.13.0'
+$qt_version = '5.12.3'
 
 New-Item -Force -ItemType Directory -Path ".\deps\"
 

clean_build.bat

@@ -50,8 +50,6 @@ if exist bin\Debug (
     copy %B_QT_FULLPATH%\bin\Qt5Cored.dll bin\Debug\ > NUL
     copy ..\ext\openssl\windows\x64\bin\* bin\Debug\ > NUL
     copy ..\res\openssl\barrier.conf bin\Debug\ > NUL
-    mkdir bin\Debug\platforms
-    copy %B_QT_FULLPATH%\plugins\platforms\qwindowsd.dll bin\Debug\platforms\ > NUL
 ) else if exist bin\Release (
     copy %B_QT_FULLPATH%\bin\Qt5Core.dll bin\Release\ > NUL
     copy %B_QT_FULLPATH%\bin\Qt5Gui.dll bin\Release\ > NUL

cmake/Version.cmake

@@ -11,7 +11,7 @@ if (NOT DEFINED BARRIER_VERSION_MAJOR)
     if (DEFINED ENV{BARRIER_VERSION_MAJOR})
         set (BARRIER_VERSION_MAJOR $ENV{BARRIER_VERSION_MAJOR})
     else()
-        set (BARRIER_VERSION_MAJOR 2)
+        set (BARRIER_VERSION_MAJOR 1)
     endif()
 endif()
 
@@ -19,7 +19,7 @@ if (NOT DEFINED BARRIER_VERSION_MINOR)
     if (DEFINED ENV{BARRIER_VERSION_MINOR})
         set (BARRIER_VERSION_MINOR $ENV{BARRIER_VERSION_MINOR})
     else()
-        set (BARRIER_VERSION_MINOR 3)
+        set (BARRIER_VERSION_MINOR 9)
     endif()
 endif()
 
@@ -27,7 +27,7 @@ if (NOT DEFINED BARRIER_VERSION_PATCH)
     if (DEFINED ENV{BARRIER_VERSION_PATCH})
         set (BARRIER_VERSION_PATCH $ENV{BARRIER_VERSION_PATCH})
     else()
-        set (BARRIER_VERSION_PATCH 2)
+        set (BARRIER_VERSION_PATCH 0)
         message (WARNING "Barrier version wasn't set. Set to ${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
     endif()
 endif()

src/lib/platform/OSXScreen.h

@@ -118,7 +118,7 @@ private:
     void                sendClipboardEvent(Event::Type type, ClipboardID id) const;
 
     // message handlers
-    bool                onMouseMove(CGFloat mx, CGFloat my);
+    bool                onMouseMove(SInt32 mx, SInt32 my);
     // mouse button handler.  pressed is true if this is a mousedown
     // event, false if it is a mouseup event.  macButton is the index
     // of the button pressed using the mac button mapping.

src/lib/platform/OSXScreen.mm

@@ -1077,20 +1077,20 @@ OSXScreen::handleSystemEvent(const Event& event, void*)
 }
 
 bool 
-OSXScreen::onMouseMove(CGFloat mx, CGFloat my)
+OSXScreen::onMouseMove(SInt32 mx, SInt32 my)
 {
-	LOG((CLOG_DEBUG2 "mouse move %+f,%+f", mx, my));
+	LOG((CLOG_DEBUG2 "mouse move %+d,%+d", mx, my));
 
-	CGFloat x = mx - m_xCursor;
-	CGFloat y = my - m_yCursor;
+	SInt32 x = mx - m_xCursor;
+	SInt32 y = my - m_yCursor;
 
 	if ((x == 0 && y == 0) || (mx == m_xCenter && mx == m_yCenter)) {
 		return true;
 	}
 
 	// save position to compute delta of next motion
-	m_xCursor = (SInt32)mx;
-	m_yCursor = (SInt32)my;
+	m_xCursor = mx;
+	m_yCursor = my;
 
 	if (m_isOnScreen) {
 		// motion on primary screen
@@ -1119,21 +1119,7 @@ OSXScreen::onMouseMove(CGFloat mx, CGFloat my)
 		}
 		else {
 			// send motion
-			// Accumulate together the move into the running total
-			static CGFloat m_xFractionalMove = 0;
-			static CGFloat m_yFractionalMove = 0;
-
-			m_xFractionalMove += x;
-			m_yFractionalMove += y;
-
-			// Return the integer part
-			SInt32 intX = (SInt32)m_xFractionalMove;
-			SInt32 intY = (SInt32)m_yFractionalMove;
-
-			// And keep only the fractional part
-			m_xFractionalMove -= intX;
-			m_yFractionalMove -= intY;
-			sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(intX, intY));
+			sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(x, y));
 		}
 	}