Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-17 09:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

bindings can contain directional modifiers: left_shift+a

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-08-07 14:43:44 -07:00
parent eca5955e65
commit 47bed51177
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/input/Binding.zig
View File

@ -43,18 +43,38 @@ pub fn parse(input: []const u8) !Binding {
const modsInfo = @typeInfo(key.Mods).Struct; const modsInfo = @typeInfo(key.Mods).Struct;
inline for (modsInfo.fields) |field| { inline for (modsInfo.fields) |field| {
if (field.name[0] != '_') { if (field.name[0] != '_') {
if (std.mem.eql(u8, part, field.name)) { if (std.mem.endsWith(u8, part, field.name)) {
// Parse the directional modifier if it exists
const side: key.Mods.Side = side: {
if (std.mem.eql(u8, part, field.name))
break :side .both;
if (std.mem.eql(u8, part, "left_" ++ field.name))
break :side .left;
if (std.mem.eql(u8, part, "right_" ++ field.name))
break :side .right;
return Error.InvalidFormat;
};
switch (field.type) { switch (field.type) {
bool => { bool => {
// Can only be set once
if (@field(result.mods, field.name)) if (@field(result.mods, field.name))
return Error.InvalidFormat; return Error.InvalidFormat;
// Can not be directional
if (side != .both)
return Error.InvalidFormat;
@field(result.mods, field.name) = true; @field(result.mods, field.name) = true;
}, },
key.Mods.Side => { key.Mods.Side => {
// Can only be set once
if (@field(result.mods, field.name).pressed()) if (@field(result.mods, field.name).pressed())
return Error.InvalidFormat; return Error.InvalidFormat;
@field(result.mods, field.name) = .both;
@field(result.mods, field.name) = side;
}, },
else => @compileError("invalid type"), else => @compileError("invalid type"),
@ -361,6 +381,15 @@ test "parse: triggers" {
.action = .{ .ignore = {} }, .action = .{ .ignore = {} },
}, try parse("ctrl+a=ignore")); }, try parse("ctrl+a=ignore"));
// directional modifier
try testing.expectEqual(Binding{
.trigger = .{
.mods = .{ .shift = .left },
.key = .a,
},
.action = .{ .ignore = {} },
}, try parse("left_shift+a=ignore"));
// multiple modifier // multiple modifier
try testing.expectEqual(Binding{ try testing.expectEqual(Binding{
.trigger = .{ .trigger = .{
@ -395,6 +424,9 @@ test "parse: triggers" {
// repeated control // repeated control
try testing.expectError(Error.InvalidFormat, parse("shift+shift+a=ignore")); try testing.expectError(Error.InvalidFormat, parse("shift+shift+a=ignore"));
// conflicting sides
try testing.expectError(Error.InvalidFormat, parse("left_shift+right_shift+a=ignore"));
// multiple character // multiple character
try testing.expectError(Error.InvalidFormat, parse("a+b=ignore")); try testing.expectError(Error.InvalidFormat, parse("a+b=ignore"));
} }