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

Get tags working with actual tag-switching support

Browse source 
I added 7 new Commands to XkbKeybinds.Commands, though 3 of them don't
work yet.

The new commands that *work* are

+    set_output_tags: u32,
+    set_window_tags: u32,
+    toggle_output_tags: u32,
+    toggle_window_tags: u32,

They each take a 32-bit value as a bitmask to set (or toggle) tags.

The 3 unimplemented commands are

+    spawn_tagmask: u32,
+    focus_previous_tags,
+    send_to_previous_tags,

and they will all panic if they're used.

For now, default keybinds are hardcoded as part of WindowManager's
initializing in the first \`manage_start\` event. Multi-output support
is not added yet, so this will still all happen on a single Output.
This commit is contained in:
Ben Buhse 2026-01-26 17:44:34 -06:00
commit 9030de6b64
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
4 changed files with 83 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/XkbBindings.zig
View file

@ -8,9 +8,17 @@ pub const Command = union(enum) {
spawn: []const []const u8,
focus_next,
focus_prev,
fullscreen,
toggle_fullscreen,
close_window,
exit,
// Tag management
set_output_tags: u32,
set_window_tags: u32,
toggle_output_tags: u32,
toggle_window_tags: u32,
spawn_tagmask: u32,
focus_previous_tags,
send_to_previous_tags,
};
const XkbBinding = struct {
@ -94,7 +102,7 @@ const XkbBinding = struct {
}
// context.wm.window_manager_v1.manageDirty();
},
.fullscreen => {
.toggle_fullscreen => {
const seat = context.wm.seats.first() orelse return;
const window = seat.focused orelse return;
window.pending_manage.fullscreen = !window.fullscreen;
@ -110,6 +118,38 @@ const XkbBinding = struct {
// TODO: Disabled while I'm working with river within river :P
// _ = std.process.Child.init(&.{"killall river"}, std.heap.c_allocator);
},
.set_output_tags => |tags| {
// TODO: Support multiple outputs
const output = context.wm.outputs.first() orelse return;
output.pending_manage.tags = tags;
context.wm.river_window_manager_v1.manageDirty();
},
.set_window_tags => |tags| {
const seat = context.wm.seats.first() orelse return;
// TODO: I don't think pending_focus should ever be set at this point?
// const window = seat.pending_manage.pending_focus orelse seat.focused;
const window = seat.focused orelse return;
window.pending_manage.tags = tags;
context.wm.river_window_manager_v1.manageDirty();
},
.toggle_output_tags => |tags| {
const output = context.wm.outputs.first() orelse return;
const old_tags = output.pending_manage.tags orelse output.tags;
output.pending_manage.tags = old_tags ^ tags;
context.wm.river_window_manager_v1.manageDirty();
},
.toggle_window_tags => |tags| {
const seat = context.wm.seats.first() orelse return;
// TODO: I don't think pending_focus should ever be set at this point?
// const window = seat.pending_manage.pending_focus orelse seat.focused;
const window = seat.focused orelse return;
const old_tags = window.pending_manage.tags orelse window.tags;
window.pending_manage.tags = old_tags ^ tags;
context.wm.river_window_manager_v1.manageDirty();
},
.spawn_tagmask, .focus_previous_tags, .send_to_previous_tags => {
@panic("Unimplemented");
},
}
}
};