From 602406648870fb2da6bac0a63e034f935ca1f8f2 Mon Sep 17 00:00:00 2001 From: Ben Buhse Date: Tue, 28 Apr 2026 10:50:00 -0500 Subject: [PATCH 1/2] Support layer shell exclusive areas again This re-adds support for layer-shell exclusive areas (initially removed in commit a9473204) The Beansprout bar will now render inside the non-exclusive area and the usable area for calculating the window layouts is based on the non- exclusive area minus the beansprout bar's area Implements: #13 --- src/Bar.zig | 13 ++++++++---- src/Output.zig | 56 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/Bar.zig b/src/Bar.zig index 02bfc48..99d012b 100644 --- a/src/Bar.zig +++ b/src/Bar.zig @@ -35,6 +35,8 @@ pending_manage: PendingManage = .{}, pending_render: PendingRender = .{}, const PendingManage = struct { + /// Recalculate bar geometry (size and position) on the next manage cycle + /// Set when output dimensions, position, scale, or exclusive zones change output_geometry: bool = false, }; @@ -159,7 +161,10 @@ pub fn manage(bar: *Bar) !void { const logical_font_height = @divFloor(bar.fcft_fonts.height, @as(i32, bar.font_scale)); const height: u31 = @intCast(logical_font_height + 2 * options.vertical_padding); - const width: u31 = output.geometry.width -| @as(u31, @intCast(options.margins.left + options.margins.right)); + // Use the non-exclusive area so the bar sits adjacent to any external layer shell + // surfaces rather than overlapping them. + const base = output.non_exclusive_area; + const width: u31 = @as(u31, @intCast(base.width)) -| @as(u31, @intCast(options.margins.left + options.margins.right)); if (bar.geometry.width != width or bar.geometry.height != height) { bar.geometry.width = width; @@ -171,10 +176,10 @@ pub fn manage(bar: *Bar) !void { bar.surfaces.wl_surface.setOpaqueRegion(opaque_region); } - const x = output.geometry.x + options.margins.left; + const x = base.x + options.margins.left; const y = switch (options.position) { - .top => output.geometry.y + options.margins.top, - .bottom => output.geometry.y + output.geometry.height - bar.geometry.height - options.margins.bottom, + .top => base.y + options.margins.top, + .bottom => base.y + base.height - bar.geometry.height - options.margins.bottom, }; bar.pending_render.position = .{ .x = x, .y = y }; bar.pending_render.draw = true; diff --git a/src/Output.zig b/src/Output.zig index 36ba31d..64f1ba3 100644 --- a/src/Output.zig +++ b/src/Output.zig @@ -15,15 +15,15 @@ wl_output: ?*wl.Output = null, /// Friendly name of this output name: ?[]const u8 = null, -/// Output geometry scale: u31 = 1, +/// The rect for the entire output, this includes space that's taken by widgets like bars and not +/// made available to windows. geometry: Rect = .{}, -/// Area available for window layout (output geometry minus bar space) -/// Maybe I'll re-add support for layer shell exclusive areas later, -/// but adding that makes it more work for me and I don't personally -/// know of anything that makes me want them since external bars won't -/// work with beansprout. +/// Output geometry minus layer shell exclusive zones +non_exclusive_area: Rect = .{}, + +/// Area available for window layout (non_exclusive_area minus bar space) usable_geometry: Rect = .{}, wallpaper: ?Wallpaper = null, @@ -64,6 +64,7 @@ const TagLayoutOverride = struct { const PendingManage = struct { position: ?struct { x: i32, y: i32 } = null, dimensions: ?struct { width: u31, height: u31 } = null, + non_exclusive_area: ?Rect = null, tags: ?u32 = null, primary_ratio: ?f32 = null, @@ -106,6 +107,7 @@ pub fn create(context: *Context, river_output_v1: *river.OutputV1) !*Output { output.windows.init(); output.river_output_v1.setListener(*Output, riverOutputListener, output); + output.river_layer_shell_output_v1.setListener(*Output, riverLayerShellOutputListener, output); return output; } @@ -200,8 +202,28 @@ pub fn prevWindow(output: *Output, current: *Window) ?*Window { } } -// Used for the river_output_v1 interface -fn riverOutputListener(river_output_v1: *river.OutputV1, event: river.OutputV1.Event, output: *Output) void { +fn riverLayerShellOutputListener( + _: *river.LayerShellOutputV1, + event: river.LayerShellOutputV1.Event, + output: *Output, +) void { + switch (event) { + .non_exclusive_area => |area| { + output.pending_manage.non_exclusive_area = .{ + .x = area.x, + .y = area.y, + .width = @intCast(area.width), + .height = @intCast(area.height), + }; + }, + } +} + +fn riverOutputListener( + river_output_v1: *river.OutputV1, + event: river.OutputV1.Event, + output: *Output, +) void { assert(output.river_output_v1 == river_output_v1); switch (event) { .removed => { @@ -286,7 +308,14 @@ pub fn manage(output: *Output) void { output.geometry.height = dimensions.height; } - if (output.pending_manage.position != null or output.pending_manage.dimensions != null) { + if (output.pending_manage.non_exclusive_area) |non_exclusive_area| { + output.non_exclusive_area = non_exclusive_area; + } + + if (output.pending_manage.position != null or + output.pending_manage.dimensions != null or + output.pending_manage.non_exclusive_area != null) + { if (output.wallpaper) |*wallpaper| { wallpaper.pending_render.draw = true; } @@ -391,11 +420,10 @@ pub fn manage(output: *Output) void { }; } - // Compute usable geometry from output geometry minus bar space. - // We don't use non_exclusive_area from layer shell since we don't support - // other layer shell clients with exclusive zones (layer shell clients that - // don't use exclusive areas are fine). - output.usable_geometry = output.geometry; + // Compute usable geometry starting from the non-exclusive area reported by the layer shell, + // then additionally subtract space for beansprout's own bar (which uses river shell, not layer + // shell, so it's not included in the exclusive zone calculation). + output.usable_geometry = output.non_exclusive_area; if (output.bar) |bar| { if (bar.geometry.height > 0) { const bar_height: i32 = bar.geometry.height; From b35962606dc1f67a9037b96d366325df7e285d75 Mon Sep 17 00:00:00 2001 From: Zhongheng Liu Date: Tue, 28 Apr 2026 20:40:12 +0200 Subject: [PATCH 2/2] impl autoexec support for a single script file --- src/Config.zig | 11 +++++++++++ src/main.zig | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Config.zig b/src/Config.zig index b89bfe3..2a3c023 100644 --- a/src/Config.zig +++ b/src/Config.zig @@ -16,6 +16,9 @@ border_color_focused: RiverColor = utils.parseRgbaComptime("0x89b4fa"), /// Color of unfocused windows' borders in 0xRRGGBBAA or 0xRRGGBB form border_color_unfocused: RiverColor = utils.parseRgbaComptime("0x1e1e2e"), +/// Autoexec script path +autoexec_path: ?[]const u8 = null, + /// Number of windows in the primary stack /// This is a global default, but each tagmask can have its own value primary_count: u8 = 1, @@ -70,6 +73,7 @@ pub const PrimarySide = enum { left, right }; pub const AttachMode = enum { top, bottom }; const NodeName = enum { + autoexec, attach_mode, primary_count, primary_ratio, @@ -225,6 +229,13 @@ fn load(config: *Config, reader: *Io.Reader) !void { } // Next, we have to check the specifics for the NodeName switch (name) { + .autoexec => { + const autoexec_path = node.arg(&parser, 0); + if (autoexec_path) |path| { + config.autoexec_path = utils.gpa.dupe(u8, path) catch @panic("Out of memory"); + } + logDebugSettingNode(name, autoexec_path.?); + }, .primary_count => { const count_str = utils.stripQuotes(node.arg(&parser, 0) orelse ""); // Use @max to ensure a minimum of 1 diff --git a/src/main.zig b/src/main.zig index 6da367a..db012ab 100644 --- a/src/main.zig +++ b/src/main.zig @@ -84,7 +84,12 @@ pub fn main() !void { .config = config, }); defer context.destroy(); - + if (context.config.autoexec_path) |path| { + std.log.debug("Path: {s}", .{path}); + const argv = [_][]const u8{"/bin/sh", "-c", path }; + var child = std.process.Child.init(&argv, utils.gpa); + try child.spawn(); + } try run(wl_display, context); }