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/tree/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 85afbb87..b23afb97 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -465,8 +465,8 @@ static struct sway_workspace *select_workspace(struct sway_view *view) { if (!ws) { if (strcasecmp(criteria->target, "back_and_forth") == 0) { - if (prev_workspace_name) { - ws = workspace_create(NULL, prev_workspace_name); + if (seat->prev_workspace_name) { + ws = workspace_create(NULL, seat->prev_workspace_name); } } else { ws = workspace_create(NULL, criteria->target); -- cgit v1.2.3