mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-13 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce seat_set_focus_container and seat_set_focus_workspace

Browse source 
These are the same as seat_set_focus, but accept a specific type rather
than using nodes. Doing this adds more typesafety and lets us avoid
using &con->node which looks a little ugly.

This fixes a crash that pretty much nobody would ever come across. If
you have a bindsym for "focus" with no arguments and run it from an
empty workspace, sway would crash because it assumes `container` is not
NULL.
This commit is contained in:
Ryan Dwyer 2018-09-06 19:26:56 +10:00
parent bea9f9c63f
commit 908095ef9a
12 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/commands/swap.c
View file

@ -52,20 +52,20 @@ static void swap_focus(struct sway_container *con1,
if (workspace_is_visible(ws2)) {
seat_set_focus_warp(seat, &con2->node, false, true);
}
seat_set_focus(seat, ws1 != ws2 ? &con2->node : &con1->node);
seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
} else if (focus == con2 && (layout1 == L_TABBED
|| layout1 == L_STACKED)) {
if (workspace_is_visible(ws1)) {
seat_set_focus_warp(seat, &con1->node, false, true);
}
seat_set_focus(seat, ws1 != ws2 ? &con1->node : &con2->node);
seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
} else if (ws1 != ws2) {
seat_set_focus(seat, focus == con1 ? &con2->node : &con1->node);
seat_set_focus_container(seat, focus == con1 ? con2 : con1);
} else {
seat_set_focus(seat, &focus->node);
seat_set_focus_container(seat, focus);
}
} else {
seat_set_focus(seat, &focus->node);
seat_set_focus_container(seat, focus);
}
}