git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commit88ced8596455b873e836bd6d7619fa7e00afef8b
parent6bee9b324d
authorIsaac Freund <[email protected]>
date2023-03-03 15:50
deps: update zig-wlroots to fix Xwayland crash

 deps/zig-wlroots                   | 2 +-
 river/XwaylandOverrideRedirect.zig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/zig-wlroots b/deps/zig-wlroots
index 74cde5e..f804c6d 160000
--- a/deps/zig-wlroots
+++ b/deps/zig-wlroots
@@ -1 +1 @@
-Subproject commit 74cde5ede96d90d994ebfda5ef03dffe7d21ffe3
+Subproject commit f804c6d2ab1a240f7659c82325dc21ddcc6392b7
diff --git a/river/XwaylandOverrideRedirect.zig b/river/XwaylandOverrideRedirect.zig
index cb0686a..8a8147b 100644
--- a/river/XwaylandOverrideRedirect.zig
+++ b/river/XwaylandOverrideRedirect.zig
@@ -39,7 +39,7 @@ request_configure: wl.Listener(*wlr.XwaylandSurface.event.Configure) =
 destroy: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleDestroy),
 map: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleMap),
 unmap: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleUnmap),
-set_geometry: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleSetGeometry),
+set_geometry: wl.Listener(void) = wl.Listener(void).init(handleSetGeometry),
 set_override_redirect: wl.Listener(*wlr.XwaylandSurface) =
     wl.Listener(*wlr.XwaylandSurface).init(handleSetOverrideRedirect),
 
@@ -149,7 +149,7 @@ fn handleUnmap(listener: *wl.Listener(*wlr.XwaylandSurface), _: *wlr.XwaylandSur
     server.root.applyPending();
 }
 
-fn handleSetGeometry(listener: *wl.Listener(*wlr.XwaylandSurface), _: *wlr.XwaylandSurface) void {
+fn handleSetGeometry(listener: *wl.Listener(void)) void {
     const self = @fieldParentPtr(Self, "set_geometry", listener);
 
     self.surface_tree.?.node.setPosition(self.xwayland_surface.x, self.xwayland_surface.y);