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

fix(keybind): provide fallback handling for legacy terminals the don not provide shifted key info

Browse source
This commit is contained in:
CJ van den Berg 2025-01-19 14:05:36 +01:00
parent 70c4c78138
commit 7dd61c4ba5
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/renderer/vaxis/input.zig
View file

@ -116,18 +116,23 @@ pub const KeyEvent = struct {
pub fn from_message( pub fn from_message(
event_: Event, event_: Event,
keypress: Key, keypress_: Key,
keypress_shifted: Key, keypress_shifted: Key,
text: []const u8, text: []const u8,
modifiers: Mods, modifiers: Mods,
) @This() { ) @This() {
const mods = switch (keypress) { const mods_ = switch (keypress_) {
key.left_super, key.right_super => modifiers & ~mod.super, key.left_super, key.right_super => modifiers & ~mod.super,
key.left_shift, key.right_shift => modifiers & ~mod.shift, key.left_shift, key.right_shift => modifiers & ~mod.shift,
key.left_control, key.right_control => modifiers & ~mod.ctrl, key.left_control, key.right_control => modifiers & ~mod.ctrl,
key.left_alt, key.right_alt => modifiers & ~mod.alt, key.left_alt, key.right_alt => modifiers & ~mod.alt,
else => modifiers, else => modifiers,
}; };
const keypress, const mods = if (keypress_shifted == keypress_)
map_key_to_unshifed_legacy(keypress_shifted, mods_)
else
.{ keypress_, mods_ };
return .{ return .{
.event = event_, .event = event_,
.key = keypress_shifted, .key = keypress_shifted,
@ -376,3 +381,31 @@ pub fn mod_short_fmt(mods: Mods) struct {
} { } {
return .{ .modifiers = mods }; return .{ .modifiers = mods };
} }
fn map_key_to_unshifed_legacy(keypress_shifted: Key, mods: Mods) struct { Key, Mods } {
return switch (keypress_shifted) {
'A'...'Z' => .{ keypress_shifted + ('a' - 'A'), mods | mod.shift },
'!' => .{ '1', mods | mod.shift },
'@' => .{ '2', mods | mod.shift },
'#' => .{ '3', mods | mod.shift },
'$' => .{ '4', mods | mod.shift },
'%' => .{ '5', mods | mod.shift },
'^' => .{ '6', mods | mod.shift },
'&' => .{ '7', mods | mod.shift },
'*' => .{ '8', mods | mod.shift },
'(' => .{ '9', mods | mod.shift },
')' => .{ '0', mods | mod.shift },
'_' => .{ '-', mods | mod.shift },
'+' => .{ '=', mods | mod.shift },
'~' => .{ '`', mods | mod.shift },
'{' => .{ '[', mods | mod.shift },
'}' => .{ ']', mods | mod.shift },
'|' => .{ '\\', mods | mod.shift },
':' => .{ ';', mods | mod.shift },
'"' => .{ '\'', mods | mod.shift },
'<' => .{ ',', mods | mod.shift },
'>' => .{ '.', mods | mod.shift },
'?' => .{ '/', mods | mod.shift },
else => .{ keypress_shifted, mods },
};
}