From c5a6c37275978ddc8c221ca73ae1a39254dd68f5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 21 Oct 2018 11:26:22 +1000 Subject: 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). --- sway/commands/move.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/commands/move.c') 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); } } -- cgit v1.2.3