mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-18 06:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

layer_shell: Ensure keyboard exclusive clients remain focused

Browse source
This commit is contained in:
Alexander Orzechowski 2024-03-02 18:22:59 -05:00
parent 1800b1266b
commit 972fcc60df
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sway/desktop/layer_shell.c
View file

@ -233,19 +233,33 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
wlr_scene_node_reparent(&surface->scene->tree->node, output_layer); wlr_scene_node_reparent(&surface->scene->tree->node, output_layer);
} }
bool commit = false;
if (layer_surface->initial_commit || committed || layer_surface->surface->mapped != surface->mapped) { if (layer_surface->initial_commit || committed || layer_surface->surface->mapped != surface->mapped) {
surface->mapped = layer_surface->surface->mapped; surface->mapped = layer_surface->surface->mapped;
arrange_layers(surface->output); arrange_layers(surface->output);
commit = true;
}
if (layer_surface->current.keyboard_interactive ==
ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) {
struct sway_seat *seat;
wl_list_for_each(seat, &server.input->seats, link) {
seat_set_focus_layer(seat, layer_surface);
}
commit = true;
}
if (commit) {
transaction_commit_dirty(); transaction_commit_dirty();
} }
} }
static void handle_map(struct wl_listener *listener, void *data) { static void handle_map(struct wl_listener *listener, void *data) {
struct sway_layer_surface *surface = wl_container_of(listener, struct sway_layer_surface *surface = wl_container_of(listener, surface, map);
surface, map); struct wlr_layer_surface_v1 *layer_surface = surface->scene->layer_surface;
struct wlr_layer_surface_v1 *layer_surface = bool exclusive = layer_surface->current.keyboard_interactive ==
surface->scene->layer_surface; ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE;
// focus on new surface // focus on new surface
if (layer_surface->current.keyboard_interactive && if (layer_surface->current.keyboard_interactive &&
@ -254,12 +268,15 @@ static void handle_map(struct wl_listener *listener, void *data) {
struct sway_seat *seat; struct sway_seat *seat;
wl_list_for_each(seat, &server.input->seats, link) { wl_list_for_each(seat, &server.input->seats, link) {
// but only if the currently focused layer has a lower precedence // but only if the currently focused layer has a lower precedence
if (!seat->focused_layer || if (!seat->focused_layer || exclusive || (
seat->focused_layer->current.layer >= layer_surface->current.layer) { seat->focused_layer->current.keyboard_interactive !=
ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE &&
seat->focused_layer->current.layer >= layer_surface->current.layer)) {
seat_set_focus_layer(seat, layer_surface); seat_set_focus_layer(seat, layer_surface);
} }
} }
arrange_layers(surface->output); arrange_layers(surface->output);
transaction_commit_dirty();
} }
cursor_rebase_all(); cursor_rebase_all();