diff options
| -rw-r--r-- | river/LayerSurface.zig | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/river/LayerSurface.zig b/river/LayerSurface.zig index 690be64..c7e2aef 100644 --- a/river/LayerSurface.zig +++ b/river/LayerSurface.zig @@ -166,11 +166,16 @@ fn handleKeyboardInteractiveExclusive(output: *Output) void { while (it) |node| : (it = node.next) { const seat = &node.data; - if (topmost_surface) |to_focus| { - // If we found a surface that requires focus, grab the focus of all - // seats. - seat.setFocusRaw(.{ .layer = to_focus }); - } else if (seat.focused == .layer) { + if (seat.focused_output == output) { + if (topmost_surface) |to_focus| { + // If we found a surface on the output that requires focus, grab the focus of all + // seats that are focusing that output. + seat.setFocusRaw(.{ .layer = to_focus }); + continue; + } + } + + if (seat.focused == .layer) { const current_focus = seat.focused.layer.wlr_layer_surface; // If the seat is currently focusing an unmapped layer surface or one // without keyboard interactivity, stop focusing that layer surface. |