alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set prev_workspace_name based off of focus

Browse source 
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
This commit is contained in:
Brian Ashworth 2019-03-14 11:43:39 -04:00 committed by Drew DeVault
parent d64e8ba946
commit d8f74e4706
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/input/seat.c
View file

@ -763,6 +763,18 @@ static void set_workspace(struct sway_seat *seat,
if (seat->workspace == new_ws) { if (seat->workspace == new_ws) {
return; return;
} }
if (seat->workspace) {
free(seat->prev_workspace_name);
seat->prev_workspace_name = malloc(strlen(seat->workspace->name) + 1);
if (!seat->prev_workspace_name) {
sway_log(SWAY_ERROR, "Unable to allocate previous workspace name");
seat->prev_workspace_name = NULL;
} else {
strcpy(seat->prev_workspace_name, seat->workspace->name);
}
}
ipc_event_workspace(seat->workspace, new_ws, "focus"); ipc_event_workspace(seat->workspace, new_ws, "focus");
seat->workspace = new_ws; seat->workspace = new_ws;
} }

12
sway/tree/workspace.c
View file

@ -481,18 +481,6 @@ bool workspace_switch(struct sway_workspace *workspace,
workspace_create(NULL, seat->prev_workspace_name); 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", sway_log(SWAY_DEBUG, "Switching to workspace %p:%s",
workspace, workspace->name); workspace, workspace->name);
struct sway_node *next = seat_get_focus_inactive(seat, &workspace->node); struct sway_node *next = seat_get_focus_inactive(seat, &workspace->node);