Merge pull request #1067 from cryzed/fix/server-preserve-focus

Fix `Fix Preserve Focus` option not working on Linux servers
Merge pull request #1506 from mipedja/master
2026-02-12 14:45:21 +08:00 · 2022-02-04 11:47:29 -05:00 · 2022-02-03 11:39:00 -05:00 · 2022-01-07 21:41:56 -08:00 · 2021-12-06 17:04:49 +02:00 · 2021-12-04 14:50:39 -05:00
12 changed files with 51 additions and 26 deletions
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ specific packages.

 **Q: Does drag and drop work on linux?**

-> A: No *(see [#855](https://github.com/debauchee/barrier/issues/544) if you'd like to change that)*
+> A: No *(see [#855](https://github.com/debauchee/barrier/issues/855) if you'd like to change that)*


 **Q: What OSes are supported?**
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,28 +9,14 @@ trigger:
 jobs:
 - job: WinBuild
  displayName: Windows Build
+  pool:
+    vmImage: 'vs2017-win2016'
  strategy:
    matrix:
-#        windows-2022-Debug:
-#            imageName: "windows-2022"
-#            CI_ENV_BUILD_TYPE: Debug
-#        windows-2022-Release:
-#            imageName: "windows-2022"
-#            CI_ENV_BUILD_TYPE: Release
-#        windows-2019-Debug:
-#            imageName: "windows-2019"
-#            CI_ENV_BUILD_TYPE: Debug
-#        windows-2019-Release:
-#            imageName: "windows-2019"
-#            CI_ENV_BUILD_TYPE: Release
-        windows-2016-Debug:
-            CI_ENV_BUILD_TYPE: Debug
-            imageName: "vs2017-win2016"
-        windows-2016-Release:
-            CI_ENV_BUILD_TYPE: Release
-            imageName: "vs2017-win2016"
-  pool:
-    vmImage: $(imageName)
+      Debug:
+        CI_ENV_BUILD_TYPE: Debug
+      Release with Release Installer:
+        CI_ENV_BUILD_TYPE: Release
  steps:
    # Gather Dependencies
    - task: PowerShell@2
--- a/doc/newsfragments/linux-drag-drop-faq.doc
+++ b/doc/newsfragments/linux-drag-drop-faq.doc
@@ -0,0 +1 @@
+Fixed FAQ link to Linux drag and drop issue.
--- a/doc/newsfragments/restore-dpiawareness.bugfix
+++ b/doc/newsfragments/restore-dpiawareness.bugfix
@@ -0,0 +1 @@
+Fixed a regression in 2.4.0 that caused Barrier to not support scaling other than 100% (https://github.com/debauchee/barrier/issues/1462).
--- a/src/cmd/barrierc/CMakeLists.txt
+++ b/src/cmd/barrierc/CMakeLists.txt
@@ -21,7 +21,9 @@ set(sources
 if (WIN32)
    file(GLOB arch_headers "MSWindows*.h")
    file(GLOB arch_sources "MSWindows*.cpp")
-    list(APPEND sources barrierc.rc)
+    list(APPEND sources
+        barrierc.rc
+        barrierc.exe.manifest)
 elseif (APPLE)
    file(GLOB arch_headers "OSX*.h")
    file(GLOB arch_sources "OSX*.cpp")
--- a/src/cmd/barrierc/barrierc.exe.manifest
+++ b/src/cmd/barrierc/barrierc.exe.manifest
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+        </windowsSettings>
+    </application>
+</assembly>
--- a/src/cmd/barriers/CMakeLists.txt
+++ b/src/cmd/barriers/CMakeLists.txt
@@ -21,7 +21,9 @@ set(sources
 if (WIN32)
    file(GLOB arch_headers "MSWindows*.h")
    file(GLOB arch_sources "MSWindows*.cpp")
-    list(APPEND sources barriers.rc)
+    list(APPEND sources
+        barriers.rc
+        barriers.exe.manifest)
 elseif (APPLE)
    file(GLOB arch_headers "OSX*.h")
    file(GLOB arch_sources "OSX*.cpp")
--- a/src/cmd/barriers/barriers.exe.manifest
+++ b/src/cmd/barriers/barriers.exe.manifest
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+        </windowsSettings>
+    </application>
+</assembly>
--- a/src/gui/res/mac/Info.plist
+++ b/src/gui/res/mac/Info.plist
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
  <dict>
--- a/src/lib/barrier/FileChunk.cpp
+++ b/src/lib/barrier/FileChunk.cpp
@@ -98,7 +98,7 @@ FileChunk::assemble(barrier::IStream* stream, String& dataReceived, size_t& expe
    case kDataChunk:
        dataReceived.append(content);
        if (CLOG->getFilter() >= kDEBUG2) {
-                LOG((CLOG_DEBUG2 "recv file chunck size=%i", content.size()));
+                LOG((CLOG_DEBUG2 "recv file chunk size=%i", content.size()));
                double interval = stopwatch.getTime();
                receivedDataSize += content.size();
                LOG((CLOG_DEBUG2 "recv file interval=%f s", interval));
--- a/src/lib/net/SecureUtils.cpp
+++ b/src/lib/net/SecureUtils.cpp
@@ -190,7 +190,7 @@ void generate_pem_self_signed_cert(const std::string& path)

    X509_sign(cert, private_key, EVP_sha256());

-    auto fp = fopen_utf8_path(path.c_str(), "r");
+    auto fp = fopen_utf8_path(path.c_str(), "w");
    if (!fp) {
        throw std::runtime_error("Could not open certificate output path");
    }
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -324,7 +324,7 @@ XWindowsScreen::leave()
    m_impl->XGetInputFocus(m_display, &m_lastFocus, &m_lastFocusRevert);

 	// take focus
-	if (m_isPrimary || !m_preserveFocus) {
+	if (!m_preserveFocus) {
        m_impl->XSetInputFocus(m_display, m_window, RevertToPointerRoot, CurrentTime);
 	}
Author	SHA1	Message	Date
walker0643	653e4badeb	Merge pull request #1067 from cryzed/fix/server-preserve-focus Fix `Fix Preserve Focus` option not working on Linux servers	2022-02-04 11:47:29 -05:00
walker0643	7324f26e09	Merge pull request #1506 from mipedja/master Restore dpiAwareness	2022-02-03 11:39:00 -05:00
mipedja	00a57ea972	Restore dpiAwareness Fixes regression from #304 Fixes #1462, possibly others.	2022-01-07 21:41:56 -08:00
Povilas Kanapickas	433126e7a1	Merge pull request #1471 from unit193/master Fix typo: chunck → chunk.	2021-12-06 17:04:49 +02:00
Unit 193	6ce4b7e970	Fix typo: chunck → chunk.	2021-12-04 14:50:39 -05:00
walker0643	d64bb1591a	Merge pull request #1416 from dylanilee/master Fix link to Linux drag and drop issue	2021-11-12 10:59:31 -05:00
walker0643	4a978c8331	Merge pull request #1425 from albertony/cert-gen-fix Fix issue with generation of new certificate	2021-11-12 10:54:54 -05:00
albertony	20a1bd2e4c	Fix issue with generation of new certificate	2021-11-12 15:23:12 +01:00
Dylan Lee	b4cef2703e	Fix link to Linux drag and drop issue	2021-11-10 15:19:22 -05:00
Dom Rodriguez	2db65f0866	Merge pull request #1409 from sfonteneau/master add header encoding="UTF-8" in plist	2021-11-09 14:14:04 +00:00
sfonteneau	606222fbae	add header encoding="UTF-8" in plist needed for plistlib	2021-11-09 12:44:28 +01:00
cryzed	06c1a5908c	Fixes #1066	2021-02-16 02:35:13 +01:00
				`@@ -0,0 +1 @@`
				`Fixed FAQ link to Linux drag and drop issue.`
				`@@ -0,0 +1 @@`
				`Fixed a regression in 2.4.0 that caused Barrier to not support scaling other than 100% (https://github.com/debauchee/barrier/issues/1462).`