Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps: update zig-wlroots to fix Xwayland crash

Browse Source
This commit is contained in:
Isaac Freund 2023-03-03 15:50:24 +01:00
parent 4a9d84bdb8
commit 8d9b6ab99e
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/zig-wlroots vendored

@ -1 +1 @@
Subproject commit 74cde5ede96d90d994ebfda5ef03dffe7d21ffe3 Subproject commit f804c6d2ab1a240f7659c82325dc21ddcc6392b7

4
river/XwaylandOverrideRedirect.zig
View File

@ -39,7 +39,7 @@ request_configure: wl.Listener(*wlr.XwaylandSurface.event.Configure) =
destroy: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleDestroy), destroy: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleDestroy),
map: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleMap), map: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleMap),
unmap: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleUnmap), 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) = set_override_redirect: wl.Listener(*wlr.XwaylandSurface) =
wl.Listener(*wlr.XwaylandSurface).init(handleSetOverrideRedirect), wl.Listener(*wlr.XwaylandSurface).init(handleSetOverrideRedirect),
@ -149,7 +149,7 @@ fn handleUnmap(listener: *wl.Listener(*wlr.XwaylandSurface), _: *wlr.XwaylandSur
server.root.applyPending(); 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); const self = @fieldParentPtr(Self, "set_geometry", listener);
self.surface_tree.?.node.setPosition(self.xwayland_surface.x, self.xwayland_surface.y); self.surface_tree.?.node.setPosition(self.xwayland_surface.x, self.xwayland_surface.y);