diff --git a/build.zig b/build.zig index ce96a72..df9b35d 100644 --- a/build.zig +++ b/build.zig @@ -3,69 +3,69 @@ const std = @import("std"); const Scanner = @import("wayland").Scanner; pub fn build(b: *std.Build) void { - const target = b.standardTargetOptions(.{}); - const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); + const optimize = b.standardOptimizeOption(.{}); - // 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 - // program in their own executable in order to avoid the overhead involved in - // subprocessing your CLI tool. + // 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 + // program in their own executable in order to avoid the overhead involved in + // subprocessing your CLI tool. - // The below is copied from tinywl - // TODO: Ensure versioning is correct - // TODO: Ensure paths for system protocols are correct + // The below is copied from tinywl + // TODO: Ensure versioning is correct + // TODO: Ensure paths for system protocols are correct - const scanner = Scanner.create(b, .{}); - scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml"); - scanner.addSystemProtocol("stable/tablet/tablet-v2.xml"); + const scanner = Scanner.create(b, .{}); + scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml"); + scanner.addSystemProtocol("stable/tablet/tablet-v2.xml"); - scanner.generate("wl_compositor", 4); - scanner.generate("wl_subcompositor", 1); - scanner.generate("wl_shm", 1); - scanner.generate("wl_output", 4); - scanner.generate("wl_seat", 7); - scanner.generate("wl_data_device_manager", 3); - scanner.generate("xdg_wm_base", 2); - scanner.generate("zwp_tablet_manager_v2", 1); + scanner.generate("wl_compositor", 4); + scanner.generate("wl_subcompositor", 1); + scanner.generate("wl_shm", 1); + scanner.generate("wl_output", 4); + scanner.generate("wl_seat", 7); + scanner.generate("wl_data_device_manager", 3); + scanner.generate("xdg_wm_base", 2); + scanner.generate("zwp_tablet_manager_v2", 1); - const wayland = b.createModule(.{ .root_source_file = scanner.result }); - const xkbcommon = b.dependency("xkbcommon", .{}).module("xkbcommon"); - const pixman = b.dependency("pixman", .{}).module("pixman"); - const wlroots = b.dependency("wlroots", .{}).module("wlroots"); + const wayland = b.createModule(.{ .root_source_file = scanner.result }); + const xkbcommon = b.dependency("xkbcommon", .{}).module("xkbcommon"); + const pixman = b.dependency("pixman", .{}).module("pixman"); + const wlroots = b.dependency("wlroots", .{}).module("wlroots"); - wlroots.addImport("wayland", wayland); - wlroots.addImport("xkbcommon", xkbcommon); - wlroots.addImport("pixman", pixman); + wlroots.addImport("wayland", wayland); + wlroots.addImport("xkbcommon", xkbcommon); + wlroots.addImport("pixman", pixman); - wlroots.resolved_target = target; - wlroots.linkSystemLibrary("wlroots-0.19", .{}); + wlroots.resolved_target = target; + wlroots.linkSystemLibrary("wlroots-0.19", .{}); - const wwm = b.addExecutable(.{ - .name = "wwm", - .root_module = b.createModule(.{ - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, - }), - }); + const wwm = b.addExecutable(.{ + .name = "wwm", + .root_module = b.createModule(.{ + .root_source_file = b.path("src/main.zig"), + .target = target, + .optimize = optimize, + }), + }); - wwm.linkLibC(); + wwm.linkLibC(); - wwm.root_module.addImport("wayland", wayland); - wwm.root_module.addImport("xkbcommon", xkbcommon); - wwm.root_module.addImport("wlroots", wlroots); + wwm.root_module.addImport("wayland", wayland); + wwm.root_module.addImport("xkbcommon", xkbcommon); + wwm.root_module.addImport("wlroots", wlroots); - wwm.linkSystemLibrary("wayland-server"); - wwm.linkSystemLibrary("xkbcommon"); - wwm.linkSystemLibrary("pixman-1"); + wwm.linkSystemLibrary("wayland-server"); + wwm.linkSystemLibrary("xkbcommon"); + wwm.linkSystemLibrary("pixman-1"); - b.installArtifact(wwm); + b.installArtifact(wwm); - const run_step = b.step("run", "Run the app"); - const run_cmd = b.addRunArtifact(wwm); - run_step.dependOn(&run_cmd.step); - run_cmd.step.dependOn(b.getInstallStep()); - if (b.args) |args| { - run_cmd.addArgs(args); - } + const run_step = b.step("run", "Run the app"); + const run_cmd = b.addRunArtifact(wwm); + run_step.dependOn(&run_cmd.step); + run_cmd.step.dependOn(b.getInstallStep()); + if (b.args) |args| { + run_cmd.addArgs(args); + } } diff --git a/src/main.zig b/src/main.zig index a7031e5..6499ced 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3,5 +3,5 @@ const std = @import("std"); const Server = @import("server.zig").Server; pub fn main() !void { - std.debug.print("Starting wwm"); + std.debug.print("Starting wwm"); } diff --git a/src/server.zig b/src/server.zig index 437b386..5414070 100644 --- a/src/server.zig +++ b/src/server.zig @@ -2,38 +2,38 @@ const wl = @import("wayland").server.wl; const wlr = @import("wlroots"); pub const Server = struct { - allocator: *wlr.Allocator, + allocator: *wlr.Allocator, - server: *wl.Server, - event_loop: *wl.EventLoop, + server: *wl.Server, + event_loop: *wl.EventLoop, - session: *wlr.Session, - backend: *wlr.Backend, - renderer: *wlr.Renderer, + session: *wlr.Session, + backend: *wlr.Backend, + renderer: *wlr.Renderer, - compositor: *wlr.Compositor, + compositor: *wlr.Compositor, - pub fn init() !Server { - const server = try wl.Server.create(); - const event_loop = server.getEventLoop(); + pub fn init() !Server { + const server = try wl.Server.create(); + const event_loop = server.getEventLoop(); - var session: ?*wlr.Session = undefined; - const backend = try wlr.Backend.autocreate(event_loop, &session); - const renderer = try wlr.Renderer.autocreate(backend); + var session: ?*wlr.Session = undefined; + const backend = try wlr.Backend.autocreate(event_loop, &session); + 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 .{ - .server = server, - .event_loop = event_loop, + return .{ + .server = server, + .event_loop = event_loop, - .session = session, - .backend = backend, - .renderer = renderer, + .session = session, + .backend = backend, + .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), + }; + } };