Skip to content

Commit

Permalink
Merge pull request #701 from zandrmartin/assign-command
Browse files Browse the repository at this point in the history
messy start of a fix for #462
  • Loading branch information
ddevault authored Jun 11, 2016
2 parents cb0cc32 + 2298143 commit 6388e1e
Show file tree
Hide file tree
Showing 8 changed files with 204 additions and 5 deletions.
31 changes: 30 additions & 1 deletion common/util.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#include <math.h>

#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "readline.h"
#include "util.h"
#include "log.h"

int wrap(int i, int max) {
return ((i % max) + max) % max;
Expand Down Expand Up @@ -64,3 +68,28 @@ int get_modifier_names(const char **names, uint32_t modifier_masks) {

return length;
}

pid_t get_parent_pid(pid_t child) {
pid_t parent;
char file_name[100];
char *buffer = NULL;
char *token = NULL;
const char *sep = " ";
FILE *stat = NULL;

sprintf(file_name, "/proc/%d/stat", child);

if ((stat = fopen(file_name, "r")) && (buffer = read_line(stat))) {
fclose(stat);

token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid

parent = strtol(token, NULL, 10);
return (parent == child) ? -1 : parent;
}

return -1;
}
13 changes: 13 additions & 0 deletions include/config.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
#ifndef _SWAY_CONFIG_H
#define _SWAY_CONFIG_H

#define PID_WORKSPACE_TIMEOUT 60

#include <libinput.h>
#include <stdint.h>
#include <wlc/geometry.h>
#include <wlc/wlc.h>
#include <xkbcommon/xkbcommon.h>
#include <time.h>
#include "wayland-desktop-shell-server-protocol.h"
#include "list.h"
#include "layout.h"
Expand Down Expand Up @@ -92,6 +95,15 @@ struct workspace_output {
char *workspace;
};

struct pid_workspace {
pid_t *pid;
char *workspace;
time_t *time_added;
};

void pid_workspace_add(struct pid_workspace *pw);
void free_pid_workspace(struct pid_workspace *pw);

struct bar_config {
/**
* One of "dock", "hide", "invisible"
Expand Down Expand Up @@ -175,6 +187,7 @@ struct sway_config {
list_t *bars;
list_t *cmd_queue;
list_t *workspace_outputs;
list_t *pid_workspaces;
list_t *output_configs;
list_t *input_configs;
list_t *criteria;
Expand Down
8 changes: 8 additions & 0 deletions include/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define _SWAY_UTIL_H

#include <stdint.h>
#include <unistd.h>
#include <wlc/wlc.h>
#include <xkbcommon/xkbcommon.h>

Expand Down Expand Up @@ -36,4 +37,11 @@ const char *get_modifier_name_by_mask(uint32_t modifier);
*/
int get_modifier_names(const char **names, uint32_t modifier_masks);

/**
* Get the pid of a parent process given the pid of a child process.
*
* Returns the parent pid or NULL if the parent pid cannot be determined.
*/
pid_t get_parent_pid(pid_t pid);

#endif
2 changes: 2 additions & 0 deletions include/workspace.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define _SWAY_WORKSPACE_H

#include <wlc/wlc.h>
#include <unistd.h>
#include "list.h"
#include "layout.h"

Expand All @@ -16,5 +17,6 @@ swayc_t *workspace_output_next();
swayc_t *workspace_next();
swayc_t *workspace_output_prev();
swayc_t *workspace_prev();
swayc_t *workspace_for_pid(pid_t pid);

#endif
13 changes: 10 additions & 3 deletions sway/commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,12 +549,19 @@ static struct cmd_results *cmd_exec_always(int argc, char **argv) {
close(fd[0]);
// cleanup child process
wait(0);
if (*child > 0) {
sway_log(L_DEBUG, "Child process created with pid %d", *child);
swayc_t *ws = swayc_active_workspace();
if (*child > 0 && ws) {
sway_log(L_DEBUG, "Child process created with pid %d for workspace %s", *child, ws->name);
struct pid_workspace *pw = malloc(sizeof(struct pid_workspace));
pw->pid = child;
pw->workspace = strdup(ws->name);
pid_workspace_add(pw);
// TODO: keep track of this pid and open the corresponding view on the current workspace
// blocked pending feature in wlc
} else {
free(child);
}
free(child);

return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

Expand Down
60 changes: 60 additions & 0 deletions sway/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,60 @@ static void free_workspace_output(struct workspace_output *wo) {
free(wo);
}

static void pid_workspace_cleanup() {
struct timespec ts;
struct pid_workspace *pw = NULL;

clock_gettime(CLOCK_MONOTONIC, &ts);

// work backwards through list and remove any entries
// older than PID_WORKSPACE_TIMEOUT
for (int i = config->pid_workspaces->length - 1; i > -1; i--) {
pw = config->pid_workspaces->items[i];

if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) {
list_del(config->pid_workspaces, i);
}
}
}

// de-dupe pid_workspaces to ensure pid uniqueness
void pid_workspace_add(struct pid_workspace *pw) {
struct pid_workspace *list_pw = NULL;
struct timespec ts;
time_t *now = malloc(sizeof(time_t));

pid_workspace_cleanup();

// add current time to pw
clock_gettime(CLOCK_MONOTONIC, &ts);
*now = ts.tv_sec;

pw->time_added = now;

// work backwards through list and delete any entries that
// have the same pid as that in our new pid_workspace
for (int i = config->pid_workspaces->length - 1; i > -1; i--) {
list_pw = config->pid_workspaces->items[i];

if (pw->pid == list_pw->pid) {
list_del(config->pid_workspaces, i);
}
}

list_add(config->pid_workspaces, pw);
}

void free_pid_workspace(struct pid_workspace *pw) {
if (!pw) {
return;
}
free(pw->pid);
free(pw->workspace);
free(pw->time_added);
free(pw);
}

void free_config(struct sway_config *config) {
int i;
for (i = 0; i < config->symbols->length; ++i) {
Expand All @@ -113,6 +167,11 @@ void free_config(struct sway_config *config) {
}
list_free(config->workspace_outputs);

for (i = 0; i < config->pid_workspaces->length; ++i) {
free_pid_workspace(config->pid_workspaces->items[i]);
}
list_free(config->pid_workspaces);

for (i = 0; i < config->criteria->length; ++i) {
free_criteria(config->criteria->items[i]);
}
Expand Down Expand Up @@ -148,6 +207,7 @@ static void config_defaults(struct sway_config *config) {
config->modes = create_list();
config->bars = create_list();
config->workspace_outputs = create_list();
config->pid_workspaces = create_list();
config->criteria = create_list();
config->input_configs = create_list();
config->output_configs = create_list();
Expand Down
30 changes: 29 additions & 1 deletion sway/handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,32 @@ static bool handle_view_created(wlc_handle handle) {
wlc_handle parent = wlc_view_get_parent(handle);
swayc_t *focused = NULL;
swayc_t *newview = NULL;
swayc_t *current_ws = swayc_active_workspace();
bool return_to_workspace = false;
struct wl_client *client = wlc_view_get_wl_client(handle);
pid_t pid;

// Get parent container, to add view in
if (parent) {
focused = swayc_by_handle(parent);
}

if (client) {
// below only works on wayland windows. need a wlc
// api that will work for both wayland and x.
wl_client_get_credentials(client, &pid, NULL, NULL);

if (pid) {
// using newview as a temp storage location here,
// rather than adding yet another workspace var
if ((newview = workspace_for_pid(pid))) {
focused = newview;
newview = NULL;
return_to_workspace = true;
}
}
}

if (!focused || focused->type == C_OUTPUT) {
focused = get_focused_container(&root_container);
// Move focus from floating view
Expand Down Expand Up @@ -220,7 +241,7 @@ static bool handle_view_created(wlc_handle handle) {
// Dmenu keeps viewfocus, but others with this flag don't, for now simulate
// dmenu
case WLC_BIT_OVERRIDE_REDIRECT:
// locked_view_focus = true;
// locked_view_focus = true;
wlc_view_focus(handle);
wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true);
wlc_view_bring_to_front(handle);
Expand Down Expand Up @@ -273,6 +294,13 @@ static bool handle_view_created(wlc_handle handle) {
list_add(output->unmanaged, h);
}
wlc_view_set_mask(handle, VISIBLE);

if (return_to_workspace && current_ws) {
// we were on one workspace, switched to another to add this view,
// now let's return to where we were
workspace_switch(current_ws);
set_focused_container(current_ws->focused);
}
return true;
}

Expand Down
52 changes: 52 additions & 0 deletions sway/workspace.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <wlc/wlc.h>
#include <string.h>
#include <strings.h>
#include <sys/types.h>
#include "ipc-server.h"
#include "workspace.h"
#include "layout.h"
Expand Down Expand Up @@ -309,3 +310,54 @@ bool workspace_switch(swayc_t *workspace) {
arrange_windows(output, -1, -1);
return true;
}

swayc_t *workspace_for_pid(pid_t pid) {
int i;
swayc_t *ws = NULL;
struct pid_workspace *pw = NULL;

sway_log(L_DEBUG, "looking for workspace for pid %d", pid);

// leaving this here as it's useful for debugging
// sway_log(L_DEBUG, "all pid_workspaces");
// for (int k = 0; k < config->pid_workspaces->length; k++) {
// pw = config->pid_workspaces->items[k];
// sway_log(L_DEBUG, "pid %d workspace %s time_added %li", *pw->pid, pw->workspace, *pw->time_added);
// }

do {
for (i = 0; i < config->pid_workspaces->length; i++) {
pw = config->pid_workspaces->items[i];
pid_t *pw_pid = pw->pid;

if (pid == *pw_pid) {
sway_log(L_DEBUG, "found pid_workspace for pid %d, workspace %s", pid, pw->workspace);
break; // out of for loop
}

pw = NULL;
}

if (pw) {
break; // out of do-while loop
}

pid = get_parent_pid(pid);
// no sense in looking for matches for pid 0.
// also, if pid == getpid(), that is the compositor's
// pid, which definitely isn't helpful
} while (pid > 0 && pid != getpid());

if (pw) {
ws = workspace_by_name(pw->workspace);

if (!ws) {
sway_log(L_DEBUG, "Creating workspace %s for pid %d because it disappeared", pw->workspace, pid);
ws = workspace_create(pw->workspace);
}

list_del(config->pid_workspaces, i);
}

return ws;
}

0 comments on commit 6388e1e

Please sign in to comment.