[Cmake] bump version to 2.3.0

Clarify that 32-bit editions of windows are not supported.

Build.properties

@@ -1,7 +1,7 @@
 #
 # Barrier build parameters
 #
-BARRIER_VERSION_MAJOR = 1
+BARRIER_VERSION_MAJOR = 2
-BARRIER_VERSION_MINOR = 9
+BARRIER_VERSION_MINOR = 3
 BARRIER_VERSION_PATCH = 0
 BARRIER_VERSION_STAGE = snapshot

README.md

@@ -1,7 +1,7 @@
 # Barrier
 
 Eliminate the barrier between your machines. 
-Find [releaes here](https://github.com/debauchee/barrier/releases).
+Find [releases here](https://github.com/debauchee/barrier/releases).
 
 ### Contact info:
 
@@ -36,3 +36,21 @@ For short and simple questions or to just say hello find us on the Freenode IRC
 ### Contributions
 
 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.
+
+### FAQ
+
+Q: Does drag and drop work on linux?
+
+A: No
+
+Q: What OSes are supported?
+
+A:
+  - Windows 7, 8, 8.1, and 10
+  - MacOS/OS X
+  - Linux
+  - FreeBSD
+
+Q: Are 32-bit versions of Windows supported?
+
+A: No

azure-pipelines.yml

@@ -48,7 +48,7 @@ jobs:
       displayName: Publish Completed Build Directory Archive Build Artifact
       inputs:
         pathtoPublish: $(Build.ArtifactStagingDirectory)\$(CI_ENV_BUILD_TYPE).zip
-        artifactName: $(CI_ENV_BUILD_TYPE)
+        artifactName: Windows $(CI_ENV_BUILD_TYPE)
     - script: build_installer.bat
       displayName: Build Installer
       condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
@@ -57,13 +57,14 @@ jobs:
       condition: eq(variables['CI_ENV_BUILD_TYPE'], 'Release')
       inputs:
         pathtoPublish: build\installer-inno\bin
-        artifactName: Release Installer
+        artifactName: Windows Release Installer
 
 - job: LinuxBuild
   displayName: Linux Build
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
+    - script: sudo apt-get update -y
     - script: sudo apt-get install -y libxtst-dev qtdeclarative5-dev libavahi-compat-libdnssd-dev libcurl4-openssl-dev
       displayName: Install Dependencies
     - script: sh -x ./clean_build.sh
@@ -73,10 +74,21 @@ jobs:
   displayName: Mac Build
   pool:
     vmImage: 'macOS-10.14'
+  strategy:
+    matrix:
+      Release:
+        B_BUILD_TYPE: Release
+        BARRIER_VERSION_STAGE: Release
   steps:
-    - script: brew update
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/qt.rb
-      displayName: Update brew
+      displayName: Installed Pinned Qt
-    - script: brew install qt openssl
+    - script: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/aac86fc018c48d7b6f23a2e7535276899774567a/Formula/openssl.rb
-      displayName: Install Dependencies
+      displayName: Installed Pinned OpenSSL
     - script: sh -x ./clean_build.sh
       displayName: Clean Build
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Release DMG
+      condition: eq(variables['B_BUILD_TYPE'], 'Release')
+      inputs:
+        pathtoPublish: build/bundle
+        artifactName: Mac Release Disk Image and App

azure-pipelines/download_install_qt.ps1

@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"
 
-$qli_install_version = '2019.05.12.4'
+$qli_install_version = '2019.05.26.1'
 $qt_version = '5.12.3'
 
 New-Item -Force -ItemType Directory -Path ".\deps\"
@@ -21,5 +21,6 @@ Write-Output 'Installed QLI Installer Dependencies'
 
 Write-Output 'Starting QT Installer'
 $Env:QLI_OUT_DIR = ".\deps\Qt\Qt$qt_version"
+$Env:QLI_BASE_URL = "http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/"
 python .\deps\qli-installer\qli-installer.py $qt_version windows desktop win64_msvc2017_64
 Write-Output 'Installed QT Installer'

cmake/Version.cmake

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.4)
 
 set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 2)
+set (BARRIER_VERSION_MINOR 3)
 set (BARRIER_VERSION_PATCH 0)
 
 #

src/lib/platform/OSXScreen.mm

@@ -1263,36 +1263,23 @@ OSXScreen::onKey(CGEventRef event)
 		return true;
 	}
 
-	// check for hot key.  when we're on a secondary screen we disable
+	HotKeyToIDMap::const_iterator i = m_hotKeyToIDMap.find(HotKeyItem(virtualKey, m_keyState->mapModifiersToCarbon(macMask) & 0xff00u));
-	// all hotkeys so we can capture the OS defined hot keys as regular
+	if (i != m_hotKeyToIDMap.end()) {
-	// keystrokes but that means we don't get our own hot keys either.
+		UInt32 id = i->second;
-	// so we check for a key/modifier match in our hot key map.
+		// determine event type
-	if (!m_isOnScreen) {
+		Event::Type type;
-		HotKeyToIDMap::const_iterator i =
+		//UInt32 eventKind = GetEventKind(event);
-			m_hotKeyToIDMap.find(HotKeyItem(virtualKey, 
+		if (eventKind == kCGEventKeyDown) {
-											 m_keyState->mapModifiersToCarbon(macMask) 
+			type = m_events->forIPrimaryScreen().hotKeyDown();
-											 & 0xff00u));
-		if (i != m_hotKeyToIDMap.end()) {
-			UInt32 id = i->second;
-	
-			// determine event type
-			Event::Type type;
-			//UInt32 eventKind = GetEventKind(event);
-			if (eventKind == kCGEventKeyDown) {
-				type = m_events->forIPrimaryScreen().hotKeyDown();
-			}
-			else if (eventKind == kCGEventKeyUp) {
-				type = m_events->forIPrimaryScreen().hotKeyUp();
-			}
-			else {
-				return false;
-			}
-	
-			m_events->addEvent(Event(type, getEventTarget(),
-										HotKeyInfo::alloc(id)));
-		
-			return true;
 		}
+		else if (eventKind == kCGEventKeyUp) {
+			type = m_events->forIPrimaryScreen().hotKeyUp();
+		}
+		else {
+			return false;
+		}
+		m_events->addEvent(Event(type, getEventTarget(), HotKeyInfo::alloc(id)));
+		return true;
 	}
 
 	// decode event type