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

Remove zwlr_layer_shell_v1 bind

Browse source 
We don't need it anymore because everything using it has been switched
to river_shell_surfaces
This commit is contained in:
Ben Buhse 2026-03-05 20:21:02 -06:00
commit 6e85e0cffe
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
3 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Context.zig
View file

@ -16,7 +16,6 @@ wl_registry: *wl.Registry,
wl_shm: *wl.Shm, wl_shm: *wl.Shm,
river_layer_shell_v1: *river.LayerShellV1, river_layer_shell_v1: *river.LayerShellV1,
zwlr_layer_shell_v1: *zwlr.LayerShellV1,
// Wayland globals that we have special structs for // Wayland globals that we have special structs for
im: *InputManager, im: *InputManager,
@ -54,7 +53,6 @@ pub const Options = struct {
river_window_manager_v1: *river.WindowManagerV1, river_window_manager_v1: *river.WindowManagerV1,
river_xkb_bindings_v1: *river.XkbBindingsV1, river_xkb_bindings_v1: *river.XkbBindingsV1,
zwlr_layer_shell_v1: *zwlr.LayerShellV1,
config: *Config, config: *Config,
}; };
@ -83,7 +81,6 @@ pub fn create(options: Options) !*Context {
.wl_registry = options.wl_registry, .wl_registry = options.wl_registry,
.wl_shm = options.wl_shm, .wl_shm = options.wl_shm,
.river_layer_shell_v1 = options.river_layer_shell_v1, .river_layer_shell_v1 = options.river_layer_shell_v1,
.zwlr_layer_shell_v1 = options.zwlr_layer_shell_v1,
.wallpaper_image = loadWallpaperImage(options.config), .wallpaper_image = loadWallpaperImage(options.config),
.im = im, .im = im,
.wm = wm, .wm = wm,
@ -107,7 +104,6 @@ pub fn destroy(context: *Context) void {
// Destroy Wayland globals // Destroy Wayland globals
context.river_layer_shell_v1.destroy(); context.river_layer_shell_v1.destroy();
context.zwlr_layer_shell_v1.destroy();
context.wl_shm.destroy(); context.wl_shm.destroy();
context.wl_compositor.destroy(); context.wl_compositor.destroy();
context.wl_registry.destroy(); context.wl_registry.destroy();
@ -262,7 +258,6 @@ const process = std.process;
const wayland = @import("wayland"); const wayland = @import("wayland");
const river = wayland.client.river; const river = wayland.client.river;
const wl = wayland.client.wl; const wl = wayland.client.wl;
const zwlr = wayland.client.zwlr;
const utils = @import("utils.zig"); const utils = @import("utils.zig");
const Bar = @import("Bar.zig"); const Bar = @import("Bar.zig");

1
src/Output.zig
View file

@ -642,7 +642,6 @@ const DoublyLinkedList = std.DoublyLinkedList;
const wayland = @import("wayland"); const wayland = @import("wayland");
const wl = wayland.client.wl; const wl = wayland.client.wl;
const river = wayland.client.river; const river = wayland.client.river;
const zwlr = wayland.client.zwlr;
const utils = @import("utils.zig"); const utils = @import("utils.zig");
const Rect = utils.Rect; const Rect = utils.Rect;

10
src/main.zig
View file

@ -12,7 +12,6 @@ const Globals = struct {
wl_compositor: ?*wl.Compositor = null, wl_compositor: ?*wl.Compositor = null,
wl_shm: ?*wl.Shm = null, wl_shm: ?*wl.Shm = null,
zwlr_layer_shell_v1: ?*zwlr.LayerShellV1 = null,
}; };
const usage: []const u8 = const usage: []const u8 =
@ -67,8 +66,6 @@ pub fn main() !void {
const river_window_manager_v1 = globals.river_window_manager_v1 orelse utils.interfaceNotAdvertised(river.WindowManagerV1); const river_window_manager_v1 = globals.river_window_manager_v1 orelse utils.interfaceNotAdvertised(river.WindowManagerV1);
const river_xkb_bindings_v1 = globals.river_xkb_bindings_v1 orelse utils.interfaceNotAdvertised(river.XkbBindingsV1); const river_xkb_bindings_v1 = globals.river_xkb_bindings_v1 orelse utils.interfaceNotAdvertised(river.XkbBindingsV1);
const zwlr_layer_shell_v1 = globals.zwlr_layer_shell_v1 orelse utils.interfaceNotAdvertised(zwlr.LayerShellV1);
const config = try Config.create(); const config = try Config.create();
defer config.destroy(); defer config.destroy();
const context = try Context.create(.{ const context = try Context.create(.{
@ -81,7 +78,6 @@ pub fn main() !void {
.river_layer_shell_v1 = river_layer_shell_v1, .river_layer_shell_v1 = river_layer_shell_v1,
.river_window_manager_v1 = river_window_manager_v1, .river_window_manager_v1 = river_window_manager_v1,
.river_xkb_bindings_v1 = river_xkb_bindings_v1, .river_xkb_bindings_v1 = river_xkb_bindings_v1,
.zwlr_layer_shell_v1 = zwlr_layer_shell_v1,
.config = config, .config = config,
}); });
defer context.destroy(); defer context.destroy();
@ -273,11 +269,6 @@ fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, globals: *
globals.river_xkb_bindings_v1 = registry.bind(ev.name, river.XkbBindingsV1, 2) catch |e| { globals.river_xkb_bindings_v1 = registry.bind(ev.name, river.XkbBindingsV1, 2) catch |e| {
fatal("Failed to bind to river_xkb_bindings_v1: {any}", .{@errorName(e)}); fatal("Failed to bind to river_xkb_bindings_v1: {any}", .{@errorName(e)});
}; };
} else if (mem.orderZ(u8, ev.interface, zwlr.LayerShellV1.interface.name) == .eq) {
if (ev.version < 3) utils.versionNotSupported(zwlr.LayerShellV1, ev.version, 3);
globals.zwlr_layer_shell_v1 = registry.bind(ev.name, zwlr.LayerShellV1, 3) catch |e| {
fatal("Failed to bind to zwlr_layer_shell_v1: {any}", .{@errorName(e)});
};
} }
}, },
.global_remove => |_| { .global_remove => |_| {
@ -335,7 +326,6 @@ const time = std.time;
const wayland = @import("wayland"); const wayland = @import("wayland");
const river = wayland.client.river; const river = wayland.client.river;
const wl = wayland.client.wl; const wl = wayland.client.wl;
const zwlr = wayland.client.zwlr;
const fcft = @import("fcft"); const fcft = @import("fcft");
const flags = @import("flags.zig"); const flags = @import("flags.zig");