focus: beyond fullscreen when focused explicitly

When issuing a focus command on a specific container, users expect to
proceed it even if is hidden by a fullscreen window.

This matches the behavior of i3.
This commit is contained in:
lbonn 2021-01-20 22:20:00 +01:00 committed by Tudor Brindus
parent eea9c6331f
commit c6e7cf1ae5
4 changed files with 38 additions and 15 deletions

View file

@ -1139,26 +1139,15 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
struct sway_container *container = node->type == N_CONTAINER ?
node->sway_container : NULL;
// Deny setting focus to a view which is hidden by a fullscreen container
if (new_workspace && new_workspace->fullscreen && container &&
!container_is_fullscreen_or_child(container)) {
// Unless it's a transient container
if (!container_is_transient_for(container, new_workspace->fullscreen)) {
return;
}
// Deny setting focus to a view which is hidden by a fullscreen container or global
if (container && container_obstructing_fullscreen_container(container)) {
return;
}
// Deny setting focus to a workspace node when using fullscreen global
if (root->fullscreen_global && !container && new_workspace) {
return;
}
// Deny setting focus to a view which is hidden by a fullscreen global
if (root->fullscreen_global && container != root->fullscreen_global &&
!container_has_ancestor(container, root->fullscreen_global)) {
// Unless it's a transient container
if (!container_is_transient_for(container, root->fullscreen_global)) {
return;
}
}
struct sway_output *new_output =
new_workspace ? new_workspace->output : NULL;