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

LayerSurface: minor style/naming tweaks

Browse Source 
No functional changes
This commit is contained in:
Isaac Freund 2024-07-17 11:10:02 +02:00
parent f27bbf03f1
commit 2cc1d1cef3
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
river/LayerSurface.zig
View File

@ -100,12 +100,14 @@ fn handleMap(listener: *wl.Listener(void)) void {
log.debug("layer surface '{s}' mapped", .{wlr_surface.namespace}); log.debug("layer surface '{s}' mapped", .{wlr_surface.namespace});
layer_surface.output.arrangeLayers(); layer_surface.output.arrangeLayers();
const consider = (wlr_surface.current.keyboard_interactive != .none and
(wlr_surface.current.layer == .top or wlr_surface.current.layer == .overlay)); const consider = wlr_surface.current.keyboard_interactive == .on_demand and
(wlr_surface.current.layer == .top or wlr_surface.current.layer == .overlay);
handleKeyboardInteractiveExclusive( handleKeyboardInteractiveExclusive(
layer_surface.output, layer_surface.output,
if (consider) layer_surface else null, if (consider) layer_surface else null,
); );
server.root.applyPending(); server.root.applyPending();
} }
@ -141,14 +143,14 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
} }
/// Focus topmost keyboard-interactivity-exclusive layer surface above normal /// Focus topmost keyboard-interactivity-exclusive layer surface above normal
/// content, or if none found, focus that given as `consider`. /// content, or if none found, focus the surface given as `consider`.
/// Requires a call to Root.applyPending() /// Requires a call to Root.applyPending()
fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface) void { fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface) void {
if (server.lock_manager.state != .unlocked) return; if (server.lock_manager.state != .unlocked) return;
// Find the topmost layer surface (if any) in the top or overlay layers which // Find the topmost layer surface (if any) in the top or overlay layers which
// requests exclusive keyboard interactivity. // requests exclusive keyboard interactivity.
const topmost_surface = outer: for ([_]zwlr.LayerShellV1.Layer{ .overlay, .top }) |layer| { const to_focus = outer: for ([_]zwlr.LayerShellV1.Layer{ .overlay, .top }) |layer| {
const tree = output.layerSurfaceTree(layer); const tree = output.layerSurfaceTree(layer);
// Iterate in reverse to match rendering order. // Iterate in reverse to match rendering order.
var it = tree.children.iterator(.reverse); var it = tree.children.iterator(.reverse);
@ -166,8 +168,8 @@ fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface)
} }
} else consider; } else consider;
if (topmost_surface) |surface| { if (to_focus) |s| {
assert(surface.wlr_layer_surface.current.keyboard_interactive != .none); assert(s.wlr_layer_surface.current.keyboard_interactive != .none);
} }
var it = server.input_manager.seats.first; var it = server.input_manager.seats.first;
@ -175,10 +177,10 @@ fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface)
const seat = &node.data; const seat = &node.data;
if (seat.focused_output == output) { if (seat.focused_output == output) {
if (topmost_surface) |to_focus| { if (to_focus) |s| {
// If we found a surface on the output that requires focus, grab the focus of all // If we found a surface on the output that requires focus, grab the focus of all
// seats that are focusing that output. // seats that are focusing that output.
seat.setFocusRaw(.{ .layer = to_focus }); seat.setFocusRaw(.{ .layer = s });
continue; continue;
} }
} }