Skip to content

Commit d0005cb

Browse files
mipedjashymega
authored andcommitted
Restore dpiAwareness
Fixes regression from input-leap#304 Fixes input-leap#1462, possibly others.
1 parent 4ecedf1 commit d0005cb

File tree

4 files changed

+83
-0
lines changed

4 files changed

+83
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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).

src/cmd/barriers/CMakeLists.txt

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# barrier -- mouse and keyboard sharing utility
2+
# Copyright (C) 2012-2016 Symless Ltd.
3+
# Copyright (C) 2009 Nick Bolton
4+
#
5+
# This package is free software; you can redistribute it and/or
6+
# modify it under the terms of the GNU General Public License
7+
# found in the file LICENSE that should have accompanied this file.
8+
#
9+
# This package is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
17+
set(sources
18+
barriers.cpp
19+
)
20+
21+
if (WIN32)
22+
file(GLOB arch_headers "MSWindows*.h")
23+
file(GLOB arch_sources "MSWindows*.cpp")
24+
list(APPEND sources
25+
barriers.rc
26+
barriers.exe.manifest)
27+
elseif (APPLE)
28+
file(GLOB arch_headers "OSX*.h")
29+
file(GLOB arch_sources "OSX*.cpp")
30+
elseif (UNIX)
31+
file(GLOB arch_headers "XWindows*.h")
32+
file(GLOB arch_sources "XWindows*.cpp")
33+
endif()
34+
35+
list(APPEND sources ${arch_sources})
36+
list(APPEND headers ${arch_headers})
37+
38+
if (BARRIER_ADD_HEADERS)
39+
list(APPEND sources ${headers})
40+
endif()
41+
42+
add_executable(barriers ${sources})
43+
target_link_libraries(barriers
44+
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
45+
46+
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
47+
install (TARGETS barriers DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
48+
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
49+
install (TARGETS barriers DESTINATION bin)
50+
endif()
+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
4+
<security>
5+
<requestedPrivileges>
6+
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
7+
</requestedPrivileges>
8+
</security>
9+
</trustInfo>
10+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
11+
<windowsSettings>
12+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
13+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
14+
</windowsSettings>
15+
</application>
16+
</assembly>

src/server/barrierc.exe.manifest

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
4+
<security>
5+
<requestedPrivileges>
6+
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
7+
</requestedPrivileges>
8+
</security>
9+
</trustInfo>
10+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
11+
<windowsSettings>
12+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
13+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
14+
</windowsSettings>
15+
</application>
16+
</assembly>

0 commit comments

Comments
 (0)