format everything using the editorconfig rules

This commit is contained in:
Squibid 2025-10-16 11:21:14 -04:00
parent ef663730ff
commit 840196d650
Signed by: squibid
GPG key ID: BECE5684D3C4005D
3 changed files with 77 additions and 77 deletions

104
build.zig
View file

@ -3,69 +3,69 @@ const std = @import("std");
const Scanner = @import("wayland").Scanner; const Scanner = @import("wayland").Scanner;
pub fn build(b: *std.Build) void { pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
// If instead your goal is to create an executable, consider if users might // If instead your goal is to create an executable, consider if users might
// be interested in also being able to embed the core functionality of your // be interested in also being able to embed the core functionality of your
// program in their own executable in order to avoid the overhead involved in // program in their own executable in order to avoid the overhead involved in
// subprocessing your CLI tool. // subprocessing your CLI tool.
// The below is copied from tinywl // The below is copied from tinywl
// TODO: Ensure versioning is correct // TODO: Ensure versioning is correct
// TODO: Ensure paths for system protocols are correct // TODO: Ensure paths for system protocols are correct
const scanner = Scanner.create(b, .{}); const scanner = Scanner.create(b, .{});
scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml"); scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml");
scanner.addSystemProtocol("stable/tablet/tablet-v2.xml"); scanner.addSystemProtocol("stable/tablet/tablet-v2.xml");
scanner.generate("wl_compositor", 4); scanner.generate("wl_compositor", 4);
scanner.generate("wl_subcompositor", 1); scanner.generate("wl_subcompositor", 1);
scanner.generate("wl_shm", 1); scanner.generate("wl_shm", 1);
scanner.generate("wl_output", 4); scanner.generate("wl_output", 4);
scanner.generate("wl_seat", 7); scanner.generate("wl_seat", 7);
scanner.generate("wl_data_device_manager", 3); scanner.generate("wl_data_device_manager", 3);
scanner.generate("xdg_wm_base", 2); scanner.generate("xdg_wm_base", 2);
scanner.generate("zwp_tablet_manager_v2", 1); scanner.generate("zwp_tablet_manager_v2", 1);
const wayland = b.createModule(.{ .root_source_file = scanner.result }); const wayland = b.createModule(.{ .root_source_file = scanner.result });
const xkbcommon = b.dependency("xkbcommon", .{}).module("xkbcommon"); const xkbcommon = b.dependency("xkbcommon", .{}).module("xkbcommon");
const pixman = b.dependency("pixman", .{}).module("pixman"); const pixman = b.dependency("pixman", .{}).module("pixman");
const wlroots = b.dependency("wlroots", .{}).module("wlroots"); const wlroots = b.dependency("wlroots", .{}).module("wlroots");
wlroots.addImport("wayland", wayland); wlroots.addImport("wayland", wayland);
wlroots.addImport("xkbcommon", xkbcommon); wlroots.addImport("xkbcommon", xkbcommon);
wlroots.addImport("pixman", pixman); wlroots.addImport("pixman", pixman);
wlroots.resolved_target = target; wlroots.resolved_target = target;
wlroots.linkSystemLibrary("wlroots-0.19", .{}); wlroots.linkSystemLibrary("wlroots-0.19", .{});
const wwm = b.addExecutable(.{ const wwm = b.addExecutable(.{
.name = "wwm", .name = "wwm",
.root_module = b.createModule(.{ .root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"), .root_source_file = b.path("src/main.zig"),
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}), }),
}); });
wwm.linkLibC(); wwm.linkLibC();
wwm.root_module.addImport("wayland", wayland); wwm.root_module.addImport("wayland", wayland);
wwm.root_module.addImport("xkbcommon", xkbcommon); wwm.root_module.addImport("xkbcommon", xkbcommon);
wwm.root_module.addImport("wlroots", wlroots); wwm.root_module.addImport("wlroots", wlroots);
wwm.linkSystemLibrary("wayland-server"); wwm.linkSystemLibrary("wayland-server");
wwm.linkSystemLibrary("xkbcommon"); wwm.linkSystemLibrary("xkbcommon");
wwm.linkSystemLibrary("pixman-1"); wwm.linkSystemLibrary("pixman-1");
b.installArtifact(wwm); b.installArtifact(wwm);
const run_step = b.step("run", "Run the app"); const run_step = b.step("run", "Run the app");
const run_cmd = b.addRunArtifact(wwm); const run_cmd = b.addRunArtifact(wwm);
run_step.dependOn(&run_cmd.step); run_step.dependOn(&run_cmd.step);
run_cmd.step.dependOn(b.getInstallStep()); run_cmd.step.dependOn(b.getInstallStep());
if (b.args) |args| { if (b.args) |args| {
run_cmd.addArgs(args); run_cmd.addArgs(args);
} }
} }

View file

@ -3,5 +3,5 @@ const std = @import("std");
const Server = @import("server.zig").Server; const Server = @import("server.zig").Server;
pub fn main() !void { pub fn main() !void {
std.debug.print("Starting wwm"); std.debug.print("Starting wwm");
} }

View file

@ -2,38 +2,38 @@ const wl = @import("wayland").server.wl;
const wlr = @import("wlroots"); const wlr = @import("wlroots");
pub const Server = struct { pub const Server = struct {
allocator: *wlr.Allocator, allocator: *wlr.Allocator,
server: *wl.Server, server: *wl.Server,
event_loop: *wl.EventLoop, event_loop: *wl.EventLoop,
session: *wlr.Session, session: *wlr.Session,
backend: *wlr.Backend, backend: *wlr.Backend,
renderer: *wlr.Renderer, renderer: *wlr.Renderer,
compositor: *wlr.Compositor, compositor: *wlr.Compositor,
pub fn init() !Server { pub fn init() !Server {
const server = try wl.Server.create(); const server = try wl.Server.create();
const event_loop = server.getEventLoop(); const event_loop = server.getEventLoop();
var session: ?*wlr.Session = undefined; var session: ?*wlr.Session = undefined;
const backend = try wlr.Backend.autocreate(event_loop, &session); const backend = try wlr.Backend.autocreate(event_loop, &session);
const renderer = try wlr.Renderer.autocreate(backend); const renderer = try wlr.Renderer.autocreate(backend);
// Do we need to fail if session is NULL // Do we need to fail if session is NULL
return .{ return .{
.server = server, .server = server,
.event_loop = event_loop, .event_loop = event_loop,
.session = session, .session = session,
.backend = backend, .backend = backend,
.renderer = renderer, .renderer = renderer,
.allocator = try wlr.Allocator.autocreate(backend, renderer), .allocator = try wlr.Allocator.autocreate(backend, renderer),
.compositor = try wlr.Compositor.create(server, 6, renderer), .compositor = try wlr.Compositor.create(server, 6, renderer),
}; };
} }
}; };