diff options
author | mliszcz <liszcz.michal@gmail.com> | 2019-03-23 11:32:44 +0100 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-03-23 17:49:27 -0400 |
commit | 200833caaea36dd65324e5460520731f5c98ff8a (patch) | |
tree | c0ecf9b611435f19a62682a0ee0feb564aa29acb | |
parent | cd8b4ace926bd5a5289a5d5d6f6dddc1e4732287 (diff) |
Allow for workspace renaming during exec handling
This change adds support for renaming a workspace when `exec` command
is being processed by keeping sway_workspace and pid_workspace names in
sync.
The change can be verified by running following command:
swaymsg exec <application>; swaymsg rename workspace number 1 to 5
Fixes: #3952
-rw-r--r-- | include/sway/tree/root.h | 2 | ||||
-rw-r--r-- | sway/commands/rename.c | 4 | ||||
-rw-r--r-- | sway/tree/root.c | 14 |
3 files changed, 20 insertions, 0 deletions
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h index 9f6cd3bb..c4f84207 100644 --- a/include/sway/tree/root.h +++ b/include/sway/tree/root.h @@ -85,4 +85,6 @@ struct sway_container *root_find_container( void root_get_box(struct sway_root *root, struct wlr_box *box); +void root_rename_pid_workspaces(const char *old_name, const char *new_name); + #endif diff --git a/sway/commands/rename.c b/sway/commands/rename.c index 88377b09..3b855fdf 100644 --- a/sway/commands/rename.c +++ b/sway/commands/rename.c @@ -9,6 +9,7 @@ #include "sway/output.h" #include "sway/tree/container.h" #include "sway/tree/workspace.h" +#include "sway/tree/root.h" static const char expected_syntax[] = "Expected 'rename workspace <old_name> to <new_name>' or " @@ -89,6 +90,9 @@ struct cmd_results *cmd_rename(int argc, char **argv) { } sway_log(SWAY_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name); + + root_rename_pid_workspaces(workspace->name, new_name); + free(workspace->name); workspace->name = new_name; diff --git a/sway/tree/root.c b/sway/tree/root.c index 0744192b..5dde9f22 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -390,3 +390,17 @@ void root_get_box(struct sway_root *root, struct wlr_box *box) { box->width = root->width; box->height = root->height; } + +void root_rename_pid_workspaces(const char *old_name, const char *new_name) { + if (!pid_workspaces.prev && !pid_workspaces.next) { + wl_list_init(&pid_workspaces); + } + + struct pid_workspace *pw = NULL; + wl_list_for_each(pw, &pid_workspaces, link) { + if (strcmp(pw->workspace, old_name) == 0) { + free(pw->workspace); + pw->workspace = strdup(new_name); + } + } +} |