mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-16 06:59:49 -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

6
sway/tree/container.c
View file

@ -871,7 +871,7 @@ void container_set_fullscreen(struct sway_container *container, bool enable) {
focus_ws = seat_get_focused_workspace(seat);
if (focus_ws) {
if (focus_ws == workspace) {
seat_set_focus(seat, &container->node);
seat_set_focus_container(seat, container);
}
}
}
@ -1159,8 +1159,8 @@ struct sway_container *container_split(struct sway_container *child,
container_add_child(cont, child);
if (set_focus) {
seat_set_focus(seat, &cont->node);
seat_set_focus(seat, &child->node);
seat_set_focus_container(seat, cont);
seat_set_focus_container(seat, child);
}
return cont;

2
sway/tree/output.c
View file

@ -85,7 +85,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) {
if (!seat->has_focus) {
seat_set_focus(seat, &ws->node);
seat_set_focus_workspace(seat, ws);
}
}
free(ws_name);

6
sway/tree/view.c
View file

@ -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) {

2
sway/tree/workspace.c
View file

@ -399,7 +399,7 @@ bool workspace_switch(struct sway_workspace *workspace,
workspace_add_floating(workspace, floater);
if (&floater->node == focus) {
seat_set_focus(seat, NULL);
seat_set_focus(seat, &floater->node);
seat_set_focus_container(seat, floater);
}
--i;
}