diff options
| author | Ryan Dwyer <[email protected]> | 2018-09-06 19:26:56 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-09-06 19:26:56 +1000 |
| commit | 908095ef9a479cafaf7d815824f243b4576ff1bb (patch) | |
| tree | 812b58eae73d0816610e93c6595facb42b141536 /sway/tree/view.c | |
| parent | bea9f9c63fe3bd82343a2552f055162422d87d4d (diff) | |
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/view.c')
| -rw-r--r-- | sway/tree/view.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index f9dcb11a..312c62d1 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -294,7 +294,7 @@ void view_request_activate(struct sway_view *view) { switch (config->focus_on_window_activation) { case FOWA_SMART: if (workspace_is_visible(ws)) { - seat_set_focus(seat, &view->container->node); + seat_set_focus_container(seat, view->container); } else { view_set_urgent(view, true); } @@ -303,7 +303,7 @@ void view_request_activate(struct sway_view *view) { view_set_urgent(view, true); break; case FOWA_FOCUS: - seat_set_focus(seat, &view->container->node); + seat_set_focus_container(seat, view->container); break; case FOWA_NONE: break; @@ -404,7 +404,7 @@ void view_execute_criteria(struct sway_view *view) { } wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'", criteria->raw, view, criteria->cmdlist); - seat_set_focus(seat, &view->container->node); + seat_set_focus_container(seat, view->container); list_add(view->executed_criteria, criteria); struct cmd_results *res = execute_command(criteria->cmdlist, NULL); if (res->status != CMD_SUCCESS) { |