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/tree/view.c | |
parent | Merge pull request #2901 from ianyfan/swaybar (diff) | |
download | sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.tar.gz sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.tar.zst sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.zip |
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/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { | |||
465 | 465 | ||
466 | if (!ws) { | 466 | if (!ws) { |
467 | if (strcasecmp(criteria->target, "back_and_forth") == 0) { | 467 | if (strcasecmp(criteria->target, "back_and_forth") == 0) { |
468 | if (prev_workspace_name) { | 468 | if (seat->prev_workspace_name) { |
469 | ws = workspace_create(NULL, prev_workspace_name); | 469 | ws = workspace_create(NULL, seat->prev_workspace_name); |
470 | } | 470 | } |
471 | } else { | 471 | } else { |
472 | ws = workspace_create(NULL, criteria->target); | 472 | ws = workspace_create(NULL, criteria->target); |