steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create utils.Rect struct for geometries

Browse source 
Also fixed a crash that I'm really not sure how I didn't have happen
before during Output.create()

Right now, only Window is updated to use Rect. I'll try updating all
instances of x,y,width,height combo to use it.
This commit is contained in:
Ben Buhse 2026-02-16 17:16:25 -06:00
commit 5333b4cbe0
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
7 changed files with 141 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/TODO.md
View file

@ -2,7 +2,6 @@
These are in rough order of my priority, though no promises I do them in this order. These are in rough order of my priority, though no promises I do them in this order.
- [ ] Make a Rect struct to combine x, y, width, and height
- [ ] Support window rules (float/tags/SSD by app-id/title) - [ ] Support window rules (float/tags/SSD by app-id/title)
- [ ] Support overriding config location - [ ] Support overriding config location
- [ ] Support configuring primary vs secondary stack side - [ ] Support configuring primary vs secondary stack side
@ -31,3 +30,4 @@ These are in rough order of my priority, though no promises I do them in this or
- [x] Implement a river-tag-overlay clone - [x] Implement a river-tag-overlay clone
- [x] Add options to the tag overlay - [x] Add options to the tag overlay
- [x] Add options to the bar - [x] Add options to the bar
- [x] Make a Rect struct to combine x, y, width, and height

3
src/Bar.zig
View file

