steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash when killing WM with windows active

Browse source 
In commit 75308a04, I added an assertion to Output.destroy() to verify
that all of its windows had been removed already. The issue is, that
only happened when Output received a .removed event, but that never
came when killing the WM directly. Instead, I simplified the handling
for the .removed event and moved most of that into destroy().

I also changed where structs have their wl_list.link removed (to inside
of their destroys) to make it more consistent. Finally,
XkbBinding.sendWindowToOutput asserts that the current output is actually
focused. Users *should* never have a focused window if there's not also
a focused output.
This commit is contained in:
Ben Buhse 2026-04-12 10:31:45 -05:00
commit e862aca887
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
7 changed files with 56 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/XkbBindings.zig
View file

@ -120,19 +120,15 @@ const XkbBinding = struct {
pub fn destroy(xkb_binding: *XkbBinding) void {
xkb_binding.xkb_binding_v1.destroy();
xkb_binding.link.remove();
utils.gpa.destroy(xkb_binding);
}
fn xkbBindingListener(river_xkb_binding_v1: *river.XkbBindingV1, event: river.XkbBindingV1.Event, xkb_binding: *XkbBinding) void {
assert(xkb_binding.xkb_binding_v1 == river_xkb_binding_v1);
switch (event) {
.pressed => {
xkb_binding.executeCommand();
},
.released => {},
else => |ev| {
log.debug("unhandled event: {s}", .{@tagName(ev)});
},
.pressed => xkb_binding.executeCommand(),
else => {},
}
}
@ -375,20 +371,20 @@ const XkbBinding = struct {
}
}
/// This function requires that the window is currently on an output
/// AND that the output is the currently focused output on the first seat.
fn sendWindowToOutput(context: *Context, direction: FocusDirection) void {
const wm = context.wm;
const seat = wm.seats.first() orelse return;
const window = seat.focused_window orelse return;
assert(window.output == seat.focused_output);
const pending_output = if (seat.focused_output) |current|
switch (direction) {
.next => wm.nextOutput(current),
.prev => wm.prevOutput(current),
}
else switch (direction) {
.next => wm.outputs.first(),
.prev => wm.outputs.last(),
assert(window.output == seat.focused_output);
assert(seat.focused_output != null);
const current_output = seat.focused_output.?;
const pending_output = switch (direction) {
.next => wm.nextOutput(current_output),
.prev => wm.prevOutput(current_output),
};
if (pending_output) |output| blk: {