mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-06-13 14:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/seat: retain focus on sticky windows during workspace switch

Browse source 
This change modifies workspace switching logic to skip unfocus/focus
events and preserve the focus stack when the currently focused window is
sticky.

It also extracts common focus stack rebuilding logic into a helper
function and fixes the iteration order to push ancestors top-down rather
than bottom-up.
This commit is contained in:
Scott Leggett 2026-05-27 00:49:46 +08:00
parent 97c342f9e1
commit 7cd2769a8e
No known key found for this signature in database
1 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

46
sway/input/seat.c
View file

@ -1127,6 +1127,28 @@ void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) {
}
}
// Rebuild the focus stack for a given container by pushing its ancestors
// and then the container itself to the top of the stack.
static void seat_rebuild_focus_stack(struct sway_seat *seat, struct sway_container *con) {
if (!con) {
return;
}
// collect ancestors of the container in order
size_t num_ancestors = 0;
struct sway_container *ancestors[64];
struct sway_container *parent = con->pending.parent;
while (parent && num_ancestors < sizeof(ancestors)/sizeof(ancestors[0])) {
ancestors[num_ancestors++] = parent;
parent = parent->pending.parent;
}
// push ancestors onto the focus stack from the top down
for (size_t i = num_ancestors; i > 0; --i) {
seat_set_raw_focus(seat, &ancestors[i - 1]->node);
}
// finally, push the container itself to the top of the focus stack
seat_set_raw_focus(seat, &con->node);
}
static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *node) {
struct sway_node *last_focus = seat_get_focus(seat);
if (last_focus == node) {
@ -1164,8 +1186,13 @@ static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *n
node_set_dirty(&new_output->node);
}
struct sway_container *last_focus_con = last_focus && last_focus->type == N_CONTAINER ?
last_focus->sway_container : NULL;
bool sticky_has_focus_on_switch = last_focus_con && container_is_sticky_or_child(last_focus_con) &&
new_workspace && last_workspace && new_workspace != last_workspace;
// Unfocus the previous focus
if (last_focus) {
if (last_focus && !sticky_has_focus_on_switch) {
seat_send_unfocus(last_focus, seat);
node_set_dirty(last_focus);
struct sway_node *parent = node_get_parent(last_focus);
@ -1176,19 +1203,18 @@ static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *n
// Put the container parents on the focus stack, then the workspace, then
// the focused container.
if (container) {
struct sway_container *parent = container->pending.parent;
while (parent) {
seat_set_raw_focus(seat, &parent->node);
parent = parent->pending.parent;
}
}
if (new_workspace) {
seat_set_raw_focus(seat, &new_workspace->node);
}
if (container) {
seat_set_raw_focus(seat, &container->node);
seat_send_focus(&container->node, seat);
seat_rebuild_focus_stack(seat, container);
if (!sticky_has_focus_on_switch) {
seat_send_focus(&container->node, seat);
}
}
if (sticky_has_focus_on_switch) {
seat_rebuild_focus_stack(seat, last_focus_con);
}
// emit ipc events