@ -15,7 +15,7 @@ timezone: zeit.timezone.TimeZone,
options: Options, options: Options,
fcft_fonts: *fcft.Font, fcft_fonts: *fcft.Font,
font_scale: u31, font_scale: u31 = 1,
output: *Output, output: *Output,
@ -366,6 +366,7 @@ fn getFcftFonts(fonts: []const u8, scale: u31) !*fcft.Font {
while (it.next()) |font| { while (it.next()) |font| {
if (scale > 1) { if (scale > 1) {
// If scale >1, we append :dpi so we can scale the font // If scale >1, we append :dpi so we can scale the font
log.debug("bwbuhse {d} {d}", .{ base_dpi, scale });
const scaled = try arena_alloc.dupeZ( const scaled = try arena_alloc.dupeZ(
u8, u8,
try std.fmt.allocPrint(arena_alloc, "{s}:dpi={}", .{ font, @as(u32, base_dpi) * scale }), try std.fmt.allocPrint(arena_alloc, "{s}:dpi={}", .{ font, @as(u32, base_dpi) * scale }),

95
src/Output.zig
View file

@ -92,34 +92,34 @@ pub fn create(context: *Context, river_output_v1: *river.OutputV1) !*Output {
var output = try utils.gpa.create(Output); var output = try utils.gpa.create(Output);
errdefer utils.gpa.destroy(output); errdefer utils.gpa.destroy(output);
var bar = if (context.config.bar_config) |bar_config| blk: {
break :blk Bar.init(context, output, bar_config.toBarOptions()) catch |e| {
log.err("Failed to create a bar: {}", .{e});
break :blk null;
};
} else null;
errdefer if (bar) |*b| b.deinit();
var tag_overlay = if (context.config.tag_overlay_config) |tag_overlay_config| blk: {
break :blk TagOverlay.init(context, output, tag_overlay_config.toTagOverlayOptions()) catch |e| {
log.err("Failed to create a tag overlay: {}", .{e});
break :blk null;
};
} else null;
errdefer if (tag_overlay) |*to| to.deinit();
output.* = .{ output.* = .{
.context = context, .context = context,
.river_output_v1 = river_output_v1, .river_output_v1 = river_output_v1,
.river_layer_shell_output_v1 = try context.river_layer_shell_v1.getOutput(river_output_v1), .river_layer_shell_output_v1 = try context.river_layer_shell_v1.getOutput(river_output_v1),
.bar = bar, .bar = null,
.tag_overlay = tag_overlay, .tag_overlay = null,
.primary_count = context.config.primary_count, .primary_count = context.config.primary_count,
.primary_ratio = context.config.primary_ratio, .primary_ratio = context.config.primary_ratio,
.windows = undefined, // we will initialize this shortly .windows = undefined, // we will initialize this shortly
.link = undefined, // Handled by the wl.list .link = undefined, // Handled by the wl.list
}; };
output.bar = if (context.config.bar_config) |bar_config| blk: {
break :blk Bar.init(context, output, bar_config.toBarOptions()) catch |e| {
log.err("Failed to create a bar: {}", .{e});
break :blk null;
};
} else null;
errdefer if (output.bar) |*b| b.deinit();
output.tag_overlay = if (context.config.tag_overlay_config) |tag_overlay_config| blk: {
break :blk TagOverlay.init(context, output, tag_overlay_config.toTagOverlayOptions()) catch |e| {
log.err("Failed to create a tag overlay: {}", .{e});
break :blk null;
};
} else null;
errdefer if (output.tag_overlay) |*to| to.deinit();
output.windows.init(); output.windows.init();
output.river_output_v1.setListener(*Output, riverOutputListener, output); output.river_output_v1.setListener(*Output, riverOutputListener, output);
@ -666,10 +666,11 @@ fn calculatePrimaryStackLayout(output: *Output) void {
// Single window: maximize and return early // Single window: maximize and return early
if (active_count == 1) { if (active_count == 1) {
const window: *Window = @fieldParentPtr("active_list_node", active_list.popFirst().?); const window: *Window = @fieldParentPtr("active_list_node", active_list.popFirst().?);
window.pending_render.x = output_x + border_width; window.pending_render.position = .{ .x = output_x + border_width, .y = output_y + border_width };
window.pending_render.y = output_y + border_width; window.pending_manage.dimensions = .{
window.pending_manage.width = output_width - 2 * border_width; .width = output_width - 2 * border_width,
window.pending_manage.height = output_height - 2 * border_width; .height = output_height - 2 * border_width,
};
window.pending_manage.maximized = true; window.pending_manage.maximized = true;
return; return;
} }
@ -700,34 +701,44 @@ fn calculatePrimaryStackLayout(output: *Output) void {
if (i < primary_count) { if (i < primary_count) {
// Primary window(s) - right side // Primary window(s) - right side
window.pending_render.x = output_x + @as(i32, stack_width); window.pending_render.position = .{
window.pending_render.y = output_y + @as(i32, i) * @as(i32, primary_height); .x = output_x + @as(i32, stack_width),
window.pending_manage.width = primary_width; .y = output_y + @as(i32, i) * @as(i32, primary_height),
};
const pending_width = primary_width;
// Last primary window gets remaining height to avoid gaps from integer division // Last primary window gets remaining height to avoid gaps from integer division
if (i == primary_count - 1) { const pending_height = if (i == primary_count - 1)
window.pending_manage.height = output_height - i * primary_height; output_height - i * primary_height
} else { else
window.pending_manage.height = primary_height; primary_height;
} window.pending_manage.dimensions = .{
.width = pending_width,
.height = pending_height,
};
} else { } else {
// Stack window(s) - left side // Stack window(s) - left side
const stack_index = i - primary_count; const stack_index = i - primary_count;
window.pending_render.x = output_x; window.pending_render.position = .{
window.pending_render.y = output_y + @as(i32, stack_index) * @as(i32, stack_height); .x = output_x,
window.pending_manage.width = stack_width; .y = output_y + @as(i32, stack_index) * @as(i32, stack_height),
};
const pending_width = stack_width;
// Last stack window gets remaining height to avoid gaps from integer division // Last stack window gets remaining height to avoid gaps from integer division
if (stack_index == stack_count - 1) { const pending_height = if (stack_index == stack_count - 1)
window.pending_manage.height = output_height - stack_index * stack_height; output_height - stack_index * stack_height
} else { else
window.pending_manage.height = stack_height; stack_height;
} window.pending_manage.dimensions = .{
.width = pending_width,
.height = pending_height,
};
} }
// Make space for borders // Make space for borders
window.pending_manage.height.? -= 2 * border_width; window.pending_manage.dimensions.?.height -= 2 * border_width;
window.pending_manage.width.? -= 2 * border_width; window.pending_manage.dimensions.?.width -= 2 * border_width;
window.pending_render.x.? += border_width; window.pending_render.position.?.x += border_width;
window.pending_render.y.? += border_width; window.pending_render.position.?.y += border_width;
} }
// Make sure we went through the whole list // Make sure we went through the whole list

45
src/Seat.zig
View file

@ -201,8 +201,9 @@ pub fn manage(seat: *Seat) void {
// Warp pointer to center of focused window; // Warp pointer to center of focused window;
// because the x and y coords are set during render, we need to check if // because the x and y coords are set during render, we need to check if
// there are new coordinates in window.pending_render. // there are new coordinates in window.pending_render.
const pointer_x: i32 = (window.pending_render.x orelse window.x) + @divFloor(window.width, 2); const pos = window.pending_render.position;
const pointer_y: i32 = (window.pending_render.y orelse window.y) + @divFloor(window.height, 2); const pointer_x: i32 = (if (pos) |p| p.x else window.rect.x) + @divFloor(window.rect.width, 2);
const pointer_y: i32 = (if (pos) |p| p.y else window.rect.y) + @divFloor(window.rect.height, 2);
seat.river_seat_v1.pointerWarp(pointer_x, pointer_y); seat.river_seat_v1.pointerWarp(pointer_x, pointer_y);
} }
} }
@ -216,8 +217,8 @@ pub fn manage(seat: *Seat) void {
seat.pointer_op = .{ seat.pointer_op = .{
.move = .{ .move = .{
.window = window, .window = window,
.start_x = window.float_x, .start_x = window.floating_rect.x,
.start_y = window.float_y, .start_y = window.floating_rect.y,
}, },
}; };
seat.river_seat_v1.opStartPointer(); seat.river_seat_v1.opStartPointer();
@ -230,10 +231,10 @@ pub fn manage(seat: *Seat) void {
seat.pointer_op = .{ seat.pointer_op = .{
.resize = .{ .resize = .{
.window = req.window, .window = req.window,
.start_width = req.window.float_width, .start_width = req.window.floating_rect.width,
.start_height = req.window.float_height, .start_height = req.window.floating_rect.height,
.start_x = req.window.float_x, .start_x = req.window.floating_rect.x,
.start_y = req.window.float_y, .start_y = req.window.floating_rect.y,
.edges = req.edges, .edges = req.edges,
}, },
}; };
@ -247,10 +248,12 @@ pub fn manage(seat: *Seat) void {
switch (seat.pointer_op) { switch (seat.pointer_op) {
.none => {}, .none => {},
.move => |op| { .move => |op| {
op.window.float_x = op.start_x + delta.dx; op.window.floating_rect.x = op.start_x + delta.dx;
op.window.float_y = op.start_y + delta.dy; op.window.floating_rect.y = op.start_y + delta.dy;
op.window.pending_render.x = op.window.float_x; op.window.pending_render.position = .{
op.window.pending_render.y = op.window.float_y; .x = op.window.floating_rect.x,
.y = op.window.floating_rect.y,
};
}, },
.resize => |op| { .resize => |op| {
var new_width: i32 = op.start_width; var new_width: i32 = op.start_width;
@ -277,17 +280,19 @@ pub fn manage(seat: *Seat) void {
new_width = @max(new_width, min_size); new_width = @max(new_width, min_size);
new_height = @max(new_height, min_size); new_height = @max(new_height, min_size);
op.window.float_width = @intCast(new_width); op.window.floating_rect.width = @intCast(new_width);
op.window.float_height = @intCast(new_height); op.window.floating_rect.height = @intCast(new_height);
op.window.float_x = new_x; op.window.floating_rect.x = new_x;
op.window.float_y = new_y; op.window.floating_rect.y = new_y;
op.window.river_window_v1.proposeDimensions( op.window.river_window_v1.proposeDimensions(
op.window.float_width, op.window.floating_rect.width,
op.window.float_height, op.window.floating_rect.height,
); );
op.window.pending_render.x = op.window.float_x; op.window.pending_render.position = .{
op.window.pending_render.y = op.window.float_y; .x = op.window.floating_rect.x,
.y = op.window.floating_rect.y,
};
}, },
} }
} }

93
src/Window.zig
View file

@ -9,11 +9,12 @@ context: *Context,
river_window_v1: *river.WindowV1, river_window_v1: *river.WindowV1,
river_node_v1: *river.NodeV1, river_node_v1: *river.NodeV1,
// TODO: Could switch this to a Rect { x, y, width, height } rect: utils.Rect = .{
width: u31 = 0, .width = 0,
height: u31 = 0, .height = 0,
x: i32 = 0, .x = 0,
y: i32 = 0, .y = 0,
},
fullscreen: bool = false, fullscreen: bool = false,
maximized: bool = false, maximized: bool = false,
@ -22,10 +23,12 @@ tags: u32 = 0x0001,
output: ?*Output, output: ?*Output,
floating: bool = false, floating: bool = false,
float_width: u31 = 0, floating_rect: utils.Rect = .{
float_height: u31 = 0, .width = 0,
float_x: i32 = 0, .height = 0,
float_y: i32 = 0, .x = 0,
.y = 0,
},
initialized: bool = false, initialized: bool = false,
@ -41,8 +44,7 @@ active_list_node: DoublyLinkedList.Node = .{},
link: wl.list.Link, link: wl.list.Link,
pub const PendingManage = struct { pub const PendingManage = struct {
width: ?u31 = null, dimensions: ?struct { width: u31, height: u31 } = null,
height: ?u31 = null,
fullscreen: ?bool = null, fullscreen: ?bool = null,
maximized: ?bool = null, maximized: ?bool = null,
@ -59,8 +61,10 @@ pub const PendingManage = struct {
}; };
pub const PendingRender = struct { pub const PendingRender = struct {
x: ?i32 = null, position: ?struct {
y: ?i32 = null, x: i32,
y: i32,
} = null,
focused: ?bool = null, focused: ?bool = null,
@ -142,8 +146,7 @@ fn windowListener(river_window_v1: *river.WindowV1, event: river.WindowV1.Event,
.dimensions => |ev| { .dimensions => |ev| {
// Protocol guarantees that width and height are strictly greater than zero // Protocol guarantees that width and height are strictly greater than zero
assert(ev.width > 0 and ev.height > 0); assert(ev.width > 0 and ev.height > 0);
window.pending_manage.width = @intCast(ev.width); window.pending_manage.dimensions = .{ .width = @intCast(ev.width), .height = @intCast(ev.height) };
window.pending_manage.height = @intCast(ev.height);
}, },
.dimensions_hint => { .dimensions_hint => {
// TODO: Maybe could use this for floating windows // TODO: Maybe could use this for floating windows
@ -183,40 +186,37 @@ pub fn manage(window: *Window) void {
// Let the window know it isn't tiled // Let the window know it isn't tiled
river_window_v1.setTiled(.{}); river_window_v1.setTiled(.{});
if (window.float_width == 0) { if (window.floating_rect.width == 0) {
// Never floated before; use 75% of usable area, centered on output // Never floated before; use 75% of usable area, centered on output
if (window.output) |output| { if (window.output) |output| {
window.float_width = @divFloor(output.usable_width * 3, 4); window.floating_rect.width = @divFloor(output.usable_width * 3, 4);
window.float_height = @divFloor(output.usable_height * 3, 4); window.floating_rect.height = @divFloor(output.usable_height * 3, 4);
window.float_x = output.usable_x + @divFloor(output.usable_width, 2) - @divFloor(window.float_width, 2); window.floating_rect.x = output.usable_x + @divFloor(output.usable_width, 2) - @divFloor(window.floating_rect.width, 2);
window.float_y = output.usable_y + @divFloor(output.usable_height, 2) - @divFloor(window.float_height, 2); window.floating_rect.y = output.usable_y + @divFloor(output.usable_height, 2) - @divFloor(window.floating_rect.height, 2);
} else { } else {
window.float_width = window.width; window.floating_rect.width = window.rect.width;
window.float_height = window.height; window.floating_rect.height = window.rect.height;
} }
river_window_v1.proposeDimensions(window.float_width, window.float_height);
} else {
// Window has floated before; re-use its old dimensions
river_window_v1.proposeDimensions(window.float_width, window.float_height);
} }
window.pending_render.x = window.float_x; river_window_v1.proposeDimensions(window.floating_rect.width, window.floating_rect.height);
window.pending_render.y = window.float_y; window.pending_render.position = .{
.x = window.floating_rect.x,
.y = window.floating_rect.y,
};
} else { } else {
river_window_v1.setTiled(.{ .top = true, .bottom = true, .left = true, .right = true }); river_window_v1.setTiled(.{ .top = true, .bottom = true, .left = true, .right = true });
// Save floating dimensions in case the window gets floated again // Save floating dimensions in case the window gets floated again
window.float_width = window.width; window.floating_rect.width = window.rect.width;
window.float_height = window.height; window.floating_rect.height = window.rect.height;
window.float_x = window.x; window.floating_rect.x = window.rect.x;
window.float_y = window.y; window.floating_rect.y = window.rect.y;
} }
} }
// Layout (pre-computed by WindowManager.calculatePrimaryStackLayout()) // Layout (pre-computed by WindowManager.calculatePrimaryStackLayout())
if (pending_manage.width) |new_width| { if (pending_manage.dimensions) |dimensions| {
if (pending_manage.height) |new_height| { window.rect.width = dimensions.width;
window.width = new_width; window.rect.height = dimensions.height;
window.height = new_height; window.river_window_v1.proposeDimensions(dimensions.width, dimensions.height);
window.river_window_v1.proposeDimensions(new_width, new_height);
}
} }
// Fullscreen and maximize operations // Fullscreen and maximize operations
if (pending_manage.fullscreen) |fullscreen| blk: { if (pending_manage.fullscreen) |fullscreen| blk: {
@ -257,19 +257,10 @@ pub fn manage(window: *Window) void {
pub fn render(window: *Window) void { pub fn render(window: *Window) void {
defer window.pending_render = .{}; defer window.pending_render = .{};
// TODO: We probably could just move these back to pending_manage and have PendingRiver.new_coords: bool if (window.pending_render.position) |position| {
// This would also simplify the pointer warp behaviour in Seat.manage() window.rect.x = position.x;
if (window.pending_render.x) |new_x| { window.rect.y = position.y;
if (window.pending_render.y) |new_y| { window.river_node_v1.setPosition(window.rect.x, window.rect.y);
window.x = new_x;
window.y = new_y;
window.river_node_v1.setPosition(window.x, window.y);
} else {
log.err("Window.pending_render with only x set", .{});
}
} else if (window.pending_render.y) |_| {
log.err("Window.pending_render with only y set", .{});
} }
// Set borders // Set borders

25
src/XkbBindings.zig
View file

@ -341,10 +341,9 @@ const XkbBinding = struct {
const window = seat.focused_window orelse return; const window = seat.focused_window orelse return;
if (!window.floating) return; if (!window.floating) return;
window.float_x += dx; window.floating_rect.x += dx;
window.float_y += dy; window.floating_rect.y += dy;
window.pending_render.x = window.float_x; window.pending_render.position = .{ .x = window.floating_rect.x, .y = window.floating_rect.y };
window.pending_render.y = window.float_y;
context.wm.river_window_manager_v1.manageDirty(); context.wm.river_window_manager_v1.manageDirty();
} }
@ -353,13 +352,12 @@ const XkbBinding = struct {
const window = seat.focused_window orelse return; const window = seat.focused_window orelse return;
if (!window.floating) return; if (!window.floating) return;
const new_width: i32 = @as(i32, window.float_width) + dw; const new_width: i32 = @as(i32, window.floating_rect.width) + dw;
const new_height: i32 = @as(i32, window.float_height) + dh; const new_height: i32 = @as(i32, window.floating_rect.height) + dh;
window.float_width = @intCast(@max(50, new_width)); window.floating_rect.width = @intCast(@max(50, new_width));
window.float_height = @intCast(@max(50, new_height)); window.floating_rect.height = @intCast(@max(50, new_height));
window.pending_manage.width = window.float_width; window.pending_manage.dimensions = .{ .width = window.floating_rect.width, .height = window.floating_rect.height };
window.pending_manage.height = window.float_height;
context.wm.river_window_manager_v1.manageDirty(); context.wm.river_window_manager_v1.manageDirty();
} }
@ -369,10 +367,9 @@ const XkbBinding = struct {
if (!window.floating) return; if (!window.floating) return;
const output = window.output orelse return; const output = window.output orelse return;
window.float_x = output.usable_x + @divFloor(output.usable_width, 2) - @divFloor(window.float_width, 2); window.floating_rect.x = output.usable_x + @divFloor(output.usable_width, 2) - @divFloor(window.floating_rect.width, 2);
window.float_y = output.usable_y + @divFloor(output.usable_height, 2) - @divFloor(window.float_height, 2); window.floating_rect.y = output.usable_y + @divFloor(output.usable_height, 2) - @divFloor(window.floating_rect.height, 2);
window.pending_render.x = window.float_x; window.pending_render.position = .{ .x = window.floating_rect.x, .y = window.floating_rect.y };
window.pending_render.y = window.float_y;
context.wm.river_window_manager_v1.manageDirty(); context.wm.river_window_manager_v1.manageDirty();
} }

7
src/utils.zig
View file

@ -12,6 +12,13 @@ pub const RiverColor = struct {
alpha: u32, alpha: u32,
}; };
pub const Rect = struct {
width: u31,
height: u31,
x: i32,
y: i32,
};
/// Parse a color in the format 0xRRGGBB or 0xRRGGBBAA and convert it to /// Parse a color in the format 0xRRGGBB or 0xRRGGBBAA and convert it to
/// 32-bit color values (used by Window.set_borders in rwm). /// 32-bit color values (used by Window.set_borders in rwm).
pub fn parseRgba(s: []const u8) !RiverColor { pub fn parseRgba(s: []const u8) !RiverColor {