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

Working on refactoring inits

Browse source
This commit is contained in:
Ben Buhse 2026-01-26 08:50:52 -06:00
commit 87ec2d4f60
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
5 changed files with 115 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Output.zig
View file

@ -6,40 +6,50 @@ const Output = @This();
context: *Context,
output_v1: *river.OutputV1,
river_output_v1: *river.OutputV1,
width: i32 = 0,
height: i32 = 0,
x: i32 = 0,
y: i32 = 0,
tags: u32 = 0x0001,
link: wl.list.Link,
pub fn init(output: *Output, context: *Context, river_output_v1: *river.OutputV1) void {
pub fn create(context: *Context, river_output_v1: *river.OutputV1) !*Output {
var output = try utils.allocator.create(Output);
errdefer output.destroy();
output.* = .{
.context = context,
.output_v1 = river_output_v1,
.river_output_v1 = river_output_v1,
.link = undefined, // Handled by the wl.list
};
output.output_v1.setListener(*Output, outputListener, output);
output.river_output_v1.setListener(*Output, outputListener, output);
return output;
}
pub fn destroy(output: *Output) void {
output.river_output_v1.destroy();
utils.allocator.destroy(output);
}
fn outputListener(river_output_v1: *river.OutputV1, event: river.OutputV1.Event, output: *Output) void {
assert(output.output_v1 == river_output_v1);
assert(output.river_output_v1 == river_output_v1);
switch (event) {
.removed => {
river_output_v1.destroy();
utils.allocator.destroy(output);
},
.wl_output => {
// log.debug("initializing new river_output_v1 corresponding to wl_output: {d}", .{ev.name});
.removed => output.destroy(),
.wl_output => |ev| {
log.debug("initializing new river_output_v1 corresponding to wl_output: {d}", .{ev.name});
},
.dimensions => |ev| {
output.width = ev.width;
output.height = ev.height;
},
.position => |ev| {
// TODO - CONFIG: Allow setting output position (do I even need to do this?)
output.x = ev.x;
output.y = ev.y;
},