Merge remote-tracking branch 'upstream/master' into docker
This commit is contained in:
Tru Huynh (pasteur.fr)
commit
ecad7ff0ac
|
|
@ -1,4 +1,4 @@
|
|||
winbuild_env.bat
|
||||
build_env.*
|
||||
config.h
|
||||
.DS_Store
|
||||
*.pyc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
language: cpp
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq libxtst-dev
|
||||
- sudo apt-get install -qq qtdeclarative5-dev
|
||||
- sudo apt-get install -qq libavahi-compat-libdnssd-dev
|
||||
script: sh -x ./clean_build.sh
|
||||
# skip install phase since we have a customized install package
|
||||
# creation tool for each supported platform
|
||||
install: true
|
||||
|
|
@ -157,9 +157,14 @@ if (UNIX)
|
|||
)
|
||||
|
||||
else() # not-apple
|
||||
|
||||
# add include dir for bsd (posix uses /usr/include/)
|
||||
set (CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}:/usr/local/include")
|
||||
# FreeBSD uses /usr/local for anything not part of base
|
||||
# Also package avahi-libdns puts dns_sd.h a bit deeper
|
||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||
set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};/usr/local/include;/usr/local/include/avahi-compat-libdns_sd")
|
||||
set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L/usr/local/lib")
|
||||
include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd")
|
||||
link_directories("/usr/local/lib")
|
||||
endif()
|
||||
|
||||
set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
|
||||
set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
|
||||
|
|
@ -174,6 +179,7 @@ if (UNIX)
|
|||
check_include_files ("X11/extensions/XTest.h" HAVE_X11_EXTENSIONS_XTEST_H)
|
||||
check_include_files ("${XKBlib}" HAVE_X11_XKBLIB_H)
|
||||
check_include_files ("X11/extensions/XInput2.h" HAVE_XI2)
|
||||
check_include_files ("dns_sd.h" HAVE_DNSSD)
|
||||
|
||||
if (HAVE_X11_EXTENSIONS_DPMS_H)
|
||||
# Assume that function prototypes declared, when include exists.
|
||||
|
|
@ -184,6 +190,10 @@ if (UNIX)
|
|||
message (FATAL_ERROR "Missing header: " ${XKBlib})
|
||||
endif()
|
||||
|
||||
if (NOT HAVE_DNSSD)
|
||||
message (FATAL_ERROR "Missing header: dns_sd.h")
|
||||
endif()
|
||||
|
||||
check_library_exists ("SM;ICE" IceConnectionNumber "" HAVE_ICE)
|
||||
check_library_exists ("Xext;X11" DPMSQueryExtension "" HAVE_Xext)
|
||||
check_library_exists ("Xtst;Xext;X11" XTestQueryExtension "" HAVE_Xtst)
|
||||
|
|
@ -202,7 +212,7 @@ if (UNIX)
|
|||
if (HAVE_Xtst)
|
||||
|
||||
# Xtxt depends on X11.
|
||||
set (HAVE_X11)
|
||||
set (HAVE_X11 1)
|
||||
list (APPEND libs Xtst X11)
|
||||
|
||||
else()
|
||||
|
|
@ -305,7 +315,14 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
set (OPENSSL_LIBS ssl crypto)
|
||||
else()
|
||||
message (FATAL_ERROR "Couldn't find OpenSSL")
|
||||
find_library (lib_ssl ssl)
|
||||
find_library (lib_crypto crypto)
|
||||
if (NOT lib_ssl)
|
||||
message(FATAL_ERROR "openssl library not found")
|
||||
elseif (NOT lib_crypto)
|
||||
message(FATAL_ERROR "crypto library not found")
|
||||
endif()
|
||||
set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
|
||||
endif()
|
||||
|
||||
#
|
||||
|
|
@ -356,8 +373,10 @@ 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)
|
||||
message (STATUS "Configuring the wix installer")
|
||||
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
|
||||
message (STATUS "Configuring the inno installer")
|
||||
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/inno ${CMAKE_BINARY_DIR}/installer-inno)
|
||||
endif()
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
Eliminate the barrier between your machines.
|
||||
|
||||
Master branch build status: [](https://travis-ci.org/debauchee/barrier)
|
||||
|
||||
### What is it?
|
||||
|
||||
Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman.
|
||||
|
|
@ -26,4 +28,4 @@ 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 if we use it you will be appropriately credited in the log.
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ goto done
|
|||
|
||||
:buildproject
|
||||
echo To build a 64-bit Windows installer:
|
||||
echo - set Q_BUILD_TYPE=Release in winbuild_env.bat
|
||||
echo - set Q_BUILD_TYPE=Release in build_env.bat
|
||||
echo - also set other environmental overrides necessary for your build environment
|
||||
echo - run clean_build.bat to build Barrier and verify that it succeeds
|
||||
echo - re-run this script to create the installation package
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
|
||||
REM defaults - override them by creating a winbuild_env.bat file
|
||||
REM defaults - override them by creating a build_env.bat file
|
||||
set B_BUILD_TYPE=Debug
|
||||
set B_QT_ROOT=C:\Qt
|
||||
set B_QT_VER=5.6.3
|
||||
|
|
@ -10,7 +10,7 @@ set B_BONJOUR=C:\Program Files\Bonjour SDK
|
|||
set savedir=%cd%
|
||||
cd /d %~dp0
|
||||
|
||||
if exist winbuild_env.bat call winbuild_env.bat
|
||||
if exist build_env.bat call build_env.bat
|
||||
|
||||
REM needed by cmake to set bonjour include dir
|
||||
set BONJOUR_SDK_HOME=%B_BONJOUR%
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
#!/bin/sh
|
||||
cd "$(dirname $0)" || exit 1
|
||||
rm -rf build
|
||||
mkdir build || exit 1
|
||||
cd build || exit 1
|
||||
# some environments have cmake v2 as 'cmake' and v3 as 'cmake3'
|
||||
# check for cmake3 first then fallback to just cmake
|
||||
B_CMAKE=`which cmake3 2>/dev/null`
|
||||
[ $? -ne 0 -o "x$B_CMAKE" = "x" ] && B_CMAKE=cmake
|
||||
B_CMAKE=`type cmake3 2>/dev/null`
|
||||
if [ $? -eq 0 ]; then
|
||||
B_CMAKE=`echo $B_CMAKE | cut -d' ' -f3`
|
||||
else
|
||||
B_CMAKE=cmake
|
||||
fi
|
||||
# default build configuration
|
||||
B_BUILD_TYPE=${B_BUILD_TYPE:-Debug}
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
# OSX needs a lot of extra help, poor thing
|
||||
# run the osx_environment.sh script to fix paths
|
||||
[ -r ../osx_environment.sh ] && source ../osx_environment.sh
|
||||
. ./osx_environment.sh
|
||||
B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
|
||||
fi
|
||||
# allow local customizations to build environment
|
||||
[ -r ./build_env.sh ] && . ./build_env.sh
|
||||
B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
|
||||
rm -rf build
|
||||
mkdir build || exit 1
|
||||
cd build || exit 1
|
||||
echo Starting Barrier $B_BUILD_TYPE build...
|
||||
$B_CMAKE $B_CMAKE_FLAGS .. || exit 1
|
||||
make || exit 1
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ endif()
|
|||
if (NOT DEFINED BARRIER_REVISION)
|
||||
if (DEFINED ENV{GIT_COMMIT})
|
||||
string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
|
||||
elseif (BARRIER_VERSION_STAGE STREQUAL "snapshot")
|
||||
else()
|
||||
execute_process (
|
||||
COMMAND git rev-parse --short=8 HEAD
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
|
|
@ -74,7 +74,7 @@ else()
|
|||
set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}")
|
||||
endif()
|
||||
|
||||
set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}")
|
||||
set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}-${BARRIER_VERSION_STAGE}")
|
||||
set (BARRIER_VERSION_STRING "${BARRIER_VERSION}-${BARRIER_VERSION_TAG}")
|
||||
message (STATUS "Full Barrier version string is '" ${BARRIER_VERSION_STRING} "'")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#define MyAppName "Barrier"
|
||||
#define MyAppVersion "1.9"
|
||||
#define MyAppVersion "@BARRIER_VERSION@"
|
||||
#define MyAppPublisher "Debauchee Open Source Group"
|
||||
#define MyAppURL "https://github.com/debauchee/barrier/wiki"
|
||||
#define MyAppExeName "barrier.exe"
|
||||
|
|
@ -18,10 +18,10 @@ AppSupportURL={#MyAppURL}
|
|||
AppUpdatesURL={#MyAppURL}
|
||||
DefaultDirName={pf}\{#MyAppName}
|
||||
DisableProgramGroupPage=yes
|
||||
LicenseFile=E:\Projects\vs\barrier-release.git\res\License.rtf
|
||||
OutputDir=E:\Projects\vs\barrier-release.git\build\installer\bin
|
||||
OutputBaseFilename=BarrierSetup
|
||||
SetupIconFile=E:\Projects\vs\barrier-release.git\res\barrier.ico
|
||||
LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
|
||||
OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
|
||||
OutputBaseFilename=BarrierSetup-{#MyAppVersion}
|
||||
SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
ArchitecturesInstallIn64BitMode=x64 ia64
|
||||
|
|
@ -32,7 +32,7 @@ ArchitecturesInstallIn64BitMode=x64 ia64
|
|||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "E:\Projects\vs\barrier-release.git\build\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||
|
||||
[Icons]
|
||||
|
|
@ -1,29 +1,27 @@
|
|||
#!/bin/sh
|
||||
|
||||
# change this to rename the installer package
|
||||
B_DMG="Barrier-v1.9.dmg"
|
||||
|
||||
cd $(dirname $0)
|
||||
B_DMG="Barrier-@BARRIER_VERSION@.dmg"
|
||||
|
||||
# sanity check so we don't distribute packages full of debug symbols
|
||||
B_BUILD_TYPE=$(grep -E ^CMAKE_BUILD_TYPE build/CMakeCache.txt | cut -d= -f2)
|
||||
if [ "$B_BUILD_TYPE" != "Release" ]; then
|
||||
if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
|
||||
echo Will only build installers for Release builds
|
||||
exit 1
|
||||
fi
|
||||
|
||||
B_REREF_SCRIPT=$(pwd)/osx_reref_dylibs.sh
|
||||
cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1
|
||||
|
||||
B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/build/bundle/reref_dylibs.sh
|
||||
if [ ! -x $B_REREF_SCRIPT ]; then
|
||||
echo Missing script: $B_REREF_SCRIPT
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# remove any old copies so there's no confusion about whever this
|
||||
# remove any old copies so there's no confusion about whether this
|
||||
# process completes successfully or not
|
||||
rm -rf build/bundle/{bundle.dmg,$B_DMG}
|
||||
rm -rf temp.dmg $B_DMG
|
||||
|
||||
B_BINARY_PATH=$(pwd)/build/bin
|
||||
cd build/bundle/Barrier.app/Contents 2>/dev/null
|
||||
cd Barrier.app/Contents 2>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
echo Please make sure that the build completed successfully
|
||||
echo before trying to create the installer.
|
||||
|
|
@ -37,7 +35,7 @@ mkdir MacOS || exit 1
|
|||
cd MacOS || exit 1
|
||||
|
||||
# copy all executables
|
||||
cp ${B_BINARY_PATH}/* . || exit 1
|
||||
cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1
|
||||
|
||||
# copy the qt platform plugin
|
||||
# TODO: this is hacky and will probably break if there is more than one qt
|
||||
|
|
@ -69,11 +67,11 @@ chmod +x barrier.sh
|
|||
|
||||
# create the DMG to be distributed in build/bundle
|
||||
cd ../../..
|
||||
hdiutil create -size 64m -fs HFS+ -volname "Barrier" bundle.dmg || exit 1
|
||||
hdiutil attach bundle.dmg -mountpoint mnt || exit 1
|
||||
hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1
|
||||
hdiutil attach temp.dmg -mountpoint mnt || exit 1
|
||||
cp -r Barrier.app mnt/ || exit 1
|
||||
hdiutil detach mnt || exit 1
|
||||
hdiutil convert bundle.dmg -format UDZO -o $B_DMG || exit 1
|
||||
rm bundle.dmg
|
||||
hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1
|
||||
rm temp.dmg
|
||||
|
||||
echo "Installer created successfully"
|
||||
|
|
@ -36,10 +36,13 @@ if (WIN32)
|
|||
elseif (APPLE)
|
||||
find_library(APPSERVICES_LIB ApplicationServices)
|
||||
target_link_libraries(barrier ${APPSERVICES_LIB})
|
||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
|
||||
${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||
target_link_libraries (barrier dns_sd)
|
||||
else()
|
||||
target_link_libraries (barrier)
|
||||
endif()
|
||||
|
||||
if (HAVE_X11)
|
||||
target_link_libraries (barrier X11)
|
||||
endif()
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
Keyboard and mouse sharing application. Cross platform and open source.<br /><br />
|
||||
|
|
@ -26,7 +26,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></source>
|
||||
<oldsource><p>
|
||||
|
|
@ -23,7 +23,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br />
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br />
|
||||
Visit our website for help and info (symless.com).
|
||||
</p></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Copyright © 2012-2016 Symless Ltd.<br />
|
|||
Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br />
|
||||
Barrier is released under the GNU General Public License (GPLv2).<br /><br />
|
||||
Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br />
|
||||
The Barrier GUI is based on QBarrier by Volker Lanz.
|
||||
The Barrier GUI is based on QSynergy by Volker Lanz.
|
||||
</p></string>
|
||||
</property>
|
||||
<property name="margin">
|
||||
|
|
|
|||
|
|
@ -206,35 +206,21 @@ void AppConfig::setStartedBefore(bool b) { m_StartedBefore = b; }
|
|||
|
||||
void AppConfig::setElevateMode(ElevateMode em) { m_ElevateMode = em; }
|
||||
|
||||
void AppConfig::setAutoConfig(bool autoConfig)
|
||||
{
|
||||
m_AutoConfig = autoConfig;
|
||||
}
|
||||
void AppConfig::setAutoConfig(bool autoConfig) { m_AutoConfig = autoConfig; }
|
||||
|
||||
bool AppConfig::autoConfigPrompted() { return m_AutoConfigPrompted; }
|
||||
|
||||
void AppConfig::setAutoConfigPrompted(bool prompted)
|
||||
{
|
||||
m_AutoConfigPrompted = prompted;
|
||||
}
|
||||
void AppConfig::setAutoConfigPrompted(bool prompted) { m_AutoConfigPrompted = prompted; }
|
||||
|
||||
QString AppConfig::barriersName() const { return m_BarriersName; }
|
||||
|
||||
QString AppConfig::barriercName() const { return m_BarriercName; }
|
||||
|
||||
ElevateMode AppConfig::elevateMode()
|
||||
{
|
||||
return m_ElevateMode;
|
||||
}
|
||||
ElevateMode AppConfig::elevateMode() { return m_ElevateMode; }
|
||||
|
||||
void AppConfig::setCryptoEnabled(bool e) {
|
||||
m_CryptoEnabled = e;
|
||||
emit sslToggled(e);
|
||||
}
|
||||
void AppConfig::setCryptoEnabled(bool e) { m_CryptoEnabled = e; }
|
||||
|
||||
bool AppConfig::getCryptoEnabled() const {
|
||||
return m_CryptoEnabled;
|
||||
}
|
||||
bool AppConfig::getCryptoEnabled() const { return m_CryptoEnabled; }
|
||||
|
||||
void AppConfig::setAutoHide(bool b) { m_AutoHide = b; }
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,6 @@ class AppConfig: public QObject
|
|||
QString barrierProgramDir() const;
|
||||
QString barrierLogDir() const;
|
||||
|
||||
bool detectPath(const QString& name, QString& path);
|
||||
void persistLogDir();
|
||||
ElevateMode elevateMode();
|
||||
|
||||
|
|
@ -136,9 +135,6 @@ protected:
|
|||
static const char m_BarriersName[];
|
||||
static const char m_BarriercName[];
|
||||
static const char m_BarrierLogDir[];
|
||||
|
||||
signals:
|
||||
void sslToggled(bool enabled);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
#ifdef WINAPI_XWINDOWS
|
||||
|
||||
#include "DisplayIsValid.h"
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
bool display_is_valid()
|
||||
{
|
||||
auto dsp = XOpenDisplay(NULL);
|
||||
if (dsp != NULL)
|
||||
XCloseDisplay(dsp);
|
||||
return dsp != NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef WINAPI_XWINDOWS
|
||||
bool display_is_valid();
|
||||
#endif
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#include <QtGui>
|
||||
|
||||
// this table originally comes from Qt sources (gui/kernel/qkeysequence.cpp)
|
||||
// and is heavily modified for QBarrier
|
||||
// and is heavily modified
|
||||
static const struct
|
||||
{
|
||||
int key;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
*
|
||||
* 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 "LogWindow.h"
|
||||
|
||||
#include <QDateTime>
|
||||
|
||||
static QString getTimeStamp()
|
||||
{
|
||||
QDateTime current = QDateTime::currentDateTime();
|
||||
return '[' + current.toString(Qt::ISODate) + ']';
|
||||
}
|
||||
|
||||
LogWindow::LogWindow(QWidget *parent) :
|
||||
QDialog(parent)
|
||||
{
|
||||
// explicitly unset DeleteOnClose so the log window can be show and hidden
|
||||
// repeatedly until Barrier is finished
|
||||
setAttribute(Qt::WA_DeleteOnClose, false);
|
||||
setupUi(this);
|
||||
}
|
||||
|
||||
void LogWindow::startNewInstance()
|
||||
{
|
||||
// put a space between last log output and new instance.
|
||||
if (!m_pLogOutput->toPlainText().isEmpty())
|
||||
appendRaw("");
|
||||
}
|
||||
|
||||
void LogWindow::appendInfo(const QString& text)
|
||||
{
|
||||
appendRaw(getTimeStamp() + " INFO: " + text);
|
||||
}
|
||||
|
||||
void LogWindow::appendDebug(const QString& text)
|
||||
{
|
||||
appendRaw(getTimeStamp() + " DEBUG: " + text);
|
||||
}
|
||||
|
||||
void LogWindow::appendError(const QString& text)
|
||||
{
|
||||
appendRaw(getTimeStamp() + " ERROR: " + text);
|
||||
}
|
||||
|
||||
void LogWindow::appendRaw(const QString& text)
|
||||
{
|
||||
m_pLogOutput->append(text);
|
||||
}
|
||||
|
||||
void LogWindow::on_m_pButtonHide_clicked()
|
||||
{
|
||||
hide();
|
||||
}
|
||||
|
||||
void LogWindow::on_m_pButtonClearLog_clicked()
|
||||
{
|
||||
m_pLogOutput->clear();
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#if !defined(LOGWINDOW__H)
|
||||
|
||||
#define LOGWINDOW__H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
#include "ui_LogWindowBase.h"
|
||||
|
||||
class LogWindow : public QDialog, public Ui::LogWindowBase
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
LogWindow(QWidget *parent);
|
||||
|
||||
void startNewInstance();
|
||||
|
||||
void appendRaw(const QString& text);
|
||||
void appendInfo(const QString& text);
|
||||
void appendDebug(const QString& text);
|
||||
void appendError(const QString& text);
|
||||
|
||||
private slots:
|
||||
void on_m_pButtonHide_clicked();
|
||||
void on_m_pButtonClearLog_clicked();
|
||||
|
||||
};
|
||||
|
||||
#endif // LOGWINDOW__H
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>LogWindowBase</class>
|
||||
<widget class="QDialog" name="LogWindowBase">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>600</width>
|
||||
<height>371</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>400</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Log - Barrier</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QTextEdit" name="m_pLogOutput">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Courier</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="undoRedoEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="lineWrapMode">
|
||||
<enum>QTextEdit::NoWrap</enum>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetDefaultConstraint</enum>
|
||||
</property>
|
||||
<item>
|
||||
<spacer name="spacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="m_pButtonClearLog">
|
||||
<property name="text">
|
||||
<string>&Clear Log</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="m_pButtonHide">
|
||||
<property name="text">
|
||||
<string>&Hide</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</ui>
|
||||
|
|
@ -16,8 +16,6 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#define DOWNLOAD_URL "http://github.com/debauchee/barrier/"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "MainWindow.h"
|
||||
|
|
@ -85,9 +83,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
|
|||
m_pTrayIconMenu(NULL),
|
||||
m_AlreadyHidden(false),
|
||||
m_pMenuBar(NULL),
|
||||
m_pMenuFile(NULL),
|
||||
m_pMenuEdit(NULL),
|
||||
m_pMenuWindow(NULL),
|
||||
m_pMenuBarrier(NULL),
|
||||
m_pMenuHelp(NULL),
|
||||
m_pZeroconfService(NULL),
|
||||
m_pDataDownloader(NULL),
|
||||
|
|
@ -97,16 +93,22 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
|
|||
m_BonjourInstall(NULL),
|
||||
m_SuppressEmptyServerWarning(false),
|
||||
m_ExpectedRunningState(kStopped),
|
||||
m_pSslCertificate(NULL)
|
||||
m_pSslCertificate(NULL),
|
||||
m_pLogWindow(new LogWindow(nullptr))
|
||||
{
|
||||
// explicitly unset DeleteOnClose so the window can be show and hidden
|
||||
// repeatedly until Barrier is finished
|
||||
setAttribute(Qt::WA_DeleteOnClose, false);
|
||||
// mark the windows as sort of "dialog" window so that tiling window
|
||||
// managers will float it by default (X11)
|
||||
setAttribute(Qt::WA_X11NetWmWindowTypeDialog, true);
|
||||
|
||||
setupUi(this);
|
||||
|
||||
createMenuBar();
|
||||
loadSettings();
|
||||
initConnections();
|
||||
|
||||
m_pWidgetUpdate->hide();
|
||||
m_VersionChecker.setApp(appPath(appConfig.barriercName()));
|
||||
m_pLabelScreenName->setText(getScreenName());
|
||||
m_pLabelIpAddresses->setText(getIPAddresses());
|
||||
|
||||
|
|
@ -121,10 +123,10 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
|
|||
// change default size based on os
|
||||
#if defined(Q_OS_MAC)
|
||||
resize(720, 550);
|
||||
setMinimumSize(size());
|
||||
setMinimumSize(720, 0);
|
||||
#elif defined(Q_OS_LINUX)
|
||||
resize(700, 530);
|
||||
setMinimumSize(size());
|
||||
setMinimumSize(700, 0);
|
||||
#endif
|
||||
|
||||
m_SuppressAutoConfigWarning = true;
|
||||
|
|
@ -134,13 +136,10 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
|
|||
m_pComboServerList->hide();
|
||||
m_pLabelPadlock->hide();
|
||||
|
||||
sslToggled(appConfig.getCryptoEnabled());
|
||||
updateSSLFingerprint();
|
||||
|
||||
connect (this, SIGNAL(windowShown()),
|
||||
this, SLOT(on_windowShown()), Qt::QueuedConnection);
|
||||
|
||||
connect (m_AppConfig, SIGNAL(sslToggled(bool)),
|
||||
this, SLOT(sslToggled(bool)), Qt::QueuedConnection);
|
||||
// resize window to smallest reasonable size
|
||||
resize(0, 0);
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
|
|
@ -153,16 +152,16 @@ MainWindow::~MainWindow()
|
|||
saveSettings();
|
||||
|
||||
delete m_pZeroconfService;
|
||||
|
||||
if (m_DownloadMessageBox != NULL) {
|
||||
delete m_DownloadMessageBox;
|
||||
}
|
||||
|
||||
if (m_BonjourInstall != NULL) {
|
||||
delete m_BonjourInstall;
|
||||
}
|
||||
|
||||
delete m_DownloadMessageBox;
|
||||
delete m_BonjourInstall;
|
||||
delete m_pSslCertificate;
|
||||
|
||||
// LogWindow is created as a sibling of the MainWindow rather than a child
|
||||
// so that the main window can be hidden without hiding the log. because of
|
||||
// this it does not get properly cleaned up by the QObject system. also by
|
||||
// the time this destructor is called the event loop will no longer be able
|
||||
// to clean up the LogWindow so ->deleteLater() will not work
|
||||
delete m_pLogWindow;
|
||||
}
|
||||
|
||||
void MainWindow::open()
|
||||
|
|
@ -175,8 +174,6 @@ void MainWindow::open()
|
|||
showNormal();
|
||||
}
|
||||
|
||||
m_VersionChecker.checkLatest();
|
||||
|
||||
if (!appConfig().autoConfigPrompted()) {
|
||||
promptAutoConfig();
|
||||
}
|
||||
|
|
@ -202,6 +199,7 @@ void MainWindow::createTrayIcon()
|
|||
|
||||
m_pTrayIconMenu->addAction(m_pActionStartBarrier);
|
||||
m_pTrayIconMenu->addAction(m_pActionStopBarrier);
|
||||
m_pTrayIconMenu->addAction(m_pActionShowLog);
|
||||
m_pTrayIconMenu->addSeparator();
|
||||
|
||||
m_pTrayIconMenu->addAction(m_pActionMinimize);
|
||||
|
|
@ -223,37 +221,27 @@ void MainWindow::createTrayIcon()
|
|||
|
||||
void MainWindow::retranslateMenuBar()
|
||||
{
|
||||
m_pMenuFile->setTitle(tr("&File"));
|
||||
m_pMenuEdit->setTitle(tr("&Edit"));
|
||||
m_pMenuWindow->setTitle(tr("&Window"));
|
||||
m_pMenuBarrier->setTitle(tr("&Barrier"));
|
||||
m_pMenuHelp->setTitle(tr("&Help"));
|
||||
}
|
||||
|
||||
void MainWindow::createMenuBar()
|
||||
{
|
||||
m_pMenuBar = new QMenuBar(this);
|
||||
m_pMenuFile = new QMenu("", m_pMenuBar);
|
||||
m_pMenuEdit = new QMenu("", m_pMenuBar);
|
||||
m_pMenuWindow = new QMenu("", m_pMenuBar);
|
||||
m_pMenuBarrier = new QMenu("", m_pMenuBar);
|
||||
m_pMenuHelp = new QMenu("", m_pMenuBar);
|
||||
retranslateMenuBar();
|
||||
|
||||
m_pMenuBar->addAction(m_pMenuFile->menuAction());
|
||||
m_pMenuBar->addAction(m_pMenuEdit->menuAction());
|
||||
#if !defined(Q_OS_MAC)
|
||||
m_pMenuBar->addAction(m_pMenuWindow->menuAction());
|
||||
#endif
|
||||
m_pMenuBar->addAction(m_pMenuBarrier->menuAction());
|
||||
m_pMenuBar->addAction(m_pMenuHelp->menuAction());
|
||||
|
||||
m_pMenuFile->addAction(m_pActionStartBarrier);
|
||||
m_pMenuFile->addAction(m_pActionStopBarrier);
|
||||
m_pMenuFile->addSeparator();
|
||||
m_pMenuFile->addAction(m_pActionSave);
|
||||
m_pMenuFile->addSeparator();
|
||||
m_pMenuFile->addAction(m_pActionQuit);
|
||||
m_pMenuEdit->addAction(m_pActionSettings);
|
||||
m_pMenuWindow->addAction(m_pActionMinimize);
|
||||
m_pMenuWindow->addAction(m_pActionRestore);
|
||||
m_pMenuBarrier->addAction(m_pActionShowLog);
|
||||
m_pMenuBarrier->addAction(m_pActionSettings);
|
||||
m_pMenuBarrier->addAction(m_pActionMinimize);
|
||||
m_pMenuBarrier->addSeparator();
|
||||
m_pMenuBarrier->addAction(m_pActionSave);
|
||||
m_pMenuBarrier->addSeparator();
|
||||
m_pMenuBarrier->addAction(m_pActionQuit);
|
||||
m_pMenuHelp->addAction(m_pActionAbout);
|
||||
|
||||
setMenuBar(m_pMenuBar);
|
||||
|
|
@ -278,8 +266,8 @@ void MainWindow::initConnections()
|
|||
connect(m_pActionRestore, SIGNAL(triggered()), this, SLOT(showNormal()));
|
||||
connect(m_pActionStartBarrier, SIGNAL(triggered()), this, SLOT(startBarrier()));
|
||||
connect(m_pActionStopBarrier, SIGNAL(triggered()), this, SLOT(stopBarrier()));
|
||||
connect(m_pActionShowLog, SIGNAL(triggered()), this, SLOT(showLogWindow()));
|
||||
connect(m_pActionQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
|
||||
connect(&m_VersionChecker, SIGNAL(updateFound(const QString&)), this, SLOT(updateFound(const QString&)));
|
||||
}
|
||||
|
||||
void MainWindow::saveSettings()
|
||||
|
|
@ -300,6 +288,8 @@ void MainWindow::setIcon(qBarrierState state)
|
|||
QIcon icon;
|
||||
icon.addFile(barrierIconFiles[state]);
|
||||
|
||||
setWindowIcon(icon);
|
||||
|
||||
if (m_pTrayIcon)
|
||||
m_pTrayIcon->setIcon(icon);
|
||||
}
|
||||
|
|
@ -343,37 +333,27 @@ void MainWindow::logError()
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::updateFound(const QString &version)
|
||||
{
|
||||
m_pWidgetUpdate->show();
|
||||
m_pLabelUpdate->setText(
|
||||
tr("<p>Your version of Barrier is out of date. "
|
||||
"Version <b>%1</b> is now available to "
|
||||
"<a href=\"%2\">download</a>.</p>")
|
||||
.arg(version).arg(DOWNLOAD_URL));
|
||||
}
|
||||
|
||||
void MainWindow::appendLogInfo(const QString& text)
|
||||
{
|
||||
appendLogRaw(getTimeStamp() + " INFO: " + text);
|
||||
m_pLogWindow->appendInfo(text);
|
||||
}
|
||||
|
||||
void MainWindow::appendLogDebug(const QString& text) {
|
||||
if (appConfig().logLevel() >= 4) {
|
||||
appendLogRaw(getTimeStamp() + " DEBUG: " + text);
|
||||
m_pLogWindow->appendDebug(text);
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::appendLogError(const QString& text)
|
||||
{
|
||||
appendLogRaw(getTimeStamp() + " ERROR: " + text);
|
||||
m_pLogWindow->appendError(text);
|
||||
}
|
||||
|
||||
void MainWindow::appendLogRaw(const QString& text)
|
||||
{
|
||||
foreach(QString line, text.split(QRegExp("\r|\n|\r\n"))) {
|
||||
if (!line.isEmpty()) {
|
||||
m_pLogOutput->append(line);
|
||||
m_pLogWindow->appendRaw(line);
|
||||
updateFromLogLine(line);
|
||||
}
|
||||
}
|
||||
|
|
@ -391,7 +371,7 @@ void MainWindow::checkConnected(const QString& line)
|
|||
// TODO: implement ipc connection state messages to replace this hack.
|
||||
if (line.contains("started server") ||
|
||||
line.contains("connected to server") ||
|
||||
line.contains("watchdog status: ok"))
|
||||
line.contains("server status: active"))
|
||||
{
|
||||
setBarrierState(barrierConnected);
|
||||
|
||||
|
|
@ -451,12 +431,6 @@ void MainWindow::checkFingerprint(const QString& line)
|
|||
}
|
||||
}
|
||||
|
||||
QString MainWindow::getTimeStamp()
|
||||
{
|
||||
QDateTime current = QDateTime::currentDateTime();
|
||||
return '[' + current.toString(Qt::ISODate) + ']';
|
||||
}
|
||||
|
||||
void MainWindow::restartBarrier()
|
||||
{
|
||||
stopBarrier();
|
||||
|
|
@ -470,17 +444,6 @@ void MainWindow::proofreadInfo()
|
|||
setBarrierState((qBarrierState)oldState);
|
||||
}
|
||||
|
||||
void MainWindow::showEvent(QShowEvent* event)
|
||||
{
|
||||
QMainWindow::showEvent(event);
|
||||
emit windowShown();
|
||||
}
|
||||
|
||||
void MainWindow::clearLog()
|
||||
{
|
||||
m_pLogOutput->clear();
|
||||
}
|
||||
|
||||
void MainWindow::startBarrier()
|
||||
{
|
||||
bool desktopMode = appConfig().processMode() == Desktop;
|
||||
|
|
@ -557,9 +520,7 @@ void MainWindow::startBarrier()
|
|||
connect(barrierProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError()));
|
||||
}
|
||||
|
||||
// put a space between last log output and new instance.
|
||||
if (!m_pLogOutput->toPlainText().isEmpty())
|
||||
appendLogRaw("");
|
||||
m_pLogWindow->startNewInstance();
|
||||
|
||||
appendLogInfo("starting " + QString(barrierType() == barrierServer ? "server" : "client"));
|
||||
|
||||
|
|
@ -594,16 +555,6 @@ void MainWindow::startBarrier()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
MainWindow::sslToggled (bool enabled)
|
||||
{
|
||||
if (enabled) {
|
||||
m_pSslCertificate = new SslCertificate(this);
|
||||
m_pSslCertificate->generateCertificate();
|
||||
}
|
||||
updateLocalFingerprint();
|
||||
}
|
||||
|
||||
bool MainWindow::clientArgs(QStringList& args, QString& app)
|
||||
{
|
||||
app = appPath(appConfig().barriercName());
|
||||
|
|
@ -985,16 +936,16 @@ void MainWindow::serverDetected(const QString name)
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::updateLocalFingerprint()
|
||||
void MainWindow::updateSSLFingerprint()
|
||||
{
|
||||
if (m_AppConfig->getCryptoEnabled() && Fingerprint::local().fileExists()) {
|
||||
m_pLabelFingerprint->setVisible(true);
|
||||
m_pLabelLocalFingerprint->setVisible(true);
|
||||
m_pLabelLocalFingerprint->setText(Fingerprint::local().readFirst());
|
||||
if (m_AppConfig->getCryptoEnabled() && m_pSslCertificate == nullptr) {
|
||||
m_pSslCertificate = new SslCertificate(this);
|
||||
m_pSslCertificate->generateCertificate();
|
||||
}
|
||||
else {
|
||||
m_pLabelFingerprint->setVisible(false);
|
||||
m_pLabelLocalFingerprint->setVisible(false);
|
||||
if (m_AppConfig->getCryptoEnabled() && Fingerprint::local().fileExists()) {
|
||||
m_pLabelLocalFingerprint->setText(Fingerprint::local().readFirst());
|
||||
} else {
|
||||
m_pLabelLocalFingerprint->setText("Disabled");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1042,13 +993,13 @@ bool MainWindow::on_m_pActionSave_triggered()
|
|||
|
||||
void MainWindow::on_m_pActionAbout_triggered()
|
||||
{
|
||||
AboutDialog dlg(this, appPath(appConfig().barriercName()));
|
||||
dlg.exec();
|
||||
AboutDialog(this, appPath(appConfig().barriercName())).exec();
|
||||
}
|
||||
|
||||
void MainWindow::on_m_pActionSettings_triggered()
|
||||
{
|
||||
SettingsDialog(this, appConfig()).exec();
|
||||
if (SettingsDialog(this, appConfig()).exec() == QDialog::Accepted)
|
||||
updateSSLFingerprint();
|
||||
}
|
||||
|
||||
void MainWindow::autoAddScreen(const QString name)
|
||||
|
|
@ -1119,12 +1070,15 @@ bool MainWindow::isServiceRunning(QString name)
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
bool MainWindow::isServiceRunning()
|
||||
{
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool MainWindow::isBonjourRunning()
|
||||
{
|
||||
|
|
@ -1298,11 +1252,6 @@ void MainWindow::bonjourInstallFinished()
|
|||
m_pCheckBoxAutoConfig->setChecked(true);
|
||||
}
|
||||
|
||||
void MainWindow::on_windowShown()
|
||||
{
|
||||
// removed activation garbage; leaving stub to be optimized out
|
||||
}
|
||||
|
||||
QString MainWindow::getProfileRootForArg()
|
||||
{
|
||||
CoreInterface coreInterface;
|
||||
|
|
@ -1323,3 +1272,8 @@ void MainWindow::windowStateChanged()
|
|||
if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
|
||||
hide();
|
||||
}
|
||||
|
||||
void MainWindow::showLogWindow()
|
||||
{
|
||||
m_pLogWindow->show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "VersionChecker.h"
|
||||
#include "IpcClient.h"
|
||||
#include "Ipc.h"
|
||||
#include "LogWindow.h"
|
||||
|
||||
#include <QMutex>
|
||||
|
||||
|
|
@ -104,7 +105,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
|
|||
QString address();
|
||||
QString appPath(const QString& name);
|
||||
void open();
|
||||
void clearLog();
|
||||
VersionChecker& versionChecker() { return m_VersionChecker; }
|
||||
QString getScreenName();
|
||||
ServerConfig& serverConfig() { return m_ServerConfig; }
|
||||
|
|
@ -113,7 +113,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
|
|||
void autoAddScreen(const QString name);
|
||||
void updateZeroconfService();
|
||||
void serverDetected(const QString name);
|
||||
void updateLocalFingerprint();
|
||||
|
||||
public slots:
|
||||
void appendLogRaw(const QString& text);
|
||||
|
|
@ -123,7 +122,6 @@ public slots:
|
|||
void startBarrier();
|
||||
|
||||
protected slots:
|
||||
void sslToggled(bool enabled);
|
||||
void on_m_pGroupClient_toggled(bool on);
|
||||
void on_m_pGroupServer_toggled(bool on);
|
||||
bool on_m_pButtonBrowseConfigFile_clicked();
|
||||
|
|
@ -136,8 +134,8 @@ public slots:
|
|||
void stopBarrier();
|
||||
void logOutput();
|
||||
void logError();
|
||||
void updateFound(const QString& version);
|
||||
void bonjourInstallFinished();
|
||||
void showLogWindow();
|
||||
|
||||
protected:
|
||||
QSettings& settings() { return m_Settings; }
|
||||
|
|
@ -146,17 +144,14 @@ public slots:
|
|||
void setBarrierProcess(QProcess* p) { m_pBarrier = p; }
|
||||
void initConnections();
|
||||
void createMenuBar();
|
||||
void createStatusBar();
|
||||
void createTrayIcon();
|
||||
void loadSettings();
|
||||
void saveSettings();
|
||||
void setIcon(qBarrierState state);
|
||||
void setBarrierState(qBarrierState state);
|
||||
bool checkForApp(int which, QString& app);
|
||||
bool clientArgs(QStringList& args, QString& app);
|
||||
bool serverArgs(QStringList& args, QString& app);
|
||||
void setStatus(const QString& status);
|
||||
void sendIpcMessage(qIpcMessageType type, const char* buffer, bool showErrors);
|
||||
void updateFromLogLine(const QString& line);
|
||||
QString getIPAddresses();
|
||||
void stopService();
|
||||
|
|
@ -174,14 +169,10 @@ public slots:
|
|||
QString getProfileRootForArg();
|
||||
void checkConnected(const QString& line);
|
||||
void checkFingerprint(const QString& line);
|
||||
QString getTimeStamp();
|
||||
void restartBarrier();
|
||||
void proofreadInfo();
|
||||
|
||||
void showEvent (QShowEvent*);
|
||||
|
||||
void windowStateChanged();
|
||||
|
||||
void updateSSLFingerprint();
|
||||
|
||||
private:
|
||||
QSettings& m_Settings;
|
||||
|
|
@ -196,9 +187,7 @@ public slots:
|
|||
VersionChecker m_VersionChecker;
|
||||
IpcClient m_IpcClient;
|
||||
QMenuBar* m_pMenuBar;
|
||||
QMenu* m_pMenuFile;
|
||||
QMenu* m_pMenuEdit;
|
||||
QMenu* m_pMenuWindow;
|
||||
QMenu* m_pMenuBarrier;
|
||||
QMenu* m_pMenuHelp;
|
||||
ZeroconfService* m_pZeroconfService;
|
||||
DataDownloader* m_pDataDownloader;
|
||||
|
|
@ -212,16 +201,14 @@ public slots:
|
|||
QMutex m_StopDesktopMutex;
|
||||
SslCertificate* m_pSslCertificate;
|
||||
QStringList m_PendingClientNames;
|
||||
LogWindow *m_pLogWindow;
|
||||
|
||||
private slots:
|
||||
void on_m_pCheckBoxAutoConfig_toggled(bool checked);
|
||||
void on_m_pComboServerList_currentIndexChanged(QString );
|
||||
void on_m_pButtonApply_clicked();
|
||||
void installBonjour();
|
||||
void on_windowShown();
|
||||
|
||||
signals:
|
||||
void windowShown();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>500</width>
|
||||
<height>400</height>
|
||||
<width>600</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -27,57 +27,6 @@
|
|||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QWidget" name="m_pWidgetUpdate" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="leftMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="m_pIconUpdate">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="Barrier.qrc">:/res/icons/16x16/warning.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="m_pLabelUpdate">
|
||||
<property name="text">
|
||||
<string notr="true">m_pLabelUpdate</string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="m_pSpacerUpdate">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>469</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="m_pGroupServer">
|
||||
<property name="sizePolicy">
|
||||
|
|
@ -290,42 +239,6 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="m_pGroupLog">
|
||||
<property name="title">
|
||||
<string>Log</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTextEdit" name="m_pLogOutput">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Courier</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="undoRedoEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="lineWrapMode">
|
||||
<enum>QTextEdit::NoWrap</enum>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="sizeConstraint">
|
||||
|
|
@ -429,14 +342,6 @@
|
|||
<string notr="true">Ctrl+T</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionShowStatus">
|
||||
<property name="text">
|
||||
<string>S&how Status</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string notr="true">Ctrl+H</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="m_pActionMinimize">
|
||||
<property name="text">
|
||||
<string>&Hide</string>
|
||||
|
|
@ -445,7 +350,7 @@
|
|||
<string>Hide</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string notr="true"/>
|
||||
<string notr="true">F5</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="m_pActionRestore">
|
||||
|
|
@ -461,7 +366,7 @@
|
|||
</action>
|
||||
<action name="m_pActionSave">
|
||||
<property name="text">
|
||||
<string>Save configuration &as...</string>
|
||||
<string>S&ave configuration</string>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>Save the interactively generated server configuration to a file.</string>
|
||||
|
|
@ -472,13 +377,24 @@
|
|||
</action>
|
||||
<action name="m_pActionSettings">
|
||||
<property name="text">
|
||||
<string>Settings</string>
|
||||
<string>Change &Settings</string>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>Edit settings</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string notr="true"/>
|
||||
<string notr="true">F4</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="m_pActionShowLog">
|
||||
<property name="text">
|
||||
<string>Show &Log</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Show Log</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string notr="true">F2</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
|
|
|
|||
|
|
@ -65,26 +65,26 @@ SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
|
|||
|
||||
void SettingsDialog::accept()
|
||||
{
|
||||
appConfig().setScreenName(m_pLineEditScreenName->text());
|
||||
appConfig().setPort(m_pSpinBoxPort->value());
|
||||
appConfig().setNetworkInterface(m_pLineEditInterface->text());
|
||||
appConfig().setLogLevel(m_pComboLogLevel->currentIndex());
|
||||
appConfig().setLogToFile(m_pCheckBoxLogToFile->isChecked());
|
||||
appConfig().setLogFilename(m_pLineEditLogFilename->text());
|
||||
appConfig().setLanguage(m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString());
|
||||
appConfig().setElevateMode(static_cast<ElevateMode>(m_pComboElevate->currentIndex()));
|
||||
appConfig().setAutoHide(m_pCheckBoxAutoHide->isChecked());
|
||||
appConfig().setMinimizeToTray(m_pCheckBoxMinimizeToTray->isChecked());
|
||||
appConfig().saveSettings();
|
||||
m_appConfig.setScreenName(m_pLineEditScreenName->text());
|
||||
m_appConfig.setPort(m_pSpinBoxPort->value());
|
||||
m_appConfig.setNetworkInterface(m_pLineEditInterface->text());
|
||||
m_appConfig.setCryptoEnabled(m_pCheckBoxEnableCrypto->isChecked());
|
||||
m_appConfig.setLogLevel(m_pComboLogLevel->currentIndex());
|
||||
m_appConfig.setLogToFile(m_pCheckBoxLogToFile->isChecked());
|
||||
m_appConfig.setLogFilename(m_pLineEditLogFilename->text());
|
||||
m_appConfig.setLanguage(m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString());
|
||||
m_appConfig.setElevateMode(static_cast<ElevateMode>(m_pComboElevate->currentIndex()));
|
||||
m_appConfig.setAutoHide(m_pCheckBoxAutoHide->isChecked());
|
||||
m_appConfig.setMinimizeToTray(m_pCheckBoxMinimizeToTray->isChecked());
|
||||
m_appConfig.saveSettings();
|
||||
QDialog::accept();
|
||||
}
|
||||
|
||||
void SettingsDialog::reject()
|
||||
{
|
||||
if (appConfig().language() != m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString()) {
|
||||
QBarrierApplication::getInstance()->switchTranslator(appConfig().language());
|
||||
if (m_appConfig.language() != m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString()) {
|
||||
QBarrierApplication::getInstance()->switchTranslator(m_appConfig.language());
|
||||
}
|
||||
|
||||
QDialog::reject();
|
||||
}
|
||||
|
||||
|
|
@ -137,16 +137,4 @@ void SettingsDialog::on_m_pComboLanguage_currentIndexChanged(int index)
|
|||
{
|
||||
QString ietfCode = m_pComboLanguage->itemData(index).toString();
|
||||
QBarrierApplication::getInstance()->switchTranslator(ietfCode);
|
||||
}
|
||||
|
||||
void SettingsDialog::on_m_pCheckBoxEnableCrypto_toggled(bool checked)
|
||||
{
|
||||
m_appConfig.setCryptoEnabled(checked);
|
||||
m_appConfig.saveSettings();
|
||||
if (checked) {
|
||||
SslCertificate sslCertificate;
|
||||
sslCertificate.generateCertificate();
|
||||
MainWindow& mainWindow = dynamic_cast<MainWindow&> (*this->parent());
|
||||
mainWindow.updateLocalFingerprint();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -33,8 +33,6 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
|
|||
|
||||
public:
|
||||
SettingsDialog(QWidget* parent, AppConfig& config);
|
||||
static QString browseForBarrierc(QWidget* parent, const QString& programDir, const QString& barriercName);
|
||||
static QString browseForBarriers(QWidget* parent, const QString& programDir, const QString& barriersName);
|
||||
|
||||
protected:
|
||||
void accept();
|
||||
|
|
@ -48,7 +46,6 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
|
|||
CoreInterface m_CoreInterface;
|
||||
|
||||
private slots:
|
||||
void on_m_pCheckBoxEnableCrypto_toggled(bool checked);
|
||||
void on_m_pComboLanguage_currentIndexChanged(int index);
|
||||
void on_m_pCheckBoxLogToFile_stateChanged(int );
|
||||
void on_m_pButtonBrowseLog_clicked();
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "MainWindow.h"
|
||||
#include "AppConfig.h"
|
||||
#include "SetupWizard.h"
|
||||
#include "DisplayIsValid.h"
|
||||
|
||||
#include <QtCore>
|
||||
#include <QtGui>
|
||||
|
|
@ -54,6 +55,14 @@ bool checkMacAssistiveDevices();
|
|||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
#ifdef WINAPI_XWINDOWS
|
||||
// QApplication's constructor will call a fscking abort() if
|
||||
// DISPLAY is bad. Let's check it first and handle it gracefully
|
||||
if (!display_is_valid()) {
|
||||
fprintf(stderr, "The Barrier GUI requires a display. Quitting...\n");
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
#ifdef Q_OS_DARWIN
|
||||
/* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */
|
||||
::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1);
|
||||
|
|
@ -84,9 +93,7 @@ int main(int argc, char* argv[])
|
|||
return -1;
|
||||
}
|
||||
|
||||
#ifndef Q_OS_WIN
|
||||
QApplication::setQuitOnLastWindowClosed(false);
|
||||
#endif
|
||||
|
||||
QSettings settings;
|
||||
AppConfig appConfig (&settings);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,3 @@ add_subdirectory(net)
|
|||
add_subdirectory(platform)
|
||||
add_subdirectory(server)
|
||||
add_subdirectory(barrier)
|
||||
|
||||
if (WIN32)
|
||||
add_subdirectory(synwinhk)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -40,5 +40,8 @@ endif()
|
|||
add_library(arch STATIC ${sources})
|
||||
|
||||
if (UNIX)
|
||||
target_link_libraries(arch dl ${libs})
|
||||
target_link_libraries(arch ${libs})
|
||||
if (NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
target_link_libraries(arch dl)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
static const size_t g_chunkSize = 512 * 1024; //512kb
|
||||
static const size_t g_chunkSize = 32 * 1024; //32kb
|
||||
|
||||
bool StreamChunker::s_isChunkingFile = false;
|
||||
bool StreamChunker::s_interruptFile = false;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include <cstdlib>
|
||||
#include <memory>
|
||||
#include <fstream>
|
||||
#include <memory>
|
||||
|
||||
//
|
||||
// SecureSocket
|
||||
|
|
@ -206,45 +207,43 @@ SecureSocket::doWrite()
|
|||
{
|
||||
static bool s_retry = false;
|
||||
static int s_retrySize = 0;
|
||||
static void* s_staticBuffer = NULL;
|
||||
static std::unique_ptr<char[]> s_staticBuffer;
|
||||
static std::size_t s_staticBufferSize = 0;
|
||||
|
||||
// write data
|
||||
int bufferSize = 0;
|
||||
int bytesWrote = 0;
|
||||
int status = 0;
|
||||
|
||||
|
||||
if (!isSecureReady())
|
||||
return kRetry;
|
||||
|
||||
if (s_retry) {
|
||||
bufferSize = s_retrySize;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
bufferSize = m_outputBuffer.getSize();
|
||||
s_staticBuffer = malloc(bufferSize);
|
||||
memcpy(s_staticBuffer, m_outputBuffer.peek(bufferSize), bufferSize);
|
||||
if (bufferSize > s_staticBufferSize) {
|
||||
s_staticBuffer.reset(new char[bufferSize]);
|
||||
s_staticBufferSize = bufferSize;
|
||||
}
|
||||
if (bufferSize > 0) {
|
||||
memcpy(s_staticBuffer.get(), m_outputBuffer.peek(bufferSize), bufferSize);
|
||||
}
|
||||
}
|
||||
|
||||
if (bufferSize == 0) {
|
||||
return kRetry;
|
||||
}
|
||||
|
||||
if (isSecureReady()) {
|
||||
status = secureWrite(s_staticBuffer, bufferSize, bytesWrote);
|
||||
if (status > 0) {
|
||||
s_retry = false;
|
||||
bufferSize = 0;
|
||||
free(s_staticBuffer);
|
||||
s_staticBuffer = NULL;
|
||||
}
|
||||
else if (status < 0) {
|
||||
return kBreak;
|
||||
}
|
||||
else if (status == 0) {
|
||||
s_retry = true;
|
||||
s_retrySize = bufferSize;
|
||||
return kNew;
|
||||
}
|
||||
}
|
||||
else {
|
||||
return kRetry;
|
||||
status = secureWrite(s_staticBuffer.get(), bufferSize, bytesWrote);
|
||||
if (status > 0) {
|
||||
s_retry = false;
|
||||
} else if (status < 0) {
|
||||
return kBreak;
|
||||
} else if (status == 0) {
|
||||
s_retry = true;
|
||||
s_retrySize = bufferSize;
|
||||
return kNew;
|
||||
}
|
||||
|
||||
if (bytesWrote > 0) {
|
||||
|
|
@ -814,7 +813,7 @@ SecureSocket::showSecureCipherInfo()
|
|||
showCipherStackDesc(sStack);
|
||||
}
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
// m_ssl->m_ssl->session->ciphers is not forward compatable,
|
||||
// In future release of OpenSSL, it's not visible,
|
||||
STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
if (WIN32)
|
||||
file(GLOB headers "MSWindows*.h" "ImmuneKeysReader.h")
|
||||
file(GLOB headers "MSWindows*.h" "ImmuneKeysReader.h" "synwinhk.h")
|
||||
file(GLOB sources "MSWindows*.cpp" "ImmuneKeysReader.cpp")
|
||||
elseif (APPLE)
|
||||
file(GLOB headers "OSX*.h" "IOSX*.h")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2004 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -18,9 +19,7 @@
|
|||
|
||||
#include "platform/MSWindowsDesks.h"
|
||||
|
||||
#include "synwinhk/synwinhk.h"
|
||||
#include "platform/MSWindowsScreen.h"
|
||||
#include "platform/ImmuneKeysReader.h"
|
||||
#include "barrier/IScreenSaver.h"
|
||||
#include "barrier/XScreen.h"
|
||||
#include "mt/Lock.h"
|
||||
|
|
@ -89,23 +88,12 @@
|
|||
// enable; <unused>
|
||||
#define BARRIER_MSG_FAKE_INPUT BARRIER_HOOK_LAST_MSG + 12
|
||||
|
||||
static const std::string ImmuneKeysPath = ArchFileWindows().getProfileDirectory() + "\\ImmuneKeys.txt";
|
||||
|
||||
static std::vector<DWORD> immune_keys_list()
|
||||
{
|
||||
std::vector<DWORD> keys;
|
||||
std::string badLine;
|
||||
if (!ImmuneKeysReader::get_list(ImmuneKeysPath.c_str(), keys, badLine))
|
||||
LOG((CLOG_ERR "Reading immune keys stopped at: %s", badLine.c_str()));
|
||||
return keys;
|
||||
}
|
||||
|
||||
//
|
||||
// MSWindowsDesks
|
||||
//
|
||||
|
||||
MSWindowsDesks::MSWindowsDesks(
|
||||
bool isPrimary, bool noHooks, HINSTANCE hookLibrary,
|
||||
bool isPrimary, bool noHooks,
|
||||
const IScreenSaver* screensaver, IEventQueue* events,
|
||||
IJob* updateKeys, bool stopOnDeskSwitch) :
|
||||
m_isPrimary(isPrimary),
|
||||
|
|
@ -126,11 +114,6 @@ MSWindowsDesks::MSWindowsDesks(
|
|||
m_events(events),
|
||||
m_stopOnDeskSwitch(stopOnDeskSwitch)
|
||||
{
|
||||
LOG((CLOG_DEBUG "Immune Keys Path: %s", ImmuneKeysPath.c_str()));
|
||||
|
||||
if (hookLibrary != NULL)
|
||||
queryHookLibrary(hookLibrary);
|
||||
|
||||
m_cursor = createBlankCursor();
|
||||
m_deskClass = createDeskWindowClass(m_isPrimary);
|
||||
m_keyLayout = GetKeyboardLayout(GetCurrentThreadId());
|
||||
|
|
@ -362,39 +345,6 @@ MSWindowsDesks::sendMessage(UINT msg, WPARAM wParam, LPARAM lParam) const
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
|
||||
{
|
||||
// look up functions
|
||||
if (m_isPrimary && !m_noHooks) {
|
||||
m_install = (InstallFunc)GetProcAddress(hookLibrary, "install");
|
||||
m_uninstall = (UninstallFunc)GetProcAddress(hookLibrary, "uninstall");
|
||||
m_setImmuneKeys = (SetImmuneKeysFunc)GetProcAddress(hookLibrary, "setImmuneKeys");
|
||||
m_installScreensaver =
|
||||
(InstallScreenSaverFunc)GetProcAddress(
|
||||
hookLibrary, "installScreenSaver");
|
||||
m_uninstallScreensaver =
|
||||
(UninstallScreenSaverFunc)GetProcAddress(
|
||||
hookLibrary, "uninstallScreenSaver");
|
||||
|
||||
if (m_install == NULL ||
|
||||
m_uninstall == NULL ||
|
||||
m_setImmuneKeys == NULL ||
|
||||
m_installScreensaver == NULL ||
|
||||
m_uninstallScreensaver == NULL) {
|
||||
LOG((CLOG_ERR "Invalid hook library"));
|
||||
throw XScreenOpenFailure();
|
||||
}
|
||||
}
|
||||
else {
|
||||
m_install = NULL;
|
||||
m_uninstall = NULL;
|
||||
m_setImmuneKeys = NULL;
|
||||
m_installScreensaver = NULL;
|
||||
m_uninstallScreensaver = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
HCURSOR
|
||||
MSWindowsDesks::createBlankCursor() const
|
||||
{
|
||||
|
|
@ -583,7 +533,7 @@ MSWindowsDesks::deskEnter(Desk* desk)
|
|||
AttachThreadInput(thatThread, thisThread, TRUE);
|
||||
SetForegroundWindow(desk->m_foregroundWindow);
|
||||
AttachThreadInput(thatThread, thisThread, FALSE);
|
||||
EnableWindow(desk->m_window, desk->m_lowLevel ? FALSE : TRUE);
|
||||
EnableWindow(desk->m_window, FALSE);
|
||||
desk->m_foregroundWindow = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -596,35 +546,16 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout)
|
|||
// layout we choose rather than the keyboard layout of the last
|
||||
// active window.
|
||||
int x, y, w, h;
|
||||
if (desk->m_lowLevel) {
|
||||
// with a low level hook the cursor will never budge so
|
||||
// just a 1x1 window is sufficient.
|
||||
x = m_xCenter;
|
||||
y = m_yCenter;
|
||||
w = 1;
|
||||
h = 1;
|
||||
}
|
||||
else {
|
||||
// with regular hooks the cursor will jitter as it's moved
|
||||
// by the user then back to the center by us. to be sure
|
||||
// we never lose it, cover all the monitors with the window.
|
||||
x = m_x;
|
||||
y = m_y;
|
||||
w = m_w;
|
||||
h = m_h;
|
||||
}
|
||||
// with a low level hook the cursor will never budge so
|
||||
// just a 1x1 window is sufficient.
|
||||
x = m_xCenter;
|
||||
y = m_yCenter;
|
||||
w = 1;
|
||||
h = 1;
|
||||
SetWindowPos(desk->m_window, HWND_TOP, x, y, w, h,
|
||||
SWP_NOACTIVATE | SWP_SHOWWINDOW);
|
||||
|
||||
// if not using low-level hooks we have to also activate the
|
||||
// window to ensure we don't lose keyboard focus.
|
||||
// FIXME -- see if this can be avoided. if so then always
|
||||
// disable the window (see handling of BARRIER_MSG_SWITCH).
|
||||
if (!desk->m_lowLevel) {
|
||||
SetActiveWindow(desk->m_window);
|
||||
}
|
||||
|
||||
// if using low-level hooks then disable the foreground window
|
||||
// since we're using low-level hooks, disable the foreground window
|
||||
// so it can't mess up any of our keyboard events. the console
|
||||
// program, for example, will cause characters to be reported as
|
||||
// unshifted, regardless of the shift key state. interestingly
|
||||
|
|
@ -632,19 +563,17 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout)
|
|||
//
|
||||
// note that we must enable the window to activate it and we
|
||||
// need to disable the window on deskEnter.
|
||||
else {
|
||||
desk->m_foregroundWindow = getForegroundWindow();
|
||||
if (desk->m_foregroundWindow != NULL) {
|
||||
EnableWindow(desk->m_window, TRUE);
|
||||
SetActiveWindow(desk->m_window);
|
||||
DWORD thisThread =
|
||||
GetWindowThreadProcessId(desk->m_window, NULL);
|
||||
DWORD thatThread =
|
||||
GetWindowThreadProcessId(desk->m_foregroundWindow, NULL);
|
||||
AttachThreadInput(thatThread, thisThread, TRUE);
|
||||
SetForegroundWindow(desk->m_window);
|
||||
AttachThreadInput(thatThread, thisThread, FALSE);
|
||||
}
|
||||
desk->m_foregroundWindow = getForegroundWindow();
|
||||
if (desk->m_foregroundWindow != NULL) {
|
||||
EnableWindow(desk->m_window, TRUE);
|
||||
SetActiveWindow(desk->m_window);
|
||||
DWORD thisThread =
|
||||
GetWindowThreadProcessId(desk->m_window, NULL);
|
||||
DWORD thatThread =
|
||||
GetWindowThreadProcessId(desk->m_foregroundWindow, NULL);
|
||||
AttachThreadInput(thatThread, thisThread, TRUE);
|
||||
SetForegroundWindow(desk->m_window);
|
||||
AttachThreadInput(thatThread, thisThread, FALSE);
|
||||
}
|
||||
|
||||
// switch to requested keyboard layout
|
||||
|
|
@ -709,35 +638,19 @@ MSWindowsDesks::deskThread(void* vdesk)
|
|||
|
||||
case BARRIER_MSG_SWITCH:
|
||||
if (m_isPrimary && !m_noHooks) {
|
||||
m_uninstall();
|
||||
MSWindowsHook::uninstall();
|
||||
if (m_screensaverNotify) {
|
||||
m_uninstallScreensaver();
|
||||
m_installScreensaver();
|
||||
MSWindowsHook::uninstallScreenSaver();
|
||||
MSWindowsHook::installScreenSaver();
|
||||
}
|
||||
// populate immune keys list in the DLL's shared memory
|
||||
// before the hooks are activated
|
||||
auto list = immune_keys_list();
|
||||
LOG((CLOG_DEBUG "Found %u immune keys", list.size()));
|
||||
m_setImmuneKeys(list.data(), list.size());
|
||||
switch (m_install()) {
|
||||
case kHOOK_FAILED:
|
||||
if (!MSWindowsHook::install()) {
|
||||
// we won't work on this desk
|
||||
desk->m_lowLevel = false;
|
||||
break;
|
||||
|
||||
case kHOOK_OKAY:
|
||||
desk->m_lowLevel = false;
|
||||
break;
|
||||
|
||||
case kHOOK_OKAY_LL:
|
||||
desk->m_lowLevel = true;
|
||||
break;
|
||||
LOG((CLOG_DEBUG "Cannot hook on this desk"));
|
||||
}
|
||||
|
||||
// a window on the primary screen with low-level hooks
|
||||
// should never activate.
|
||||
if (desk->m_window)
|
||||
EnableWindow(desk->m_window, desk->m_lowLevel ? FALSE : TRUE);
|
||||
EnableWindow(desk->m_window, FALSE);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -795,10 +708,10 @@ MSWindowsDesks::deskThread(void* vdesk)
|
|||
case BARRIER_MSG_SCREENSAVER:
|
||||
if (!m_noHooks) {
|
||||
if (msg.wParam != 0) {
|
||||
m_installScreensaver();
|
||||
MSWindowsHook::installScreenSaver();
|
||||
}
|
||||
else {
|
||||
m_uninstallScreensaver();
|
||||
MSWindowsHook::uninstallScreenSaver();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2004 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "synwinhk/synwinhk.h"
|
||||
#include "platform/synwinhk.h"
|
||||
#include "barrier/key_types.h"
|
||||
#include "barrier/mouse_types.h"
|
||||
#include "barrier/option_types.h"
|
||||
|
|
@ -65,7 +66,7 @@ public:
|
|||
\p hookLibrary must be a handle to the hook library.
|
||||
*/
|
||||
MSWindowsDesks(
|
||||
bool isPrimary, bool noHooks, HINSTANCE hookLibrary,
|
||||
bool isPrimary, bool noHooks,
|
||||
const IScreenSaver* screensaver, IEventQueue* events,
|
||||
IJob* updateKeys, bool stopOnDeskSwitch);
|
||||
~MSWindowsDesks();
|
||||
|
|
@ -206,7 +207,6 @@ private:
|
|||
typedef std::map<String, Desk*> Desks;
|
||||
|
||||
// initialization and shutdown operations
|
||||
void queryHookLibrary(HINSTANCE hookLibrary);
|
||||
HCURSOR createBlankCursor() const;
|
||||
void destroyCursor(HCURSOR cursor) const;
|
||||
ATOM createDeskWindowClass(bool isPrimary) const;
|
||||
|
|
@ -283,15 +283,6 @@ private:
|
|||
CondVar<bool> m_deskReady;
|
||||
Desks m_desks;
|
||||
|
||||
// hook library stuff
|
||||
InstallFunc m_install;
|
||||
UninstallFunc m_uninstall;
|
||||
SetImmuneKeysFunc m_setImmuneKeys;
|
||||
InstallScreenSaverFunc
|
||||
m_installScreensaver;
|
||||
UninstallScreenSaverFunc
|
||||
m_uninstallScreensaver;
|
||||
|
||||
// keyboard stuff
|
||||
IJob* m_updateKeys;
|
||||
HKL m_keyLayout;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2011 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -17,112 +18,612 @@
|
|||
*/
|
||||
|
||||
#include "platform/MSWindowsHook.h"
|
||||
|
||||
#include "platform/MSWindowsHookResource.h"
|
||||
#include "platform/ImmuneKeysReader.h"
|
||||
#include "barrier/protocol_types.h"
|
||||
#include "barrier/XScreen.h"
|
||||
#include "base/Log.h"
|
||||
|
||||
static const char* g_name = "synwinhk";
|
||||
//
|
||||
// debugging compile flag. when not zero the server doesn't grab
|
||||
// the keyboard when the mouse leaves the server screen. this
|
||||
// makes it possible to use the debugger (via the keyboard) when
|
||||
// all user input would normally be caught by the hook procedures.
|
||||
//
|
||||
#define NO_GRAB_KEYBOARD 0
|
||||
|
||||
MSWindowsHook::MSWindowsHook() :
|
||||
m_initFunc(NULL),
|
||||
m_cleanupFunc(NULL),
|
||||
m_setSidesFunc(NULL),
|
||||
m_setZoneFunc(NULL),
|
||||
m_setModeFunc(NULL),
|
||||
m_instance(NULL)
|
||||
static const DWORD g_threadID = GetCurrentThreadId();
|
||||
|
||||
static WindowsHookResource g_hkMessage;
|
||||
static WindowsHookResource g_hkKeyboard;
|
||||
static WindowsHookResource g_hkMouse;
|
||||
static EHookMode g_mode = kHOOK_DISABLE;
|
||||
static UInt32 g_zoneSides = 0;
|
||||
static SInt32 g_zoneSize = 0;
|
||||
static SInt32 g_xScreen = 0;
|
||||
static SInt32 g_yScreen = 0;
|
||||
static SInt32 g_wScreen = 0;
|
||||
static SInt32 g_hScreen = 0;
|
||||
static WPARAM g_deadVirtKey = 0;
|
||||
static WPARAM g_deadRelease = 0;
|
||||
static LPARAM g_deadLParam = 0;
|
||||
static BYTE g_deadKeyState[256] = { 0 };
|
||||
static BYTE g_keyState[256] = { 0 };
|
||||
static bool g_fakeServerInput = false;
|
||||
static std::vector<DWORD> g_immuneKeys;
|
||||
|
||||
static const std::string ImmuneKeysPath = ArchFileWindows().getProfileDirectory() + "\\ImmuneKeys.txt";
|
||||
|
||||
static std::vector<DWORD> immune_keys_list()
|
||||
{
|
||||
std::vector<DWORD> keys;
|
||||
std::string badLine;
|
||||
if (!ImmuneKeysReader::get_list(ImmuneKeysPath.c_str(), keys, badLine))
|
||||
LOG((CLOG_ERR "Reading immune keys stopped at: %s", badLine.c_str()));
|
||||
return keys;
|
||||
}
|
||||
|
||||
MSWindowsHook::~MSWindowsHook()
|
||||
inline static
|
||||
bool is_immune_key(DWORD target)
|
||||
{
|
||||
cleanup();
|
||||
|
||||
if (m_instance != NULL) {
|
||||
FreeLibrary(m_instance);
|
||||
for (auto key : g_immuneKeys) {
|
||||
if (key == target)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::loadLibrary()
|
||||
{
|
||||
// load library
|
||||
m_instance = LoadLibrary(g_name);
|
||||
if (m_instance == NULL) {
|
||||
LOG((CLOG_ERR "failed to load hook library, %s.dll is missing or invalid", g_name));
|
||||
throw XScreenOpenFailure();
|
||||
}
|
||||
|
||||
// look up functions
|
||||
m_setSidesFunc = (SetSidesFunc)GetProcAddress(m_instance, "setSides");
|
||||
m_setZoneFunc = (SetZoneFunc)GetProcAddress(m_instance, "setZone");
|
||||
m_setModeFunc = (SetModeFunc)GetProcAddress(m_instance, "setMode");
|
||||
m_initFunc = (InitFunc)GetProcAddress(m_instance, "init");
|
||||
m_cleanupFunc = (CleanupFunc)GetProcAddress(m_instance, "cleanup");
|
||||
|
||||
if (m_setSidesFunc == NULL ||
|
||||
m_setZoneFunc == NULL ||
|
||||
m_setModeFunc == NULL ||
|
||||
m_initFunc == NULL ||
|
||||
m_cleanupFunc == NULL) {
|
||||
LOG((CLOG_ERR "failed to load hook function, %s.dll could be out of date", g_name));
|
||||
throw XScreenOpenFailure();
|
||||
}
|
||||
|
||||
// initialize library
|
||||
if (init(GetCurrentThreadId()) == 0) {
|
||||
LOG((CLOG_ERR "failed to init %s.dll, another program may be using it", g_name));
|
||||
LOG((CLOG_INFO "restarting your computer may solve this error"));
|
||||
throw XScreenOpenFailure();
|
||||
}
|
||||
}
|
||||
|
||||
HINSTANCE
|
||||
MSWindowsHook::getInstance() const
|
||||
{
|
||||
return m_instance;
|
||||
}
|
||||
|
||||
int
|
||||
MSWindowsHook::init(DWORD threadID)
|
||||
{
|
||||
if (m_initFunc == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return m_initFunc(threadID);
|
||||
}
|
||||
|
||||
int
|
||||
MSWindowsHook::cleanup()
|
||||
{
|
||||
if (m_cleanupFunc == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return m_cleanupFunc();
|
||||
return false;
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::setSides(UInt32 sides)
|
||||
{
|
||||
if (m_setSidesFunc == NULL) {
|
||||
return;
|
||||
}
|
||||
m_setSidesFunc(sides);
|
||||
g_zoneSides = sides;
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::setZone(SInt32 x, SInt32 y, SInt32 w, SInt32 h, SInt32 jumpZoneSize)
|
||||
{
|
||||
if (m_setZoneFunc == NULL) {
|
||||
return;
|
||||
}
|
||||
m_setZoneFunc(x, y, w, h, jumpZoneSize);
|
||||
g_zoneSize = jumpZoneSize;
|
||||
g_xScreen = x;
|
||||
g_yScreen = y;
|
||||
g_wScreen = w;
|
||||
g_hScreen = h;
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::setMode(EHookMode mode)
|
||||
{
|
||||
if (m_setModeFunc == NULL) {
|
||||
g_mode = mode;
|
||||
}
|
||||
|
||||
#if !NO_GRAB_KEYBOARD
|
||||
static
|
||||
void
|
||||
keyboardGetState(BYTE keys[256], DWORD vkCode, bool kf_up)
|
||||
{
|
||||
// we have to use GetAsyncKeyState() rather than GetKeyState() because
|
||||
// we don't pass through most keys so the event synchronous state
|
||||
// doesn't get updated. we do that because certain modifier keys have
|
||||
// side effects, like alt and the windows key.
|
||||
if (vkCode < 0 || vkCode >= 256) {
|
||||
return;
|
||||
}
|
||||
m_setModeFunc(mode);
|
||||
|
||||
// Keep track of key state on our own in case GetAsyncKeyState() fails
|
||||
g_keyState[vkCode] = kf_up ? 0 : 0x80;
|
||||
g_keyState[VK_SHIFT] = g_keyState[VK_LSHIFT] | g_keyState[VK_RSHIFT];
|
||||
|
||||
SHORT key;
|
||||
// Test whether GetAsyncKeyState() is being honest with us
|
||||
key = GetAsyncKeyState(vkCode);
|
||||
|
||||
if (key & 0x80) {
|
||||
// The only time we know for sure that GetAsyncKeyState() is working
|
||||
// is when it tells us that the current key is down.
|
||||
// In this case, update g_keyState to reflect what GetAsyncKeyState()
|
||||
// is telling us, just in case we have gotten out of sync
|
||||
|
||||
for (int i = 0; i < 256; ++i) {
|
||||
key = GetAsyncKeyState(i);
|
||||
g_keyState[i] = (BYTE)((key < 0) ? 0x80u : 0);
|
||||
}
|
||||
}
|
||||
|
||||
// copy g_keyState to keys
|
||||
for (int i = 0; i < 256; ++i) {
|
||||
keys[i] = g_keyState[i];
|
||||
}
|
||||
|
||||
key = GetKeyState(VK_CAPITAL);
|
||||
keys[VK_CAPITAL] = (BYTE)(((key < 0) ? 0x80 : 0) | (key & 1));
|
||||
}
|
||||
|
||||
static
|
||||
WPARAM
|
||||
makeKeyMsg(UINT virtKey, char c, bool noAltGr)
|
||||
{
|
||||
return MAKEWPARAM(MAKEWORD(virtKey & 0xff, (BYTE)c), noAltGr ? 1 : 0);
|
||||
}
|
||||
|
||||
static
|
||||
bool
|
||||
keyboardHookHandler(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
DWORD vkCode = static_cast<DWORD>(wParam);
|
||||
bool kf_up = (lParam & (KF_UP << 16)) != 0;
|
||||
|
||||
// check for special events indicating if we should start or stop
|
||||
// passing events through and not report them to the server. this
|
||||
// is used to allow the server to synthesize events locally but
|
||||
// not pick them up as user events.
|
||||
if (wParam == BARRIER_HOOK_FAKE_INPUT_VIRTUAL_KEY &&
|
||||
((lParam >> 16) & 0xffu) == BARRIER_HOOK_FAKE_INPUT_SCANCODE) {
|
||||
// update flag
|
||||
g_fakeServerInput = ((lParam & 0x80000000u) == 0);
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
0xff000000u | wParam, lParam);
|
||||
|
||||
// discard event
|
||||
return true;
|
||||
}
|
||||
|
||||
// if we're expecting fake input then just pass the event through
|
||||
// and do not forward to the server
|
||||
if (g_fakeServerInput) {
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
0xfe000000u | wParam, lParam);
|
||||
return false;
|
||||
}
|
||||
|
||||
// VK_RSHIFT may be sent with an extended scan code but right shift
|
||||
// is not an extended key so we reset that bit.
|
||||
if (wParam == VK_RSHIFT) {
|
||||
lParam &= ~0x01000000u;
|
||||
}
|
||||
|
||||
// tell server about event
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, wParam, lParam);
|
||||
|
||||
// ignore dead key release
|
||||
if ((g_deadVirtKey == wParam || g_deadRelease == wParam) &&
|
||||
(lParam & 0x80000000u) != 0) {
|
||||
g_deadRelease = 0;
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
wParam | 0x04000000, lParam);
|
||||
return false;
|
||||
}
|
||||
|
||||
// we need the keyboard state for ToAscii()
|
||||
BYTE keys[256];
|
||||
keyboardGetState(keys, vkCode, kf_up);
|
||||
|
||||
// ToAscii() maps ctrl+letter to the corresponding control code
|
||||
// and ctrl+backspace to delete. we don't want those translations
|
||||
// so clear the control modifier state. however, if we want to
|
||||
// simulate AltGr (which is ctrl+alt) then we must not clear it.
|
||||
UINT control = keys[VK_CONTROL] | keys[VK_LCONTROL] | keys[VK_RCONTROL];
|
||||
UINT menu = keys[VK_MENU] | keys[VK_LMENU] | keys[VK_RMENU];
|
||||
if ((control & 0x80) == 0 || (menu & 0x80) == 0) {
|
||||
keys[VK_LCONTROL] = 0;
|
||||
keys[VK_RCONTROL] = 0;
|
||||
keys[VK_CONTROL] = 0;
|
||||
} else {
|
||||
keys[VK_LCONTROL] = 0x80;
|
||||
keys[VK_RCONTROL] = 0x80;
|
||||
keys[VK_CONTROL] = 0x80;
|
||||
keys[VK_LMENU] = 0x80;
|
||||
keys[VK_RMENU] = 0x80;
|
||||
keys[VK_MENU] = 0x80;
|
||||
}
|
||||
|
||||
// ToAscii() needs to know if a menu is active for some reason.
|
||||
// we don't know and there doesn't appear to be any way to find
|
||||
// out. so we'll just assume a menu is active if the menu key
|
||||
// is down.
|
||||
// FIXME -- figure out some way to check if a menu is active
|
||||
UINT flags = 0;
|
||||
if ((menu & 0x80) != 0)
|
||||
flags |= 1;
|
||||
|
||||
// if we're on the server screen then just pass numpad keys with alt
|
||||
// key down as-is. we won't pick up the resulting character but the
|
||||
// local app will. if on a client screen then grab keys as usual;
|
||||
// if the client is a windows system it'll synthesize the expected
|
||||
// character. if not then it'll probably just do nothing.
|
||||
if (g_mode != kHOOK_RELAY_EVENTS) {
|
||||
// we don't use virtual keys because we don't know what the
|
||||
// state of the numlock key is. we'll hard code the scan codes
|
||||
// instead. hopefully this works across all keyboards.
|
||||
UINT sc = (lParam & 0x01ff0000u) >> 16;
|
||||
if (menu &&
|
||||
(sc >= 0x47u && sc <= 0x52u && sc != 0x4au && sc != 0x4eu)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
WORD c = 0;
|
||||
|
||||
// map the key event to a character. we have to put the dead
|
||||
// key back first and this has the side effect of removing it.
|
||||
if (g_deadVirtKey != 0) {
|
||||
if (ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16,
|
||||
g_deadKeyState, &c, flags) == 2) {
|
||||
// If ToAscii returned 2, it means that we accidentally removed
|
||||
// a double dead key instead of restoring it. Thus, we call
|
||||
// ToAscii again with the same parameters to restore the
|
||||
// internal dead key state.
|
||||
ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16,
|
||||
g_deadKeyState, &c, flags);
|
||||
|
||||
// We need to keep track of this because g_deadVirtKey will be
|
||||
// cleared later on; this would cause the dead key release to
|
||||
// incorrectly restore the dead key state.
|
||||
g_deadRelease = g_deadVirtKey;
|
||||
}
|
||||
}
|
||||
|
||||
UINT scanCode = ((lParam & 0x10ff0000u) >> 16);
|
||||
int n = ToAscii((UINT)wParam, scanCode, keys, &c, flags);
|
||||
|
||||
// if mapping failed and ctrl and alt are pressed then try again
|
||||
// with both not pressed. this handles the case where ctrl and
|
||||
// alt are being used as individual modifiers rather than AltGr.
|
||||
// we note that's the case in the message sent back to barrier
|
||||
// because there's no simple way to deduce it after the fact.
|
||||
// we have to put the dead key back first, if there was one.
|
||||
bool noAltGr = false;
|
||||
if (n == 0 && (control & 0x80) != 0 && (menu & 0x80) != 0) {
|
||||
noAltGr = true;
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
wParam | 0x05000000, lParam);
|
||||
if (g_deadVirtKey != 0) {
|
||||
if (ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16,
|
||||
g_deadKeyState, &c, flags) == 2) {
|
||||
ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16,
|
||||
g_deadKeyState, &c, flags);
|
||||
g_deadRelease = g_deadVirtKey;
|
||||
}
|
||||
}
|
||||
BYTE keys2[256];
|
||||
for (size_t i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i) {
|
||||
keys2[i] = keys[i];
|
||||
}
|
||||
keys2[VK_LCONTROL] = 0;
|
||||
keys2[VK_RCONTROL] = 0;
|
||||
keys2[VK_CONTROL] = 0;
|
||||
keys2[VK_LMENU] = 0;
|
||||
keys2[VK_RMENU] = 0;
|
||||
keys2[VK_MENU] = 0;
|
||||
n = ToAscii((UINT)wParam, scanCode, keys2, &c, flags);
|
||||
}
|
||||
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
wParam | ((c & 0xff) << 8) |
|
||||
((n & 0xff) << 16) | 0x06000000,
|
||||
lParam);
|
||||
WPARAM charAndVirtKey = 0;
|
||||
bool clearDeadKey = false;
|
||||
switch (n) {
|
||||
default:
|
||||
// key is a dead key
|
||||
|
||||
if (lParam & 0x80000000u)
|
||||
// This handles the obscure situation where a key has been
|
||||
// pressed which is both a dead key and a normal character
|
||||
// depending on which modifiers have been pressed. We
|
||||
// break here to prevent it from being considered a dead
|
||||
// key.
|
||||
break;
|
||||
|
||||
g_deadVirtKey = wParam;
|
||||
g_deadLParam = lParam;
|
||||
for (size_t i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i) {
|
||||
g_deadKeyState[i] = keys[i];
|
||||
}
|
||||
break;
|
||||
|
||||
case 0:
|
||||
// key doesn't map to a character. this can happen if
|
||||
// non-character keys are pressed after a dead key.
|
||||
charAndVirtKey = makeKeyMsg((UINT)wParam, (char)0, noAltGr);
|
||||
break;
|
||||
|
||||
case 1:
|
||||
// key maps to a character composed with dead key
|
||||
charAndVirtKey = makeKeyMsg((UINT)wParam, (char)LOBYTE(c), noAltGr);
|
||||
clearDeadKey = true;
|
||||
break;
|
||||
|
||||
case 2: {
|
||||
// previous dead key not composed. send a fake key press
|
||||
// and release for the dead key to our window.
|
||||
WPARAM deadCharAndVirtKey =
|
||||
makeKeyMsg((UINT)g_deadVirtKey, (char)LOBYTE(c), noAltGr);
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_KEY,
|
||||
deadCharAndVirtKey, g_deadLParam & 0x7fffffffu);
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_KEY,
|
||||
deadCharAndVirtKey, g_deadLParam | 0x80000000u);
|
||||
|
||||
// use uncomposed character
|
||||
charAndVirtKey = makeKeyMsg((UINT)wParam, (char)HIBYTE(c), noAltGr);
|
||||
clearDeadKey = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// put back the dead key, if any, for the application to use
|
||||
if (g_deadVirtKey != 0) {
|
||||
ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16,
|
||||
g_deadKeyState, &c, flags);
|
||||
}
|
||||
|
||||
// clear out old dead key state
|
||||
if (clearDeadKey) {
|
||||
g_deadVirtKey = 0;
|
||||
g_deadLParam = 0;
|
||||
}
|
||||
|
||||
// forward message to our window. do this whether or not we're
|
||||
// forwarding events to clients because this'll keep our thread's
|
||||
// key state table up to date. that's important for querying
|
||||
// the scroll lock toggle state.
|
||||
// XXX -- with hot keys for actions we may only need to do this when
|
||||
// forwarding.
|
||||
if (charAndVirtKey != 0) {
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG,
|
||||
charAndVirtKey | 0x07000000, lParam);
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_KEY, charAndVirtKey, lParam);
|
||||
}
|
||||
|
||||
if (g_mode == kHOOK_RELAY_EVENTS) {
|
||||
// let certain keys pass through
|
||||
switch (wParam) {
|
||||
case VK_CAPITAL:
|
||||
case VK_NUMLOCK:
|
||||
case VK_SCROLL:
|
||||
// pass event on. we want to let these through to
|
||||
// the window proc because otherwise the keyboard
|
||||
// lights may not stay synchronized.
|
||||
case VK_HANGUL:
|
||||
// pass event on because we're using a low level hook
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
// discard
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static
|
||||
LRESULT CALLBACK
|
||||
keyboardLLHook(int code, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
// decode the message
|
||||
KBDLLHOOKSTRUCT* info = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
|
||||
|
||||
// do not filter non-action events nor immune keys
|
||||
if (code == HC_ACTION && !is_immune_key(info->vkCode)) {
|
||||
WPARAM wParam = info->vkCode;
|
||||
LPARAM lParam = 1; // repeat code
|
||||
lParam |= (info->scanCode << 16); // scan code
|
||||
if (info->flags & LLKHF_EXTENDED) {
|
||||
lParam |= (1lu << 24); // extended key
|
||||
}
|
||||
if (info->flags & LLKHF_ALTDOWN) {
|
||||
lParam |= (1lu << 29); // context code
|
||||
}
|
||||
if (info->flags & LLKHF_UP) {
|
||||
lParam |= (1lu << 31); // transition
|
||||
}
|
||||
// FIXME -- bit 30 should be set if key was already down but
|
||||
// we don't know that info. as a result we'll never generate
|
||||
// key repeat events.
|
||||
|
||||
// handle the message
|
||||
if (keyboardHookHandler(wParam, lParam)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return CallNextHookEx(g_hkKeyboard, code, wParam, lParam);
|
||||
}
|
||||
#endif // !NO_GRAB_KEYBOARD
|
||||
|
||||
static
|
||||
bool
|
||||
mouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data)
|
||||
{
|
||||
switch (wParam) {
|
||||
case WM_LBUTTONDOWN:
|
||||
case WM_MBUTTONDOWN:
|
||||
case WM_RBUTTONDOWN:
|
||||
case WM_XBUTTONDOWN:
|
||||
case WM_LBUTTONDBLCLK:
|
||||
case WM_MBUTTONDBLCLK:
|
||||
case WM_RBUTTONDBLCLK:
|
||||
case WM_XBUTTONDBLCLK:
|
||||
case WM_LBUTTONUP:
|
||||
case WM_MBUTTONUP:
|
||||
case WM_RBUTTONUP:
|
||||
case WM_XBUTTONUP:
|
||||
case WM_NCLBUTTONDOWN:
|
||||
case WM_NCMBUTTONDOWN:
|
||||
case WM_NCRBUTTONDOWN:
|
||||
case WM_NCXBUTTONDOWN:
|
||||
case WM_NCLBUTTONDBLCLK:
|
||||
case WM_NCMBUTTONDBLCLK:
|
||||
case WM_NCRBUTTONDBLCLK:
|
||||
case WM_NCXBUTTONDBLCLK:
|
||||
case WM_NCLBUTTONUP:
|
||||
case WM_NCMBUTTONUP:
|
||||
case WM_NCRBUTTONUP:
|
||||
case WM_NCXBUTTONUP:
|
||||
// always relay the event. eat it if relaying.
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_BUTTON, wParam, data);
|
||||
return (g_mode == kHOOK_RELAY_EVENTS);
|
||||
|
||||
case WM_MOUSEWHEEL:
|
||||
if (g_mode == kHOOK_RELAY_EVENTS) {
|
||||
// relay event
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_WHEEL, data, 0);
|
||||
}
|
||||
return (g_mode == kHOOK_RELAY_EVENTS);
|
||||
|
||||
case WM_NCMOUSEMOVE:
|
||||
case WM_MOUSEMOVE:
|
||||
if (g_mode == kHOOK_RELAY_EVENTS) {
|
||||
// relay and eat event
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_MOVE, x, y);
|
||||
return true;
|
||||
} else if (g_mode == kHOOK_WATCH_JUMP_ZONE) {
|
||||
// low level hooks can report bogus mouse positions that are
|
||||
// outside of the screen. jeez. naturally we end up getting
|
||||
// fake motion in the other direction to get the position back
|
||||
// on the screen, which plays havoc with switch on double tap.
|
||||
// Server deals with that. we'll clamp positions onto the
|
||||
// screen. also, if we discard events for positions outside
|
||||
// of the screen then the mouse appears to get a bit jerky
|
||||
// near the edge. we can either accept that or pass the bogus
|
||||
// events. we'll try passing the events.
|
||||
bool bogus = false;
|
||||
if (x < g_xScreen) {
|
||||
x = g_xScreen;
|
||||
bogus = true;
|
||||
} else if (x >= g_xScreen + g_wScreen) {
|
||||
x = g_xScreen + g_wScreen - 1;
|
||||
bogus = true;
|
||||
}
|
||||
if (y < g_yScreen) {
|
||||
y = g_yScreen;
|
||||
bogus = true;
|
||||
} else if (y >= g_yScreen + g_hScreen) {
|
||||
y = g_yScreen + g_hScreen - 1;
|
||||
bogus = true;
|
||||
}
|
||||
|
||||
// check for mouse inside jump zone
|
||||
bool inside = false;
|
||||
if (!inside && (g_zoneSides & kLeftMask) != 0) {
|
||||
inside = (x < g_xScreen + g_zoneSize);
|
||||
}
|
||||
if (!inside && (g_zoneSides & kRightMask) != 0) {
|
||||
inside = (x >= g_xScreen + g_wScreen - g_zoneSize);
|
||||
}
|
||||
if (!inside && (g_zoneSides & kTopMask) != 0) {
|
||||
inside = (y < g_yScreen + g_zoneSize);
|
||||
}
|
||||
if (!inside && (g_zoneSides & kBottomMask) != 0) {
|
||||
inside = (y >= g_yScreen + g_hScreen - g_zoneSize);
|
||||
}
|
||||
|
||||
// relay the event
|
||||
PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_MOVE, x, y);
|
||||
|
||||
// if inside and not bogus then eat the event
|
||||
return inside && !bogus;
|
||||
}
|
||||
}
|
||||
|
||||
// pass the event
|
||||
return false;
|
||||
}
|
||||
|
||||
static
|
||||
LRESULT CALLBACK
|
||||
mouseLLHook(int code, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
// do not filter non-action events
|
||||
if (code == HC_ACTION) {
|
||||
// decode the message
|
||||
MSLLHOOKSTRUCT* info = reinterpret_cast<MSLLHOOKSTRUCT*>(lParam);
|
||||
SInt32 x = static_cast<SInt32>(info->pt.x);
|
||||
SInt32 y = static_cast<SInt32>(info->pt.y);
|
||||
SInt32 w = static_cast<SInt16>(HIWORD(info->mouseData));
|
||||
|
||||
// handle the message
|
||||
if (mouseHookHandler(wParam, x, y, w)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return CallNextHookEx(g_hkMouse, code, wParam, lParam);
|
||||
}
|
||||
|
||||
bool
|
||||
MSWindowsHook::install()
|
||||
{
|
||||
// discard old dead keys
|
||||
g_deadVirtKey = 0;
|
||||
g_deadLParam = 0;
|
||||
|
||||
// reset fake input flag
|
||||
g_fakeServerInput = false;
|
||||
|
||||
// setup immune keys
|
||||
g_immuneKeys = immune_keys_list();
|
||||
LOG((CLOG_DEBUG "Found %u immune keys in %s", g_immuneKeys.size(), ImmuneKeysPath.c_str()));
|
||||
|
||||
#if NO_GRAB_KEYBOARD
|
||||
// we only need the mouse hook
|
||||
if (!g_hkMouse.set(WH_MOUSE_LL, &mouseLLHook, NULL, 0))
|
||||
return false;
|
||||
#else
|
||||
// we need both hooks. if either fails, discard the other
|
||||
if (!g_hkMouse.set(WH_MOUSE_LL, &mouseLLHook, NULL, 0) ||
|
||||
!g_hkKeyboard.set(WH_KEYBOARD_LL, &keyboardLLHook, NULL, 0)) {
|
||||
g_hkMouse.unset();
|
||||
g_hkKeyboard.unset();
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::uninstall()
|
||||
{
|
||||
// discard old dead keys
|
||||
g_deadVirtKey = 0;
|
||||
g_deadLParam = 0;
|
||||
|
||||
g_hkMouse.unset();
|
||||
g_hkKeyboard.unset();
|
||||
|
||||
uninstallScreenSaver();
|
||||
}
|
||||
|
||||
static
|
||||
LRESULT CALLBACK
|
||||
getMessageHook(int code, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (code >= 0) {
|
||||
MSG* msg = reinterpret_cast<MSG*>(lParam);
|
||||
if (msg->message == WM_SYSCOMMAND &&
|
||||
msg->wParam == SC_SCREENSAVE) {
|
||||
// broadcast screen saver started message
|
||||
PostThreadMessage(g_threadID,
|
||||
BARRIER_MSG_SCREEN_SAVER, TRUE, 0);
|
||||
}
|
||||
}
|
||||
|
||||
return CallNextHookEx(g_hkMessage, code, wParam, lParam);
|
||||
}
|
||||
|
||||
bool
|
||||
MSWindowsHook::installScreenSaver()
|
||||
{
|
||||
// install hook unless it's already installed
|
||||
if (g_hkMessage.is_set())
|
||||
return true;
|
||||
return g_hkMessage.set(WH_GETMESSAGE, &getMessageHook, NULL, 0);
|
||||
}
|
||||
|
||||
void
|
||||
MSWindowsHook::uninstallScreenSaver()
|
||||
{
|
||||
g_hkMessage.unset();
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2011 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "synwinhk/synwinhk.h"
|
||||
#include "platform/synwinhk.h"
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <Windows.h>
|
||||
|
|
@ -27,22 +28,12 @@
|
|||
class MSWindowsHook
|
||||
{
|
||||
public:
|
||||
MSWindowsHook();
|
||||
virtual ~MSWindowsHook();
|
||||
|
||||
void loadLibrary();
|
||||
HINSTANCE getInstance() const;
|
||||
int init(DWORD threadID);
|
||||
int cleanup();
|
||||
void setSides(UInt32 sides);
|
||||
void setZone(SInt32 x, SInt32 y, SInt32 w, SInt32 h, SInt32 jumpZoneSize);
|
||||
void setMode(EHookMode mode);
|
||||
|
||||
private:
|
||||
InitFunc m_initFunc;
|
||||
CleanupFunc m_cleanupFunc;
|
||||
SetSidesFunc m_setSidesFunc;
|
||||
SetZoneFunc m_setZoneFunc;
|
||||
SetModeFunc m_setModeFunc;
|
||||
HINSTANCE m_instance;
|
||||
static bool install();
|
||||
static void uninstall();
|
||||
static bool installScreenSaver();
|
||||
static void uninstallScreenSaver();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
#include "MSWindowsHookResource.h"
|
||||
|
||||
WindowsHookResource::WindowsHookResource() :
|
||||
_hook(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
WindowsHookResource::~WindowsHookResource()
|
||||
{
|
||||
unset();
|
||||
}
|
||||
|
||||
bool WindowsHookResource::set(int idHook, HOOKPROC lpfn, HINSTANCE hmod, DWORD dwThreadId)
|
||||
{
|
||||
if (is_set())
|
||||
return false;
|
||||
_hook = SetWindowsHookEx(idHook, lpfn, hmod, dwThreadId);
|
||||
return is_set();
|
||||
}
|
||||
|
||||
bool WindowsHookResource::unset()
|
||||
{
|
||||
if (is_set()) {
|
||||
if (UnhookWindowsHookEx(_hook) == 0) {
|
||||
return false;
|
||||
}
|
||||
_hook = NULL;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool WindowsHookResource::is_set() const { return _hook != NULL; }
|
||||
WindowsHookResource::operator HHOOK() const { return _hook; }
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
#pragma once
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <Windows.h>
|
||||
|
||||
class WindowsHookResource
|
||||
{
|
||||
public:
|
||||
explicit WindowsHookResource();
|
||||
~WindowsHookResource();
|
||||
|
||||
bool set(int idHook, HOOKPROC lpfn, HINSTANCE hmod, DWORD dwThreadId);
|
||||
bool unset();
|
||||
|
||||
bool is_set() const;
|
||||
operator HHOOK() const;
|
||||
|
||||
private:
|
||||
HHOOK _hook;
|
||||
};
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2002 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -128,15 +129,10 @@ MSWindowsScreen::MSWindowsScreen(
|
|||
|
||||
s_screen = this;
|
||||
try {
|
||||
if (m_isPrimary && !m_noHooks) {
|
||||
m_hook.loadLibrary();
|
||||
}
|
||||
|
||||
m_screensaver = new MSWindowsScreenSaver();
|
||||
m_desks = new MSWindowsDesks(
|
||||
m_isPrimary,
|
||||
m_noHooks,
|
||||
m_hook.getInstance(),
|
||||
m_screensaver,
|
||||
m_events,
|
||||
new TMethodJob<MSWindowsScreen>(
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2002 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
#include "platform/MSWindowsHook.h"
|
||||
#include "barrier/PlatformScreen.h"
|
||||
#include "barrier/DragInformation.h"
|
||||
#include "synwinhk/synwinhk.h"
|
||||
#include "platform/synwinhk.h"
|
||||
#include "mt/CondVar.h"
|
||||
#include "mt/Mutex.h"
|
||||
#include "base/String.h"
|
||||
|
|
|
|||
|
|
@ -1405,9 +1405,9 @@ XWindowsScreen::handleSystemEvent(const Event& event, void*)
|
|||
|
||||
#if HAVE_X11_EXTENSIONS_XRANDR_H
|
||||
if (m_xrandr) {
|
||||
if (xevent->type == m_xrandrEventBase + RRScreenChangeNotify
|
||||
|| xevent->type == m_xrandrEventBase + RRNotify
|
||||
&& reinterpret_cast<XRRNotifyEvent *>(xevent)->subtype == RRNotify_CrtcChange) {
|
||||
if (xevent->type == m_xrandrEventBase + RRScreenChangeNotify ||
|
||||
(xevent->type == m_xrandrEventBase + RRNotify &&
|
||||
reinterpret_cast<XRRNotifyEvent *>(xevent)->subtype == RRNotify_CrtcChange)) {
|
||||
LOG((CLOG_INFO "XRRScreenChangeNotifyEvent or RRNotify_CrtcChange received"));
|
||||
|
||||
// we're required to call back into XLib so XLib can update its internal state
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* barrier -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2018 Debauchee Open Source Group
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2002 Chris Schoeneman
|
||||
*
|
||||
|
|
@ -18,14 +19,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
// hack: vs2005 doesn't declare _WIN32_WINNT, so we need to hard code it.
|
||||
// however, some say that this should be hard coded since it defines the
|
||||
// target system, but since this is suposed to compile on pre-XP, maybe
|
||||
// we should just leave it like this.
|
||||
#if _MSC_VER == 1400
|
||||
#define _WIN32_WINNT 0x0400
|
||||
#endif
|
||||
|
||||
#include "base/EventTypes.h"
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
|
@ -55,41 +48,19 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
enum EHookResult {
|
||||
kHOOK_FAILED,
|
||||
kHOOK_OKAY,
|
||||
kHOOK_OKAY_LL
|
||||
};
|
||||
|
||||
enum EHookMode {
|
||||
kHOOK_DISABLE,
|
||||
kHOOK_WATCH_JUMP_ZONE,
|
||||
kHOOK_RELAY_EVENTS
|
||||
};
|
||||
|
||||
typedef int (*InitFunc)(DWORD targetQueueThreadID);
|
||||
typedef int (*CleanupFunc)(void);
|
||||
typedef EHookResult (*InstallFunc)(void);
|
||||
typedef int (*UninstallFunc)(void);
|
||||
typedef int (*InstallScreenSaverFunc)(void);
|
||||
typedef int (*UninstallScreenSaverFunc)(void);
|
||||
typedef void (*SetSidesFunc)(UInt32);
|
||||
typedef void (*SetZoneFunc)(SInt32, SInt32, SInt32, SInt32, SInt32);
|
||||
typedef void (*SetModeFunc)(int);
|
||||
typedef void (*SetImmuneKeysFunc)(const DWORD*, std::size_t);
|
||||
/* REMOVED ImmuneKeys for migration of synwinhk out of DLL
|
||||
|
||||
CBARRIERHOOK_API int init(DWORD);
|
||||
CBARRIERHOOK_API int cleanup(void);
|
||||
CBARRIERHOOK_API EHookResult install(void);
|
||||
CBARRIERHOOK_API int uninstall(void);
|
||||
CBARRIERHOOK_API int installScreenSaver(void);
|
||||
CBARRIERHOOK_API int uninstallScreenSaver(void);
|
||||
CBARRIERHOOK_API void setSides(UInt32 sides);
|
||||
CBARRIERHOOK_API void setZone(SInt32 x, SInt32 y, SInt32 w, SInt32 h,
|
||||
SInt32 jumpZoneSize);
|
||||
CBARRIERHOOK_API void setMode(EHookMode mode);
|
||||
typedef void (*SetImmuneKeysFunc)(const DWORD*, std::size_t);
|
||||
|
||||
// do not call setImmuneKeys() while the hooks are active!
|
||||
CBARRIERHOOK_API void setImmuneKeys(const DWORD *list, std::size_t size);
|
||||
|
||||
*/
|
||||
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# barrier -- mouse and keyboard sharing utility
|
||||
# Copyright (C) 2013-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
|
||||
# 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 (BARRIER_ADD_HEADERS)
|
||||
list(APPEND sources ${headers})
|
||||
endif()
|
||||
|
||||
add_library(synwinhk SHARED ${sources})
|
||||
|
||||
if (NOT MSVC_VERSION VERSION_LESS 1900)
|
||||
target_link_libraries(synwinhk libucrt)
|
||||
endif()
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -52,7 +52,7 @@ protected:
|
|||
MSWindowsDesks* newDesks(IEventQueue* eventQueue)
|
||||
{
|
||||
return new MSWindowsDesks(
|
||||
true, false, m_hook.getInstance(), m_screensaver, eventQueue,
|
||||
true, false, m_screensaver, eventQueue,
|
||||
new TMethodJob<MSWindowsKeyStateTests>(
|
||||
this, &MSWindowsKeyStateTests::updateKeysCB), false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue