From d7d8029523c57f011442f9a0eca3d61425d10176 Mon Sep 17 00:00:00 2001 From: Hordur Johannsson Date: Sat, 31 Aug 2024 20:24:36 +0000 Subject: [PATCH] core: add more keys to Key enum (#1262) --- src/Core.zig | 8 +++++++- src/core/Windows.zig | 12 ++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Core.zig b/src/Core.zig index 78e4d4ba..69d2576e 100644 --- a/src/Core.zig +++ b/src/Core.zig @@ -768,7 +768,7 @@ pub const InitOptions = struct { }; pub const InputState = struct { - const KeyBitSet = std.StaticBitSet(@intFromEnum(Key.max) + 1); + const KeyBitSet = std.StaticBitSet(@as(u8, @intFromEnum(Key.max)) + 1); const MouseButtonSet = std.StaticBitSet(@as(u4, @intFromEnum(MouseButton.max)) + 1); keys: KeyBitSet = KeyBitSet.initEmpty(), @@ -965,6 +965,12 @@ pub const Key = enum { iso_backslash, international1, + international2, + international3, + international4, + international5, + lang1, + lang2, unknown, diff --git a/src/core/Windows.zig b/src/core/Windows.zig index d22ccfea..c1ab8671 100644 --- a/src/core/Windows.zig +++ b/src/core/Windows.zig @@ -576,19 +576,15 @@ fn keyFromScancode(scancode: u9) Key { 0x6C => .f21, 0x6D => .f22, 0x6E => .f23, - //0x70 => .international2, - //0x73 => .international1, - //0x76 => .lang5, + 0x70 => .international2, 0x73 => .international1, 0x76 => .f24, //0x77 => .lang4, //0x78 => .lang3, - //0x79 => .international4, - //0x7B => .international5, - //0x7D => .international3, + 0x79 => .international4, + 0x7B => .international5, + 0x7D => .international3, 0x7E => .kp_comma, - //0xF1 => .lang2, - //0xF2 => .lang1, 0x11C => .kp_enter, 0x11D => .right_control, 0x135 => .kp_divide,