alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

workspace_get_initial_output: handle focused layer

Browse source 
When a layer surface is focused, `seat_get_focused_workspace` will be
NULL. This changes `workspace_get_initial_output` to use output of the
focus inactive. If the focus inactive is also NULL, then either the
first output or the noop output will be used as fallbacks.
This commit is contained in:
Brian Ashworth 2019-02-10 20:12:51 -05:00 committed by emersion
parent 2540e8ea79
commit fb4f29289f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/tree/workspace.c
View file

@ -42,10 +42,16 @@ struct sway_output *workspace_get_initial_output(const char *name) {
} }
} }
} }
// Otherwise put it on the focused output // Otherwise try to put it on the focused output
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_workspace *focus = seat_get_focused_workspace(seat); struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
return focus->output; if (focus && focus->type == N_WORKSPACE) {
return focus->sway_workspace->output;
} else if (focus && focus->type == N_CONTAINER) {
return focus->sway_container->workspace->output;
}
// Fallback to the first output or noop output for headless
return root->outputs->length ? root->outputs->items[0] : root->noop_output;
} }
static void prevent_invalid_outer_gaps(struct sway_workspace *ws) { static void prevent_invalid_outer_gaps(struct sway_workspace *ws) {