koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i3bar: Allow child to specify signals to use

Browse Source 
We now wait for the child process to send the first line before stopping
it to use the signal which might be specified in the i3bar protocol
header
Since clients might use the same signal for both stop and cont, we also
save the stopped state of the child to avoid stopping it while hidden!
This commit is contained in:
Quentin Glidic
2012-08-20 22:20:37 +02:00
committed by Michael Stapelberg
parent 1e114d7ab5
commit 8210c6be79
4 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
i3bar/src/child.c
View File

@ -251,6 +251,11 @@ void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
* in the future, but for now, we just discard it. */
parse_json_header(&child, buffer, rec, &consumed);
if (child.version > 0) {
/* If hide-on-modifier is set, we start of by sending the
* child a SIGSTOP, because the bars aren't mapped at start */
if (config.hide_on_modifier) {
stop_child();
}
read_json_input(buffer + consumed, rec - consumed);
} else {
/* In case of plaintext, we just add a single block and change its
@ -330,12 +335,6 @@ void start_child(char *command) {
dup2(fd[0], STDIN_FILENO);
/* If hide-on-modifier is set, we start of by sending the
* child a SIGSTOP, because the bars aren't mapped at start */
if (config.hide_on_modifier) {
stop_child();
}
break;
}
}
@ -361,7 +360,8 @@ void start_child(char *command) {
*/
void kill_child_at_exit(void) {
if (child.pid > 0) {
kill(child.pid, SIGCONT);
if (child.cont_signal > 0 && child.stopped)
kill(child.pid, child.cont_signal);
kill(child.pid, SIGTERM);
}
}
@ -373,7 +373,8 @@ void kill_child_at_exit(void) {
*/
void kill_child(void) {
if (child.pid > 0) {
kill(child.pid, SIGCONT);
if (child.cont_signal > 0 && child.stopped)
kill(child.pid, child.cont_signal);
kill(child.pid, SIGTERM);
int status;
waitpid(child.pid, &status, 0);
@ -386,8 +387,9 @@ void kill_child(void) {
*
*/
void stop_child(void) {
if (child.pid > 0) {
kill(child.pid, SIGSTOP);
if (child.stop_signal > 0 && !child.stopped) {
child.stopped = true;
kill(child.pid, child.stop_signal);
}
}
@ -396,7 +398,8 @@ void stop_child(void) {
*
*/
void cont_child(void) {
if (child.pid > 0) {
kill(child.pid, SIGCONT);
if (child.cont_signal > 0 && child.stopped) {
child.stopped = false;
kill(child.pid, child.cont_signal);
}
}