mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix focus tracking when session lock is active

Browse source 
Remove the incorrect attempt to block focus changes when an input grab
is present and replace it with the same logic used for layer_shell-based
screen lockers: restore the focus after changing it.

This fixes a use-after-free of seat->workspace if outputs are destroyed
while a screen lock is enabled.
This commit is contained in:
Daniel De Graaf 2022-04-30 00:46:53 -04:00 committed by Simon Ser
parent 8f7bb145b7
commit 8aa89dc277
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/input/seat.c
View file

@ -1134,15 +1134,7 @@ void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) {
} }
} }
void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *node) {
if (seat->focused_layer) {
struct wlr_layer_surface_v1 *layer = seat->focused_layer;
seat_set_focus_layer(seat, NULL);
seat_set_focus(seat, node);
seat_set_focus_layer(seat, layer);
return;
}
struct sway_node *last_focus = seat_get_focus(seat); struct sway_node *last_focus = seat_get_focus(seat);
if (last_focus == node) { if (last_focus == node) {
return; return;
@ -1176,11 +1168,6 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
return; return;
} }
// Deny setting focus when an input grab or lockscreen is active
if (container && container->view && !seat_is_input_allowed(seat, container->view->surface)) {
return;
}
struct sway_output *new_output = struct sway_output *new_output =
new_workspace ? new_workspace->output : NULL; new_workspace ? new_workspace->output : NULL;
@ -1280,6 +1267,20 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
} }
} }
void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
if (seat->focused_layer) {
struct wlr_layer_surface_v1 *layer = seat->focused_layer;
seat_set_focus_layer(seat, NULL);
seat_set_workspace_focus(seat, node);
seat_set_focus_layer(seat, layer);
} else {
seat_set_workspace_focus(seat, node);
}
if (server.session_lock.locked) {
seat_set_focus_surface(seat, server.session_lock.focused, false);
}
}
void seat_set_focus_container(struct sway_seat *seat, void seat_set_focus_container(struct sway_seat *seat,
struct sway_container *con) { struct sway_container *con) {
seat_set_focus(seat, con ? &con->node : NULL); seat_set_focus(seat, con ? &con->node : NULL);