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

Merge branch 'master' into set-size-command

Browse source
This commit is contained in:
Zandr Martin 2016-06-11 17:10:38 -05:00 committed by GitHub
parent 889618d3ee f1268053a6
commit a6f4bf60f2
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/util.c
View file

@ -70,7 +70,7 @@ int get_modifier_names(const char **names, uint32_t modifier_masks) {
} }
pid_t get_parent_pid(pid_t child) { pid_t get_parent_pid(pid_t child) {
pid_t parent; pid_t parent = -1;
char file_name[100]; char file_name[100];
char *buffer = NULL; char *buffer = NULL;
char *token = NULL; char *token = NULL;
@ -79,15 +79,19 @@ pid_t get_parent_pid(pid_t child) {
sprintf(file_name, "/proc/%d/stat", child); sprintf(file_name, "/proc/%d/stat", child);
if ((stat = fopen(file_name, "r")) && (buffer = read_line(stat))) { if ((stat = fopen(file_name, "r"))) {
fclose(stat); if ((buffer = read_line(stat))) {
token = strtok(buffer, sep); // pid token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid token = strtok(NULL, sep); // parent pid
parent = strtol(token, NULL, 10); parent = strtol(token, NULL, 10);
}
fclose(stat);
}
if (parent) {
return (parent == child) ? -1 : parent; return (parent == child) ? -1 : parent;
} }

2
sway/config.c
View file

@ -101,6 +101,7 @@ static void pid_workspace_cleanup() {
pw = config->pid_workspaces->items[i]; pw = config->pid_workspaces->items[i];
if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) { if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) {
free_pid_workspace(config->pid_workspaces->items[i]);
list_del(config->pid_workspaces, i); list_del(config->pid_workspaces, i);
} }
} }
@ -126,6 +127,7 @@ void pid_workspace_add(struct pid_workspace *pw) {
list_pw = config->pid_workspaces->items[i]; list_pw = config->pid_workspaces->items[i];
if (pw->pid == list_pw->pid) { if (pw->pid == list_pw->pid) {
free_pid_workspace(config->pid_workspaces->items[i]);
list_del(config->pid_workspaces, i); list_del(config->pid_workspaces, i);
} }
} }