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/commands/move.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/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 59f1cf78..2e9c00f8 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -624,7 +624,7 @@ static void workspace_move_to_output(struct sway_workspace *workspace, char *ws_name = workspace_next_name(old_output->wlr_output->name); struct sway_workspace *ws = workspace_create(old_output, ws_name); free(ws_name); - seat_set_focus(seat, &ws->node); + seat_set_focus_workspace(seat, ws); } workspace_consider_destroy(new_output_old_ws); @@ -734,8 +734,9 @@ static struct cmd_results *cmd_move_in_direction( ipc_event_window(container, "move"); } - seat_set_focus(config->handler_context.seat, &new_ws->node); - seat_set_focus(config->handler_context.seat, &container->node); + // Hack to re-focus container + seat_set_focus_workspace(config->handler_context.seat, new_ws); + seat_set_focus_container(config->handler_context.seat, container); if (old_ws != new_ws) { ipc_event_workspace(old_ws, new_ws, "focus"); |