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 /include | |
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 'include')
-rw-r--r-- | include/sway/input/seat.h | 6 |
1 files changed, 6 insertions, 0 deletions
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); | |||
102 | 102 | ||
103 | void seat_set_focus(struct sway_seat *seat, struct sway_node *node); | 103 | void seat_set_focus(struct sway_seat *seat, struct sway_node *node); |
104 | 104 | ||
105 | void seat_set_focus_container(struct sway_seat *seat, | ||
106 | struct sway_container *con); | ||
107 | |||
108 | void seat_set_focus_workspace(struct sway_seat *seat, | ||
109 | struct sway_workspace *ws); | ||
110 | |||
105 | void seat_set_focus_warp(struct sway_seat *seat, | 111 | void seat_set_focus_warp(struct sway_seat *seat, |
106 | struct sway_node *node, bool warp, bool notify); | 112 | struct sway_node *node, bool warp, bool notify); |
107 | 113 | ||