rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #969 from albertony/profile_dir 

Improvements to custom profile dir option
This commit is contained in:
Povilas Kanapickas 2020-12-09 23:55:56 +02:00 committed by GitHub
parent ce31584a6b 87c5f874e4
commit 2da6cb3a51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/barrier/App.h
View File

@ -166,8 +166,8 @@ private:
" -l --log <file> write log messages to file.\n" \ " -l --log <file> write log messages to file.\n" \
" --no-tray disable the system tray icon.\n" \ " --no-tray disable the system tray icon.\n" \
" --enable-drag-drop enable file drag & drop.\n" \ " --enable-drag-drop enable file drag & drop.\n" \
" --enable-crypto enable the crypto (ssl) plugin.\n" " --enable-crypto enable the crypto (ssl) plugin.\n" \
" --profile-dir <path> use named profile directory instead.\n"
#define HELP_COMMON_INFO_2 \ #define HELP_COMMON_INFO_2 \
" -h, --help display this help and exit.\n" \ " -h, --help display this help and exit.\n" \
" --version display version information and exit.\n" " --version display version information and exit.\n"

8
src/lib/barrier/ServerApp.cpp
View File

@ -128,6 +128,12 @@ ServerApp::help()
# define WINAPI_INFO "" # define WINAPI_INFO ""
#endif #endif
// refer to custom profile directory even if not saved yet
String profilePath = argsBase().m_profileDirectory;
if (profilePath.empty()) {
profilePath = DataDirectories::profile();
}
std::ostringstream buffer; std::ostringstream buffer;
buffer << "Start the barrier server component." << std::endl buffer << "Start the barrier server component." << std::endl
<< std::endl << std::endl
@ -150,7 +156,7 @@ ServerApp::help()
<< std::endl << std::endl
<< "If no configuration file pathname is provided then the first of the" << std::endl << "If no configuration file pathname is provided then the first of the" << std::endl
<< "following to load successfully sets the configuration:" << std::endl << "following to load successfully sets the configuration:" << std::endl
<< " " << PathUtilities::concat(DataDirectories::profile(), USR_CONFIG_NAME) << std::endl << " " << PathUtilities::concat(profilePath, USR_CONFIG_NAME) << std::endl
<< " " << PathUtilities::concat(DataDirectories::systemconfig(), SYS_CONFIG_NAME) << std::endl; << " " << PathUtilities::concat(DataDirectories::systemconfig(), SYS_CONFIG_NAME) << std::endl;
LOG((CLOG_PRINT "%s", buffer.str().c_str())); LOG((CLOG_PRINT "%s", buffer.str().c_str()));

8
src/lib/platform/MSWindowsHook.cpp
View File

@ -56,14 +56,13 @@ static BYTE g_deadKeyState[256] = { 0 };
static BYTE g_keyState[256] = { 0 }; static BYTE g_keyState[256] = { 0 };
static bool g_fakeServerInput = false; static bool g_fakeServerInput = false;
static std::vector<DWORD> g_immuneKeys; static std::vector<DWORD> g_immuneKeys;
static std::string g_immuneKeysPath;
static const std::string ImmuneKeysPath = DataDirectories::profile() + "\\ImmuneKeys.txt";
static std::vector<DWORD> immune_keys_list() static std::vector<DWORD> immune_keys_list()
{ {
std::vector<DWORD> keys; std::vector<DWORD> keys;
std::string badLine; std::string badLine;
if (!ImmuneKeysReader::get_list(ImmuneKeysPath.c_str(), keys, badLine)) if (!ImmuneKeysReader::get_list(g_immuneKeysPath.c_str(), keys, badLine))
LOG((CLOG_ERR "Reading immune keys stopped at: %s", badLine.c_str())); LOG((CLOG_ERR "Reading immune keys stopped at: %s", badLine.c_str()));
return keys; return keys;
} }
@ -575,8 +574,9 @@ MSWindowsHook::install()
g_fakeServerInput = false; g_fakeServerInput = false;
// setup immune keys // setup immune keys
g_immuneKeysPath = DataDirectories::profile() + "\\ImmuneKeys.txt";
g_immuneKeys = immune_keys_list(); g_immuneKeys = immune_keys_list();
LOG((CLOG_DEBUG "Found %u immune keys in %s", g_immuneKeys.size(), ImmuneKeysPath.c_str())); LOG((CLOG_DEBUG "Found %u immune keys in %s", g_immuneKeys.size(), g_immuneKeysPath.c_str()));
#if NO_GRAB_KEYBOARD #if NO_GRAB_KEYBOARD
// we only need the mouse hook // we only need the mouse hook