mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tray

Browse source
This commit is contained in:
Drew DeVault 2017-06-14 18:14:22 -04:00 committed by GitHub
parent 76fcfa1e7f 16e20ec251
commit 0fc9628f03
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
swaybar/bar.c
View file

@ -41,6 +41,7 @@ static void spawn_status_cmd_proc(struct bar *bar) {
close(pipefd[0]); close(pipefd[0]);
dup2(pipefd[1], STDOUT_FILENO); dup2(pipefd[1], STDOUT_FILENO);
close(pipefd[1]); close(pipefd[1]);
setpgid(bar->status_command_pid, 0);
char *const cmd[] = { char *const cmd[] = {
"sh", "sh",
"-c", "-c",
@ -290,7 +291,7 @@ static void free_outputs(list_t *outputs) {
static void terminate_status_command(pid_t pid) { static void terminate_status_command(pid_t pid) {
if (pid) { if (pid) {
// terminate status_command process // terminate status_command process
int ret = kill(pid, SIGTERM); int ret = killpg(pid, SIGTERM);
if (ret != 0) { if (ret != 0) {
sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid); sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid);
} else { } else {

1
wayland/pango.c
View file

@ -5,6 +5,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include "log.h" #include "log.h"
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text,