diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-21 11:26:22 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-21 11:26:22 +1000 |
| commit | c5a6c37275978ddc8c221ca73ae1a39254dd68f5 (patch) | |
| tree | 2255d845647357cdbe6fdfcb1c6a40210a69ddb7 /sway/commands/workspace.c | |
| parent | 3f02218b54645a68a7496eb15b7bb16d26b75ae2 (diff) | |
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).
Diffstat (limited to 'sway/commands/workspace.c')
| -rw-r--r-- | sway/commands/workspace.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |