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

fix: don't match against legacy unshifted keys when we have extended input text

Browse source 
closes #205
This commit is contained in:
CJ van den Berg 2025-04-08 17:59:40 +02:00
parent a3a6830043
commit 875816fdfc
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,8 @@ const vaxis = @import("vaxis");
const meta = @import("std").meta; const meta = @import("std").meta;
const utf8Encode = @import("std").unicode.utf8Encode; const utf8Encode = @import("std").unicode.utf8Encode;
const utf8Decode = @import("std").unicode.utf8Decode;
const utf8ValidateSlice = @import("std").unicode.utf8ValidateSlice;
const FormatOptions = @import("std").fmt.FormatOptions; const FormatOptions = @import("std").fmt.FormatOptions;
pub const key = vaxis.Key; pub const key = vaxis.Key;
@ -74,6 +76,7 @@ pub const KeyEvent = struct {
} }
pub fn eql_unshifted(self: @This(), other: @This()) bool { pub fn eql_unshifted(self: @This(), other: @This()) bool {
if (self.text.len > 0 or other.text.len > 0) return false;
const self_mods = self.mods_no_caps(); const self_mods = self.mods_no_caps();
const other_mods = other.mods_no_caps(); const other_mods = other.mods_no_caps();
return self.key_unshifted == other.key_unshifted and self_mods == other_mods; return self.key_unshifted == other.key_unshifted and self_mods == other_mods;
@ -117,7 +120,7 @@ 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() {
@ -128,6 +131,11 @@ pub const KeyEvent = struct {
key.left_alt, key.right_alt => modifiers & ~mod.alt, key.left_alt, key.right_alt => modifiers & ~mod.alt,
else => modifiers, else => modifiers,
}; };
var keypress_shifted: Key = keypress_shifted_;
if (text.len > 0 and text.len < 5 and utf8ValidateSlice(text)) blk: {
keypress_shifted = utf8Decode(text) catch break :blk;
}
const keypress, const mods = if (keypress_shifted == keypress_) const keypress, const mods = if (keypress_shifted == keypress_)
map_key_to_unshifed_legacy(keypress_shifted, mods_) map_key_to_unshifed_legacy(keypress_shifted, mods_)
else else