diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-03-14 11:43:39 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-03-14 10:03:45 -0600 |
| commit | d8f74e4706104ac751706d5071838f97e3956a5e (patch) | |
| tree | e502fbd08807d6a32b782fe48345d2cd39be56a6 /sway/tree | |
| parent | d64e8ba9469f4fa0ff693a22c88c1afa687c4c6c (diff) | |
| download | sway-d8f74e4706104ac751706d5071838f97e3956a5e.tar.xz | |
Set prev_workspace_name based off of focus
This moves setting `seat->prev_workspace_name` from `workspace_switch`
to `set_workspace`. `workspace_switch` is only called when using a
`workspace` command to change the workspace so any workspace change
based on criteria was not altering `seat->prev_workspace_name`. By
moving it to `set_workspace`, which is called by `seat_set_focus`, it
will change any time focus changes to a node on a different workspace
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/workspace.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 5e28197b..68a55e03 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -481,18 +481,6 @@ bool workspace_switch(struct sway_workspace *workspace, workspace_create(NULL, seat->prev_workspace_name); } - if (active_ws && (!seat->prev_workspace_name || - (strcmp(seat->prev_workspace_name, active_ws->name) - && active_ws != workspace))) { - free(seat->prev_workspace_name); - seat->prev_workspace_name = malloc(strlen(active_ws->name) + 1); - if (!seat->prev_workspace_name) { - sway_log(SWAY_ERROR, "Unable to allocate previous workspace name"); - return false; - } - strcpy(seat->prev_workspace_name, active_ws->name); - } - sway_log(SWAY_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name); struct sway_node *next = seat_get_focus_inactive(seat, &workspace->node); |