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 /sway/tree | |
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 'sway/tree')
-rw-r--r-- | sway/tree/container.c | 6 | ||||
-rw-r--r-- | sway/tree/output.c | 2 | ||||
-rw-r--r-- | sway/tree/view.c | 6 | ||||
-rw-r--r-- | sway/tree/workspace.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index c91b0361..50f284f4 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -871,7 +871,7 @@ void container_set_fullscreen(struct sway_container *container, bool enable) { | |||
871 | focus_ws = seat_get_focused_workspace(seat); | 871 | focus_ws = seat_get_focused_workspace(seat); |
872 | if (focus_ws) { | 872 | if (focus_ws) { |
873 | if (focus_ws == workspace) { | 873 | if (focus_ws == workspace) { |
874 | seat_set_focus(seat, &container->node); | 874 | seat_set_focus_container(seat, container); |
875 | } | 875 | } |
876 | } | 876 | } |
877 | } | 877 | } |
@@ -1159,8 +1159,8 @@ struct sway_container *container_split(struct sway_container *child, | |||
1159 | container_add_child(cont, child); | 1159 | container_add_child(cont, child); |
1160 | 1160 | ||
1161 | if (set_focus) { | 1161 | if (set_focus) { |
1162 | seat_set_focus(seat, &cont->node); | 1162 | seat_set_focus_container(seat, cont); |
1163 | seat_set_focus(seat, &child->node); | 1163 | seat_set_focus_container(seat, child); |
1164 | } | 1164 | } |
1165 | 1165 | ||
1166 | return cont; | 1166 | return cont; |
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); |
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) { | |||
294 | switch (config->focus_on_window_activation) { | 294 | switch (config->focus_on_window_activation) { |
295 | case FOWA_SMART: | 295 | case FOWA_SMART: |
296 | if (workspace_is_visible(ws)) { | 296 | if (workspace_is_visible(ws)) { |
297 | seat_set_focus(seat, &view->container->node); | 297 | seat_set_focus_container(seat, view->container); |
298 | } else { | 298 | } else { |
299 | view_set_urgent(view, true); | 299 | view_set_urgent(view, true); |
300 | } | 300 | } |
@@ -303,7 +303,7 @@ void view_request_activate(struct sway_view *view) { | |||
303 | view_set_urgent(view, true); | 303 | view_set_urgent(view, true); |
304 | break; | 304 | break; |
305 | case FOWA_FOCUS: | 305 | case FOWA_FOCUS: |
306 | seat_set_focus(seat, &view->container->node); | 306 | seat_set_focus_container(seat, view->container); |
307 | break; | 307 | break; |
308 | case FOWA_NONE: | 308 | case FOWA_NONE: |
309 | break; | 309 | break; |
@@ -404,7 +404,7 @@ void view_execute_criteria(struct sway_view *view) { | |||
404 | } | 404 | } |
405 | wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'", | 405 | wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'", |
406 | criteria->raw, view, criteria->cmdlist); | 406 | criteria->raw, view, criteria->cmdlist); |
407 | seat_set_focus(seat, &view->container->node); | 407 | seat_set_focus_container(seat, view->container); |
408 | list_add(view->executed_criteria, criteria); | 408 | list_add(view->executed_criteria, criteria); |
409 | struct cmd_results *res = execute_command(criteria->cmdlist, NULL); | 409 | struct cmd_results *res = execute_command(criteria->cmdlist, NULL); |
410 | if (res->status != CMD_SUCCESS) { | 410 | if (res->status != CMD_SUCCESS) { |
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 | } |