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. --- sway/commands/focus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/commands/focus.c') diff --git a/sway/commands/focus.c b/sway/commands/focus.c index 58721b7e..668a0c7b 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -179,7 +179,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws, new_focus = seat_get_focus_inactive_tiling(seat, ws); } if (new_focus) { - seat_set_focus(seat, &new_focus->node); + seat_set_focus_container(seat, new_focus); } else { return cmd_results_new(CMD_FAILURE, "focus", "Failed to find a %s container in workspace", @@ -230,8 +230,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) { "Command 'focus' cannot be used above the workspace level"); } - if (argc == 0) { - seat_set_focus(seat, node); + if (argc == 0 && container) { + seat_set_focus_container(seat, container); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } -- cgit v1.2.3