Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layer-shell: fix on_demand keyboard focus

Browse Source 
Currently keyboard focus is stolen from layer surfaces with
on_demand keyboard interactivity any time Root.applyPending() is called.

This commit fixes the behavior to only steal focus when explicitly
focusing a different window/layer surface.
This commit is contained in:
Isaac Freund 2024-07-02 15:03:22 +02:00
parent ec16f1c375
commit 4232d6b99f
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
river/Seat.zig
View File

@ -165,14 +165,21 @@ pub fn focus(seat: *Seat, _target: ?*View) void {
// Views may not receive focus while locked. // Views may not receive focus while locked.
if (server.lock_manager.state != .unlocked) return; if (server.lock_manager.state != .unlocked) return;
// While a layer surface is exclusively focused, views may not receive focus // A layer surface with exclusive focus will prevent any view from gaining
// focus if it is on the top or overlay layer. Otherwise, only steal focus
// from a focused layer surface if there is an explicit target view.
if (seat.focused == .layer) { if (seat.focused == .layer) {
const wlr_layer_surface = seat.focused.layer.wlr_layer_surface; const wlr_layer_surface = seat.focused.layer.wlr_layer_surface;
assert(wlr_layer_surface.surface.mapped); assert(wlr_layer_surface.surface.mapped);
if (wlr_layer_surface.current.keyboard_interactive == .exclusive and switch (wlr_layer_surface.current.keyboard_interactive) {
(wlr_layer_surface.current.layer == .top or wlr_layer_surface.current.layer == .overlay)) .none => {},
{ .exclusive => switch (wlr_layer_surface.current.layer) {
return; .top, .overlay => return,
.bottom, .background => if (target == null) return,
_ => {},
},
.on_demand => if (target == null) return,
_ => {},
} }
} }