aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-06 19:26:56 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-06 19:26:56 +1000
commit908095ef9a479cafaf7d815824f243b4576ff1bb (patch)
tree812b58eae73d0816610e93c6595facb42b141536 /sway/tree/container.c
parentbea9f9c63fe3bd82343a2552f055162422d87d4d (diff)
Introduce seat_set_focus_container and seat_set_focus_workspace
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.
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r--sway/tree/container.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index c91b0361..50f284f4 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -871,7 +871,7 @@ void container_set_fullscreen(struct sway_container *container, bool enable) {
focus_ws = seat_get_focused_workspace(seat);
if (focus_ws) {
if (focus_ws == workspace) {
- seat_set_focus(seat, &container->node);
+ seat_set_focus_container(seat, container);
}
}
}
@@ -1159,8 +1159,8 @@ struct sway_container *container_split(struct sway_container *child,
container_add_child(cont, child);
if (set_focus) {
- seat_set_focus(seat, &cont->node);
- seat_set_focus(seat, &child->node);
+ seat_set_focus_container(seat, cont);
+ seat_set_focus_container(seat, child);
}
return cont;