From 73594ee57c95c3fd16fb80abc7b18828d4024abb Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Fri, 1 Jan 2021 16:15:42 +0100 Subject: [PATCH] Update to wlroots master commit eb30cde --- deps/zig-wlroots | 2 +- river/Server.zig | 3 +-- river/render.zig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deps/zig-wlroots b/deps/zig-wlroots index 10ddf02b..4902876c 160000 --- a/deps/zig-wlroots +++ b/deps/zig-wlroots @@ -1 +1 @@ -Subproject commit 10ddf02b8aff37dabd07cee8695366917527676e +Subproject commit 4902876cd4f92745788ad71bd03367ff00f564b3 diff --git a/river/Server.zig b/river/Server.zig index bcebe010..a028ae6b 100644 --- a/river/Server.zig +++ b/river/Server.zig @@ -75,7 +75,7 @@ pub fn init(self: *Self) !void { errdefer self.sigterm_source.remove(); // This frees itself when the wl.Server is destroyed - self.backend = try wlr.Backend.autocreate(self.wl_server, null); + self.backend = try wlr.Backend.autocreate(self.wl_server); // This backend is used to create a noop output for use when no actual // outputs are available. This frees itself when the wl.Server is destroyed. @@ -136,7 +136,6 @@ pub fn deinit(self: *Self) void { self.root.deinit(); - self.noop_backend.destroy(); self.wl_server.destroy(); self.input_manager.deinit(); diff --git a/river/render.zig b/river/render.zig index 15cc005d..f68b9b62 100644 --- a/river/render.zig +++ b/river/render.zig @@ -53,7 +53,7 @@ pub fn renderOutput(output: *Output) void { output.wlr_output.attachRender(null) catch return; - renderer.begin(output.wlr_output.width, output.wlr_output.height); + renderer.begin(@intCast(u32, output.wlr_output.width), @intCast(u32, output.wlr_output.height)); // Find the first visible fullscreen view in the stack if there is one var it = ViewStack(View).iter(output.views.first, .forward, output.current.tags, renderFilter);