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. --- include/sway/input/seat.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/sway') diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 8a7e5450..b07d200d 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -102,6 +102,12 @@ void seat_configure_xcursor(struct sway_seat *seat); void seat_set_focus(struct sway_seat *seat, struct sway_node *node); +void seat_set_focus_container(struct sway_seat *seat, + struct sway_container *con); + +void seat_set_focus_workspace(struct sway_seat *seat, + struct sway_workspace *ws); + void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, bool warp, bool notify); -- cgit v1.2.3