diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 19:26:56 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 19:26:56 +1000 |
commit | 908095ef9a479cafaf7d815824f243b4576ff1bb (patch) | |
tree | 812b58eae73d0816610e93c6595facb42b141536 /sway/input/seat.c | |
parent | Merge pull request #2578 from RyanDwyer/fix-binding-reload (diff) | |
download | sway-908095ef9a479cafaf7d815824f243b4576ff1bb.tar.gz sway-908095ef9a479cafaf7d815824f243b4576ff1bb.tar.zst sway-908095ef9a479cafaf7d815824f243b4576ff1bb.zip |
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/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index b1808793..7c81e9d1 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -734,6 +734,16 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { | |||
734 | seat_set_focus_warp(seat, node, true, true); | 734 | seat_set_focus_warp(seat, node, true, true); |
735 | } | 735 | } |
736 | 736 | ||
737 | void seat_set_focus_container(struct sway_seat *seat, | ||
738 | struct sway_container *con) { | ||
739 | seat_set_focus_warp(seat, con ? &con->node : NULL, true, true); | ||
740 | } | ||
741 | |||
742 | void seat_set_focus_workspace(struct sway_seat *seat, | ||
743 | struct sway_workspace *ws) { | ||
744 | seat_set_focus_warp(seat, ws ? &ws->node : NULL, true, true); | ||
745 | } | ||
746 | |||
737 | void seat_set_focus_surface(struct sway_seat *seat, | 747 | void seat_set_focus_surface(struct sway_seat *seat, |
738 | struct wlr_surface *surface, bool unfocus) { | 748 | struct wlr_surface *surface, bool unfocus) { |
739 | if (seat->focused_layer != NULL) { | 749 | if (seat->focused_layer != NULL) { |