MezzalunaWM/Mezzaluna
1
0
Fork 0
mirror of https://github.com/MezzalunaWM/Mezzaluna.git synced 2026-03-08 20:57:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

viewById works again, layer still ontop of other things

Browse source
This commit is contained in:
Harrison DiAmbrosio 2025-12-04 23:50:39 -05:00
parent 3ccf47e0be
commit 9186aeecd3
23 changed files with 282 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

136
src/output.zig
View file

@ -1,136 +0,0 @@
const Output = @This();
const wl = @import("wayland").server.wl;
const wlr = @import("wlroots");
const std = @import("std");
const Server = @import("server.zig");
const Utils = @import("utils.zig");
const posix = std.posix;
const gpa = std.heap.c_allocator;
const server = &@import("main.zig").server;
focused: bool,
id: u64,
wlr_output: *wlr.Output,
state: wlr.Output.State,
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),
// The wlr.Output should be destroyed by the caller on failure to trigger cleanup.
pub fn init(wlr_output: *wlr.Output) ?*Output {
errdefer Utils.oomPanic();
const self = try gpa.create(Output);
self.* = .{
.focused = false,
.id = @intFromPtr(wlr_output),
.wlr_output = wlr_output,
.scene_output = try server.root.scene.createSceneOutput(wlr_output),
.state = wlr.Output.State.init()
};
wlr_output.events.frame.add(&self.frame);
wlr_output.events.request_state.add(&self.request_state);
wlr_output.events.destroy.add(&self.destroy);
errdefer deinit(self);
if(!wlr_output.initRender(server.allocator, server.renderer)) {
std.log.err("Unable to start output {s}", .{wlr_output.name});
return null;
}
self.state.setEnabled(true);
if (wlr_output.preferredMode()) |mode| {
self.state.setMode(mode);
}
if(!wlr_output.commitState(&self.state)) {
std.log.err("Unable to commit state to output {s}", .{wlr_output.name});
return null;
}
const layout_output = try server.root.output_layout.addAuto(self.wlr_output);
server.root.scene_output_layout.addOutput(layout_output, self.scene_output);
self.setFocused();
wlr_output.data = self;
return self;
}
pub fn deinit(self: *Output) void {
self.frame.link.remove();
self.request_state.link.remove();
self.destroy.link.remove();
self.state.finish();
self.wlr_output.destroy();
gpa.destroy(self);
}
pub fn setFocused(self: *Output) void {
if(server.seat.focused_output) |prev_output| {
prev_output.focused = false;
}
server.seat.focused_output = self;
self.focused = true;
}
// --------- WlrOutput Event Handlers ---------
fn handleRequestState(
listener: *wl.Listener(*wlr.Output.event.RequestState),
event: *wlr.Output.event.RequestState,
) void {
const output: *Output = @fieldParentPtr("request_state", listener);
if (!output.wlr_output.commitState(event.state)) {
std.log.warn("failed to set output state {}", .{event.state});
}
}
fn handleFrame(
_: *wl.Listener(*wlr.Output),
wlr_output: *wlr.Output
) void {
const scene_output = server.root.scene.getSceneOutput(wlr_output);
if(scene_output == null) {
std.log.err("Unable to get scene output to render", .{});
return;
}
// std.log.info("Rendering commited scene output\n", .{});
_ = scene_output.?.commit(null);
var now = posix.clock_gettime(posix.CLOCK.MONOTONIC) catch @panic("CLOCK_MONOTONIC not supported");
scene_output.?.sendFrameDone(&now);
}
fn handleDestroy(
listener: *wl.Listener(*wlr.Output),
_: *wlr.Output
) void {
std.log.debug("Handling destroy", .{});
const output: *Output = @fieldParentPtr("destroy", listener);
std.log.debug("removing output: {s}", .{output.wlr_output.name});
output.frame.link.remove();
output.request_state.link.remove();
output.destroy.link.remove();
server.root.output_layout.remove(output.wlr_output);
gpa.destroy(output);
}