zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: add more keys to Key enum (#1262)

Browse source
This commit is contained in:
Hordur Johannsson 2024-08-31 20:24:36 +00:00 • committed by GitHub
parent cd5cad696d
commit d7d8029523
Failed to generate hash of commit
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Core.zig
View file

@ -768,7 +768,7 @@ pub const InitOptions = struct {
}; };
pub const InputState = 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); const MouseButtonSet = std.StaticBitSet(@as(u4, @intFromEnum(MouseButton.max)) + 1);
keys: KeyBitSet = KeyBitSet.initEmpty(), keys: KeyBitSet = KeyBitSet.initEmpty(),
@ -965,6 +965,12 @@ pub const Key = enum {
iso_backslash, iso_backslash,
international1, international1,
international2,
international3,
international4,
international5,
lang1,
lang2,
unknown, unknown,

12
src/core/Windows.zig
View file

@ -576,19 +576,15 @@ fn keyFromScancode(scancode: u9) Key {
0x6C => .f21, 0x6C => .f21,
0x6D => .f22, 0x6D => .f22,
0x6E => .f23, 0x6E => .f23,
//0x70 => .international2, 0x70 => .international2,
//0x73 => .international1,
//0x76 => .lang5,
0x73 => .international1, 0x73 => .international1,
0x76 => .f24, 0x76 => .f24,
//0x77 => .lang4, //0x77 => .lang4,
//0x78 => .lang3, //0x78 => .lang3,
//0x79 => .international4, 0x79 => .international4,
//0x7B => .international5, 0x7B => .international5,
//0x7D => .international3, 0x7D => .international3,
0x7E => .kp_comma, 0x7E => .kp_comma,
//0xF1 => .lang2,
//0xF2 => .lang1,
0x11C => .kp_enter, 0x11C => .kp_enter,
0x11D => .right_control, 0x11D => .right_control,
0x135 => .kp_divide, 0x135 => .kp_divide,