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

Start script via execl

This commit is contained in:
Szymon Szeląg 2019-02-09 19:02:27 +01:00
parent 783fbbd84d
commit bf1fd35237
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,8 @@
#if WINAPI_MSWINDOWS #if WINAPI_MSWINDOWS
#include "platform/MSWindowsScreen.h" #include "platform/MSWindowsScreen.h"
#elif WINAPI_XWINDOWS #elif WINAPI_XWINDOWS
#include <unistd.h>
#include <signal.h>
#include "platform/XWindowsScreen.h" #include "platform/XWindowsScreen.h"
#elif WINAPI_CARBON #elif WINAPI_CARBON
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
@ -119,8 +121,8 @@ ServerApp::help()
" --display <display> connect to the X server at <display>\n" \ " --display <display> connect to the X server at <display>\n" \
" --no-xinitthreads do not call XInitThreads()\n" \ " --no-xinitthreads do not call XInitThreads()\n" \
" --screen-change-script <path>\n" \ " --screen-change-script <path>\n" \
" path to script to run on screen change\n" \ " full path to script to run on screen change\n" \
" first argument is screen name\n" " first argument is the new screen name\n"
#else #else
# define WINAPI_ARGS "" # define WINAPI_ARGS ""
# define WINAPI_INFO "" # define WINAPI_INFO ""
@ -688,13 +690,20 @@ ServerApp::handleScreenSwitched(const Event& e, void*)
if (!args().m_screenChangeScript.empty()) { if (!args().m_screenChangeScript.empty()) {
LOG((CLOG_INFO "Running shell script for screen \"%s\"", info->m_screen)); LOG((CLOG_INFO "Running shell script for screen \"%s\"", info->m_screen));
std::string cmd = std::string(args().m_screenChangeScript); signal(SIGCHLD, SIG_IGN);
cmd += " "; if (!access(args().m_screenChangeScript.c_str(), X_OK)) {
cmd += info->m_screen; pid_t pid = fork();
cmd += " &"; if (pid == 0) {
execl(args().m_screenChangeScript.c_str(),args().m_screenChangeScript.c_str(),info->m_screen,NULL);
std::system(cmd.c_str()); exit(0);
} else if (pid < 0) {
LOG((CLOG_ERR "Script forking error"));
exit(1);
}
} else {
LOG((CLOG_ERR "Script not accessible \"%s\"", args().m_screenChangeScript.c_str()));
}
} }
#endif #endif
} }