From 908095ef9a479cafaf7d815824f243b4576ff1bb Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 6 Sep 2018 19:26:56 +1000 Subject: 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. --- sway/tree/container.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/tree/container.c') 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; -- cgit v1.2.3