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

Move workspace pid code to root.c

Browse source
This commit is contained in:
Ryan Dwyer 2018-08-04 14:01:49 +10:00
parent 04489ff420
commit 30e7e0f7c7
6 changed files with 121 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/tree/root.h
View file

@ -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

4
include/sway/tree/workspace.h
View file

@ -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

2
sway/commands/exec_always.c
View file

@ -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");

115
sway/tree/root.c
View file

@ -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);
}

2
sway/tree/view.c
View file

@ -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;
}

113
sway/tree/workspace.c
View file

@ -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);
}