mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce seat_set_focus_container and seat_set_focus_workspace

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-09-06 19:26:56 +10:00
parent bea9f9c63f
commit 908095ef9a
12 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/floating.c
View file

@ -25,7 +25,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
// Wrap the workspace's children in a container so we can float it
container = workspace_wrap_children(workspace);
workspace->layout = L_HORIZ;
seat_set_focus(config->handler_context.seat, &container->node);
seat_set_focus_container(config->handler_context.seat, container);
}
// If the container is in a floating split container,

6
sway/commands/focus.c
View file

@ -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);
}

2
sway/commands/fullscreen.c
View file

@ -23,7 +23,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
// Wrap the workspace's children in a container so we can fullscreen it
container = workspace_wrap_children(workspace);
workspace->layout = L_HORIZ;
seat_set_focus(config->handler_context.seat, &container->node);
seat_set_focus_container(config->handler_context.seat, container);
}
bool enable = !container->is_fullscreen;

7
sway/commands/move.c
View file

@ -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");

10
sway/commands/swap.c
View file

@ -52,20 +52,20 @@ static void swap_focus(struct sway_container *con1,
if (workspace_is_visible(ws2)) {
seat_set_focus_warp(seat, &con2->node, false, true);
}
seat_set_focus(seat, ws1 != ws2 ? &con2->node : &con1->node);
seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
} else if (focus == con2 && (layout1 == L_TABBED
|| layout1 == L_STACKED)) {
if (workspace_is_visible(ws1)) {
seat_set_focus_warp(seat, &con1->node, false, true);
}
seat_set_focus(seat, ws1 != ws2 ? &con1->node : &con2->node);
seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
} else if (ws1 != ws2) {
seat_set_focus(seat, focus == con1 ? &con2->node : &con1->node);
seat_set_focus_container(seat, focus == con1 ? con2 : con1);
} else {
seat_set_focus(seat, &focus->node);
seat_set_focus_container(seat, focus);
}
} else {
seat_set_focus(seat, &focus->node);
seat_set_focus_container(seat, focus);
}
}