diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-06-14 18:14:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 18:14:22 -0400 |
| commit | 0fc9628f03984caa04e200a1dc458d1cf7fc6d6c (patch) | |
| tree | e3c567c4684faf0f9a7f77494f1bf638171d5349 | |
| parent | 76fcfa1e7fb98eb815bbb937099ff9fde63d301f (diff) | |
| parent | 16e20ec251b027c5a8dbc5e85804012f2602629d (diff) | |
| download | sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.zip sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.tar.gz sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.tar.bz2 | |
Merge branch 'master' into tray
| -rw-r--r-- | swaybar/bar.c | 3 | ||||
| -rw-r--r-- | wayland/pango.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index 5e87eac..3412ff2 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -41,6 +41,7 @@ static void spawn_status_cmd_proc(struct bar *bar) { close(pipefd[0]); dup2(pipefd[1], STDOUT_FILENO); close(pipefd[1]); + setpgid(bar->status_command_pid, 0); char *const cmd[] = { "sh", "-c", @@ -290,7 +291,7 @@ static void free_outputs(list_t *outputs) { static void terminate_status_command(pid_t pid) { if (pid) { // terminate status_command process - int ret = kill(pid, SIGTERM); + int ret = killpg(pid, SIGTERM); if (ret != 0) { sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid); } else { diff --git a/wayland/pango.c b/wayland/pango.c index 702ab15..f9eec98 100644 --- a/wayland/pango.c +++ b/wayland/pango.c @@ -5,6 +5,7 @@ #include <string.h> #include <stdio.h> #include <stdbool.h> +#include <stdint.h> #include "log.h" PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, |