aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/output.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-06 19:26:56 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-06 19:26:56 +1000
commit908095ef9a479cafaf7d815824f243b4576ff1bb (patch)
tree812b58eae73d0816610e93c6595facb42b141536 /sway/tree/output.c
parentMerge pull request #2578 from RyanDwyer/fix-binding-reload (diff)
downloadsway-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/tree/output.c')
-rw-r--r--sway/tree/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 201e767f..1976ad51 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -85,7 +85,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
85 struct sway_seat *seat = NULL; 85 struct sway_seat *seat = NULL;
86 wl_list_for_each(seat, &input_manager->seats, link) { 86 wl_list_for_each(seat, &input_manager->seats, link) {
87 if (!seat->has_focus) { 87 if (!seat->has_focus) {
88 seat_set_focus(seat, &ws->node); 88 seat_set_focus_workspace(seat, ws);
89 } 89 }
90 } 90 }
91 free(ws_name); 91 free(ws_name);