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

xdg-toplevel: handle destroy before xdg-decoration

Browse Source
This commit is contained in:
Isaac Freund 2024-02-06 12:59:09 +01:00
parent 4685f6906d
commit 026c832ba1
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
river/XdgDecoration.zig
View File

@ -52,11 +52,7 @@ pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
xdg_toplevel.view.pending.ssd = ssd; xdg_toplevel.view.pending.ssd = ssd;
} }
fn handleDestroy( pub fn deinit(decoration: *XdgDecoration) void {
listener: *wl.Listener(*wlr.XdgToplevelDecorationV1),
_: *wlr.XdgToplevelDecorationV1,
) void {
const decoration = @fieldParentPtr(XdgDecoration, "destroy", listener);
const xdg_toplevel: *XdgToplevel = @ptrFromInt(decoration.wlr_decoration.toplevel.base.data); const xdg_toplevel: *XdgToplevel = @ptrFromInt(decoration.wlr_decoration.toplevel.base.data);
decoration.destroy.link.remove(); decoration.destroy.link.remove();
@ -66,6 +62,15 @@ fn handleDestroy(
xdg_toplevel.decoration = null; xdg_toplevel.decoration = null;
} }
fn handleDestroy(
listener: *wl.Listener(*wlr.XdgToplevelDecorationV1),
_: *wlr.XdgToplevelDecorationV1,
) void {
const decoration = @fieldParentPtr(XdgDecoration, "destroy", listener);
decoration.deinit();
}
fn handleRequestMode( fn handleRequestMode(
listener: *wl.Listener(*wlr.XdgToplevelDecorationV1), listener: *wl.Listener(*wlr.XdgToplevelDecorationV1),
_: *wlr.XdgToplevelDecorationV1, _: *wlr.XdgToplevelDecorationV1,

5
river/XdgToplevel.zig
View File

@ -193,6 +193,11 @@ pub fn destroyPopups(self: Self) void {
fn handleDestroy(listener: *wl.Listener(void)) void { fn handleDestroy(listener: *wl.Listener(void)) void {
const self = @fieldParentPtr(Self, "destroy", listener); const self = @fieldParentPtr(Self, "destroy", listener);
// This can be be non-null here if the client commits a protocol error or
// if it exits without destroying its wayland objects.
if (self.decoration) |*decoration| {
decoration.deinit();
}
assert(self.decoration == null); assert(self.decoration == null);
// Remove listeners that are active for the entire lifetime of the view // Remove listeners that are active for the entire lifetime of the view