starting of root module refactor

This commit is contained in:
Harrison DiAmbrosio 2025-10-18 17:27:23 -04:00
parent 9cb148e3b1
commit 275f96615b
5 changed files with 121 additions and 120 deletions

View file

@ -5,60 +5,55 @@ const gpa = std.heap.c_allocator;
const wl = @import("wayland").server.wl;
const wlr = @import("wlroots");
const Server = @import("server.zig").Server;
const server = &@import("main.zig").server;
pub const Output = struct {
server: *Server,
wlr_output: *wlr.Output,
wlr_output: *wlr.Output,
scene_output: *wlr.SceneOutput,
frame: wl.Listener(*wlr.Output) = .init(handleFrame),
request_state: wl.Listener(*wlr.Output.event.RequestState) = .init(handleRequestState),
destroy: wl.Listener(*wlr.Output) = .init(handleDestroy),
frame: wl.Listener(*wlr.Output) = .init(handleFrame),
request_state: wl.Listener(*wlr.Output.event.RequestState) = .init(handleRequestState),
destroy: wl.Listener(*wlr.Output) = .init(handleDestroy),
// The wlr.Output should be destroyed by the caller on failure to trigger cleanup.
pub fn create(server: *Server, wlr_output: *wlr.Output) !void {
const output = try gpa.create(Output);
// The wlr.Output should be destroyed by the caller on failure to trigger cleanup.
pub fn create(wlr_output: *wlr.Output) !*Output {
const output = try gpa.create(Output);
output.* = .{
.server = server,
.wlr_output = wlr_output,
};
wlr_output.events.frame.add(&output.frame);
wlr_output.events.request_state.add(&output.request_state);
wlr_output.events.destroy.add(&output.destroy);
output.* = .{
.wlr_output = wlr_output,
.scene_output = try server.root.scene.createSceneOutput(wlr_output)
};
wlr_output.events.frame.add(&output.frame);
wlr_output.events.request_state.add(&output.request_state);
wlr_output.events.destroy.add(&output.destroy);
const layout_output = try server.output_layout.addAuto(wlr_output);
return output;
}
const scene_output = try server.scene.createSceneOutput(wlr_output);
server.scene_output_layout.addOutput(layout_output, scene_output);
}
pub fn handleFrame(_: *wl.Listener(*wlr.Output), wlr_output: *wlr.Output) void {
const scene_output = server.scene.getSceneOutput(wlr_output).?;
_ = scene_output.commit(null);
pub fn handleFrame(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
const output: *Output = @fieldParentPtr("frame", listener);
var now = posix.clock_gettime(posix.CLOCK.MONOTONIC) catch @panic("CLOCK_MONOTONIC not supported");
scene_output.sendFrameDone(&now);
}
const scene_output = output.server.scene.getSceneOutput(output.wlr_output).?;
_ = scene_output.commit(null);
pub fn handleRequestState(
listener: *wl.Listener(*wlr.Output.event.RequestState),
event: *wlr.Output.event.RequestState,
) void {
const output: *Output = @fieldParentPtr("request_state", listener);
var now = posix.clock_gettime(posix.CLOCK.MONOTONIC) catch @panic("CLOCK_MONOTONIC not supported");
scene_output.sendFrameDone(&now);
}
_ = output.wlr_output.commitState(event.state);
}
pub fn handleRequestState(
listener: *wl.Listener(*wlr.Output.event.RequestState),
event: *wlr.Output.event.RequestState,
) void {
const output: *Output = @fieldParentPtr("request_state", listener);
pub fn handleDestroy(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
const output: *Output = @fieldParentPtr("destroy", listener);
_ = output.wlr_output.commitState(event.state);
}
output.frame.link.remove();
output.request_state.link.remove();
output.destroy.link.remove();
pub fn handleDestroy(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
const output: *Output = @fieldParentPtr("destroy", listener);
output.frame.link.remove();
output.request_state.link.remove();
output.destroy.link.remove();
gpa.destroy(output);
}
gpa.destroy(output);
}
};