Make workspace back_and_forth seat-specific

* When using multiple seats, each seat has its own prev_workspace_name
for the purpose of workspace back_and_forth.
* Removes prev_workspace_name global variable.
* Removes unused next_name_map function in tree/workspace.c.
* Fixes memory leak in seat_destroy (seat was not freed).

3 files changed, 11 insertions, 10 deletions

diff --git a/sway/commands/move.c b/sway/commands/move.c
index 941b284a..a5b7f661 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -429,8 +429,8 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) {
                         ws = workspace_by_name(argv[2]);
                 } else if (strcasecmp(argv[2], "back_and_forth") == 0) {
                         if (!(ws = workspace_by_name(argv[2]))) {
-                                if (prev_workspace_name) {
-                                        ws_name = strdup(prev_workspace_name);
+                                if (seat->prev_workspace_name) {
+                                        ws_name = strdup(seat->prev_workspace_name);
                                 } else {
                                         return cmd_results_new(CMD_FAILURE, "move",
                                                         "No workspace was previously active.");
@@ -455,13 +455,13 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) {
                         }
 
                         if (!no_auto_back_and_forth && config->auto_back_and_forth &&
-                                        prev_workspace_name) {
+                                        seat->prev_workspace_name) {
                                 // auto back and forth move
                                 if (old_ws && old_ws->name &&
                                                 strcmp(old_ws->name, ws_name) == 0) {
                                         // if target workspace is the current one
                                         free(ws_name);
-                                        ws_name = strdup(prev_workspace_name);
+                                        ws_name = strdup(seat->prev_workspace_name);
                                         ws = workspace_by_name(ws_name);
                                 }
                         }
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 6062724d..afe11a47 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -116,8 +116,8 @@ static void container_swap(struct sway_container *con1,
                 output_get_active_workspace(con2->workspace->output);
 
         char *stored_prev_name = NULL;
-        if (prev_workspace_name) {
-                stored_prev_name = strdup(prev_workspace_name);
+        if (seat->prev_workspace_name) {
+                stored_prev_name = strdup(seat->prev_workspace_name);
         }
 
         swap_places(con1, con2);
@@ -132,8 +132,8 @@ static void container_swap(struct sway_container *con1,
         swap_focus(con1, con2, seat, focus);
 
         if (stored_prev_name) {
-                free(prev_workspace_name);
-                prev_workspace_name = stored_prev_name;
+                free(seat->prev_workspace_name);
+                seat->prev_workspace_name = stored_prev_name;
         }
 
         if (fs1) {
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index da597f8a..745b40c7 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -142,12 +142,13 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 strcasecmp(argv[0], "current") == 0) {
                         ws = workspace_by_name(argv[0]);
                 } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
-                        if (!prev_workspace_name) {
+                        struct sway_seat *seat = config->handler_context.seat;
+                        if (!seat->prev_workspace_name) {
                                 return cmd_results_new(CMD_INVALID, "workspace",
                                                 "There is no previous workspace");
                         }
                         if (!(ws = workspace_by_name(argv[0]))) {
-                                ws = workspace_create(NULL, prev_workspace_name);
+                                ws = workspace_create(NULL, seat->prev_workspace_name);
                         }
                 } else {
                         char *name = join_args(argv, argc);