aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/workspace.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/workspace.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/workspace.c')
-rw-r--r--sway/tree/workspace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index bb1ded22..378bfc5d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -399,7 +399,7 @@ bool workspace_switch(struct sway_workspace *workspace,
399 workspace_add_floating(workspace, floater); 399 workspace_add_floating(workspace, floater);
400 if (&floater->node == focus) { 400 if (&floater->node == focus) {
401 seat_set_focus(seat, NULL); 401 seat_set_focus(seat, NULL);
402 seat_set_focus(seat, &floater->node); 402 seat_set_focus_container(seat, floater);
403 } 403 }
404 --i; 404 --i;
405 } 405 }