aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-04 14:01:49 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-08-04 14:01:49 +1000
commit30e7e0f7c7d3d3ce2851f2e70842d735343fb402 (patch)
treebc82fb73e33446c5ec0b50c1bae73658e3eeb6b4
parent04489ff4209dc073027419d90961367cfb998fe8 (diff)
downloadsway-30e7e0f7c7d3d3ce2851f2e70842d735343fb402.zip
sway-30e7e0f7c7d3d3ce2851f2e70842d735343fb402.tar.gz
sway-30e7e0f7c7d3d3ce2851f2e70842d735343fb402.tar.bz2
Move workspace pid code to root.c
-rw-r--r--include/sway/tree/root.h4
-rw-r--r--include/sway/tree/workspace.h4
-rw-r--r--sway/commands/exec_always.c2
-rw-r--r--sway/tree/root.c115
-rw-r--r--sway/tree/view.c2
-rw-r--r--sway/tree/workspace.c113
6 files changed, 121 insertions, 119 deletions
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index ada3c73..edb7c81 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -54,4 +54,8 @@ void root_scratchpad_show(struct sway_container *con);
*/
void root_scratchpad_hide(struct sway_container *con);
+struct sway_container *root_workspace_for_pid(pid_t pid);
+
+void root_record_workspace_pid(pid_t pid);
+
#endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index 5ae0ae3..3337f2c 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -44,10 +44,6 @@ void workspace_output_add_priority(struct sway_container *workspace,
struct sway_container *workspace_output_get_highest_available(
struct sway_container *ws, struct sway_container *exclude);
-struct sway_container *workspace_for_pid(pid_t pid);
-
-void workspace_record_pid(pid_t pid);
-
void workspace_detect_urgent(struct sway_container *workspace);
#endif
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index c730cb8..00e39ae 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -78,7 +78,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
waitpid(pid, NULL, 0);
if (child > 0) {
wlr_log(WLR_DEBUG, "Child process created with pid %d", child);
- workspace_record_pid(child);
+ root_record_workspace_pid(child);
} else {
return cmd_results_new(CMD_FAILURE, "exec_always",
"Second fork() failed");
diff --git a/sway/tree/root.c b/sway/tree/root.c
index 9f3965b..79f2194 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -4,12 +4,14 @@
#include <string.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/input/seat.h"
+#include "sway/output.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
#include "sway/tree/root.h"
#include "sway/tree/workspace.h"
#include "list.h"
#include "log.h"
+#include "util.h"
struct sway_container root_container;
@@ -145,3 +147,116 @@ void root_scratchpad_hide(struct sway_container *con) {
}
list_move_to_end(root_container.sway_root->scratchpad, con);
}
+
+struct pid_workspace {
+ pid_t pid;
+ char *workspace;
+ struct timespec time_added;
+
+ struct sway_container *output;
+ struct wl_listener output_destroy;
+
+ struct wl_list link;
+};
+
+static struct wl_list pid_workspaces;
+
+struct sway_container *root_workspace_for_pid(pid_t pid) {
+ if (!pid_workspaces.prev && !pid_workspaces.next) {
+ wl_list_init(&pid_workspaces);
+ return NULL;
+ }
+
+ struct sway_container *ws = NULL;
+ struct pid_workspace *pw = NULL;
+
+ wlr_log(WLR_DEBUG, "Looking up workspace for pid %d", pid);
+
+ do {
+ struct pid_workspace *_pw = NULL;
+ wl_list_for_each(_pw, &pid_workspaces, link) {
+ if (pid == _pw->pid) {
+ pw = _pw;
+ wlr_log(WLR_DEBUG,
+ "found pid_workspace for pid %d, workspace %s",
+ pid, pw->workspace);
+ goto found;
+ }
+ }
+ pid = get_parent_pid(pid);
+ } while (pid > 1);
+found:
+
+ if (pw && pw->workspace) {
+ ws = workspace_by_name(pw->workspace);
+
+ if (!ws) {
+ wlr_log(WLR_DEBUG,
+ "Creating workspace %s for pid %d because it disappeared",
+ pw->workspace, pid);
+ ws = workspace_create(pw->output, pw->workspace);
+ }
+
+ wl_list_remove(&pw->output_destroy.link);
+ wl_list_remove(&pw->link);
+ free(pw->workspace);
+ free(pw);
+ }
+
+ return ws;
+}
+
+static void pw_handle_output_destroy(struct wl_listener *listener, void *data) {
+ struct pid_workspace *pw = wl_container_of(listener, pw, output_destroy);
+ pw->output = NULL;
+ wl_list_remove(&pw->output_destroy.link);
+ wl_list_init(&pw->output_destroy.link);
+}
+
+void root_record_workspace_pid(pid_t pid) {
+ wlr_log(WLR_DEBUG, "Recording workspace for process %d", pid);
+ if (!pid_workspaces.prev && !pid_workspaces.next) {
+ wl_list_init(&pid_workspaces);
+ }
+
+ struct sway_seat *seat = input_manager_current_seat(input_manager);
+ struct sway_container *ws =
+ seat_get_focus_inactive(seat, &root_container);
+ if (ws && ws->type != C_WORKSPACE) {
+ ws = container_parent(ws, C_WORKSPACE);
+ }
+ if (!ws) {
+ wlr_log(WLR_DEBUG, "Bailing out, no workspace");
+ return;
+ }
+ struct sway_container *output = ws->parent;
+ if (!output) {
+ wlr_log(WLR_DEBUG, "Bailing out, no output");
+ return;
+ }
+
+ struct timespec now;
+ clock_gettime(CLOCK_MONOTONIC, &now);
+
+ // Remove expired entries
+ static const int timeout = 60;
+ struct pid_workspace *old, *_old;
+ wl_list_for_each_safe(old, _old, &pid_workspaces, link) {
+ if (now.tv_sec - old->time_added.tv_sec >= timeout) {
+ wl_list_remove(&old->output_destroy.link);
+ wl_list_remove(&old->link);
+ free(old->workspace);
+ free(old);
+ }
+ }
+
+ struct pid_workspace *pw = calloc(1, sizeof(struct pid_workspace));
+ pw->workspace = strdup(ws->name);
+ pw->output = output;
+ pw->pid = pid;
+ memcpy(&pw->time_added, &now, sizeof(struct timespec));
+ pw->output_destroy.notify = pw_handle_output_destroy;
+ wl_signal_add(&output->sway_output->wlr_output->events.destroy,
+ &pw->output_destroy);
+ wl_list_insert(&pid_workspaces, &pw->link);
+}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 78baa70..9465b3a 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -490,7 +490,7 @@ static struct sway_container *select_workspace(struct sway_view *view) {
wl_resource_get_client(view->surface->resource);
wl_client_get_credentials(client, &pid, NULL, NULL);
#endif
- ws = workspace_for_pid(pid);
+ ws = root_workspace_for_pid(pid);
if (ws) {
return ws;
}
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 687d9c9..cc225e7 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -539,116 +539,3 @@ void workspace_detect_urgent(struct sway_container *workspace) {
container_damage_whole(workspace);
}
}
-
-struct pid_workspace {
- pid_t pid;
- char *workspace;
- struct timespec time_added;
-
- struct sway_container *output;
- struct wl_listener output_destroy;
-
- struct wl_list link;
-};
-
-static struct wl_list pid_workspaces;
-
-struct sway_container *workspace_for_pid(pid_t pid) {
- if (!pid_workspaces.prev && !pid_workspaces.next) {
- wl_list_init(&pid_workspaces);
- return NULL;
- }
-
- struct sway_container *ws = NULL;
- struct pid_workspace *pw = NULL;
-
- wlr_log(WLR_DEBUG, "Looking up workspace for pid %d", pid);
-
- do {
- struct pid_workspace *_pw = NULL;
- wl_list_for_each(_pw, &pid_workspaces, link) {
- if (pid == _pw->pid) {
- pw = _pw;
- wlr_log(WLR_DEBUG,
- "found pid_workspace for pid %d, workspace %s",
- pid, pw->workspace);
- goto found;
- }
- }
- pid = get_parent_pid(pid);
- } while (pid > 1);
-found:
-
- if (pw && pw->workspace) {
- ws = workspace_by_name(pw->workspace);
-
- if (!ws) {
- wlr_log(WLR_DEBUG,
- "Creating workspace %s for pid %d because it disappeared",
- pw->workspace, pid);
- ws = workspace_create(pw->output, pw->workspace);
- }
-
- wl_list_remove(&pw->output_destroy.link);
- wl_list_remove(&pw->link);
- free(pw->workspace);
- free(pw);
- }
-
- return ws;
-}
-
-static void pw_handle_output_destroy(struct wl_listener *listener, void *data) {
- struct pid_workspace *pw = wl_container_of(listener, pw, output_destroy);
- pw->output = NULL;
- wl_list_remove(&pw->output_destroy.link);
- wl_list_init(&pw->output_destroy.link);
-}
-
-void workspace_record_pid(pid_t pid) {
- wlr_log(WLR_DEBUG, "Recording workspace for process %d", pid);
- if (!pid_workspaces.prev && !pid_workspaces.next) {
- wl_list_init(&pid_workspaces);
- }
-
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *ws =
- seat_get_focus_inactive(seat, &root_container);
- if (ws && ws->type != C_WORKSPACE) {
- ws = container_parent(ws, C_WORKSPACE);
- }
- if (!ws) {
- wlr_log(WLR_DEBUG, "Bailing out, no workspace");
- return;
- }
- struct sway_container *output = ws->parent;
- if (!output) {
- wlr_log(WLR_DEBUG, "Bailing out, no output");
- return;
- }
-
- struct timespec now;
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- // Remove expired entries
- static const int timeout = 60;
- struct pid_workspace *old, *_old;
- wl_list_for_each_safe(old, _old, &pid_workspaces, link) {
- if (now.tv_sec - old->time_added.tv_sec >= timeout) {
- wl_list_remove(&old->output_destroy.link);
- wl_list_remove(&old->link);
- free(old->workspace);
- free(old);
- }
- }
-
- struct pid_workspace *pw = calloc(1, sizeof(struct pid_workspace));
- pw->workspace = strdup(ws->name);
- pw->output = output;
- pw->pid = pid;
- memcpy(&pw->time_added, &now, sizeof(struct timespec));
- pw->output_destroy.notify = pw_handle_output_destroy;
- wl_signal_add(&output->sway_output->wlr_output->events.destroy,
- &pw->output_destroy);
- wl_list_insert(&pid_workspaces, &pw->link);
-}