neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(keybind): add keybind mode config setting to disable default bindings

Browse source 
closes #193
This commit is contained in:
CJ van den Berg 2025-02-27 13:43:59 +01:00
parent 67f1ab1697
commit c7e41afeed
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/keybind/keybind.zig
View file

@ -173,6 +173,7 @@ const LoadError = (error{ NotFound, NotAnObject } || std.json.ParseError(std.jso
const Namespace = struct { const Namespace = struct {
name: []const u8, name: []const u8,
fallback: ?*const Namespace = null, fallback: ?*const Namespace = null,
no_defaults: bool = false,
modes: std.StringHashMapUnmanaged(BindingSet), modes: std.StringHashMapUnmanaged(BindingSet),
init_command: ?Command = null, init_command: ?Command = null,
@ -201,7 +202,7 @@ const Namespace = struct {
try self.load_settings(allocator, mode_entry.value_ptr.*); try self.load_settings(allocator, mode_entry.value_ptr.*);
} }
if (!std.mem.eql(u8, self.name, default_namespace) and self.fallback == null) if (!self.no_defaults and !std.mem.eql(u8, self.name, default_namespace) and self.fallback == null)
self.fallback = try get_or_load_namespace(default_namespace); self.fallback = try get_or_load_namespace(default_namespace);
var modes = parsed.value.object.iterator(); var modes = parsed.value.object.iterator();
@ -224,12 +225,14 @@ const Namespace = struct {
init_command: ?[]const std.json.Value = null, init_command: ?[]const std.json.Value = null,
deinit_command: ?[]const std.json.Value = null, deinit_command: ?[]const std.json.Value = null,
inherit: ?[]const u8 = null, inherit: ?[]const u8 = null,
no_defaults: ?bool = null,
}; };
const parsed = try std.json.parseFromValue(JsonSettings, allocator, settings_value, .{ const parsed = try std.json.parseFromValue(JsonSettings, allocator, settings_value, .{
.ignore_unknown_fields = true, .ignore_unknown_fields = true,
}); });
defer parsed.deinit(); defer parsed.deinit();
self.fallback = if (parsed.value.inherit) |fallback| try get_or_load_namespace(fallback) else null; self.fallback = if (parsed.value.inherit) |fallback| try get_or_load_namespace(fallback) else null;
self.no_defaults = parsed.value.no_defaults orelse false;
if (parsed.value.init_command) |cmd| self.init_command = try Command.load(allocator, cmd); if (parsed.value.init_command) |cmd| self.init_command = try Command.load(allocator, cmd);
if (parsed.value.deinit_command) |cmd| self.deinit_command = try Command.load(allocator, cmd); if (parsed.value.deinit_command) |cmd| self.deinit_command = try Command.load(allocator, cmd);
} }