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

Fix sendTo{Prev,Next}Output commands

Browse source 
Before, they would try send the window to the "next" output even if
there was only one output... which really just means sending the window
to the bottom of the stack. Instead, they should be a noop.

Also fixed a bug when removing all outputs where the seat wouldn't
clear its focused output.
This commit is contained in:
Ben Buhse 2026-02-19 14:01:51 -06:00
commit 5f4d80f313
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Output.zig
View file

@ -205,8 +205,13 @@ fn riverOutputListener(river_output_v1: *river.OutputV1, event: river.OutputV1.E
if (seat.focused_output != output) break :blk; if (seat.focused_output != output) break :blk;
const next_output = wm.nextOutput(output); const next_output = wm.nextOutput(output);
if (next_output == output) break :blk; if (next_output == output or next_output == null) {
const o = next_output orelse break :blk; // This was the last output; clear focus
seat.pending_manage.output = .clear_focus;
seat.pending_manage.window = .clear_focus;
break :blk;
}
const o = next_output.?;
seat.pending_manage.output = .{ .output = o }; seat.pending_manage.output = .{ .output = o };
if (o.windows.first()) |window| { if (o.windows.first()) |window| {

3
src/XkbBindings.zig
View file

@ -333,6 +333,8 @@ const XkbBinding = struct {
}; };
if (pending_output) |output| { if (pending_output) |output| {
// This should be a noop if there's only one output
if (output != window.output) {
// We have to remove window from current output's windows list first // We have to remove window from current output's windows list first
window.link.remove(); window.link.remove();
output.windows.append(window); output.windows.append(window);
@ -342,6 +344,7 @@ const XkbBinding = struct {
window.pending_manage.pending_output = .{ .output = output }; window.pending_manage.pending_output = .{ .output = output };
} }
} }
}
fn moveFloatingWindow(context: *Context, dx: i32, dy: i32) void { fn moveFloatingWindow(context: *Context, dx: i32, dy: i32) void {
const seat = context.wm.seats.first() orelse return; const seat = context.wm.seats.first() orelse return;