aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <mail@isaacfreund.com>2023-03-03 15:50:24 +0100
committerIsaac Freund <mail@isaacfreund.com>2023-03-03 15:50:24 +0100
commit8d9b6ab99e303b23af7a6ba788de8e0b8fb198a2 (patch)
tree871dbb95931594b8e6f0b2f7920f614a44088c1d
parent4a9d84bdb84ece58db756ccb00d81d684e4a3833 (diff)
downloadriver-8d9b6ab99e303b23af7a6ba788de8e0b8fb198a2.tar.gz
river-8d9b6ab99e303b23af7a6ba788de8e0b8fb198a2.tar.xz
deps: update zig-wlroots to fix Xwayland crash
m---------deps/zig-wlroots0
-rw-r--r--river/XwaylandOverrideRedirect.zig4
2 files changed, 2 insertions, 2 deletions
diff --git a/deps/zig-wlroots b/deps/zig-wlroots
-Subproject 74cde5ede96d90d994ebfda5ef03dffe7d21ffe
+Subproject f804c6d2ab1a240f7659c82325dc21ddcc6392b
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);