Skip to content

Commit 66f5539

Browse files
ColleagueRileyColleagueRiley
committed
revert keycode enums
1 parent 8b65938 commit 66f5539

File tree

1 file changed

+103
-103
lines changed

1 file changed

+103
-103
lines changed

‎RGFW.h‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -6306,8 +6306,8 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
63066306

63076307
if (msg.wParam == VK_CONTROL) {
63086308
if (HIWORD(msg.lParam) & KF_EXTENDED)
6309-
win->event.key = RGFW_keyControlR;
6310-
else win->event.key = RGFW_keyControlL;
6309+
win->event.key = RGFW_controlR;
6310+
else win->event.key = RGFW_controlL;
63116311
}
63126312

63136313
wchar_t charBuffer;
@@ -6340,8 +6340,8 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
63406340

63416341
if (msg.wParam == VK_CONTROL) {
63426342
if (HIWORD(msg.lParam) & KF_EXTENDED)
6343-
win->event.key = RGFW_keyControlR;
6344-
else win->event.key = RGFW_keyControlL;
6343+
win->event.key = RGFW_controlR;
6344+
else win->event.key = RGFW_controlL;
63456345
}
63466346

63476347
wchar_t charBuffer;
@@ -8423,16 +8423,16 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
84238423
((flags & NSEventModifierFlagShift) % 255), ((flags & NSEventModifierFlagCommand) % 255));
84248424
u8 i;
84258425
for (i = 0; i < 9; i++)
8426-
RGFW_keyboard[i + RGFW_keyCapsLock].prev = 0;
8426+
RGFW_keyboard[i + RGFW_capsLock].prev = 0;
84278427

84288428
for (i = 0; i < 5; i++) {
84298429
u32 shift = (1 << (i + 16));
8430-
u32 key = i + RGFW_keyCapsLock;
8430+
u32 key = i + RGFW_capsLock;
84318431

84328432
if ((flags & shift) && !RGFW_wasPressed(win, key)) {
84338433
RGFW_keyboard[key].current = 1;
84348434

8435-
if (key != RGFW_keyCapsLock)
8435+
if (key != RGFW_capsLock)
84368436
RGFW_keyboard[key+ 4].current = 1;
84378437

84388438
win->event.type = RGFW_keyPressed;
@@ -8443,7 +8443,7 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
84438443
if (!(flags & shift) && RGFW_wasPressed(win, key)) {
84448444
RGFW_keyboard[key].current = 0;
84458445

8446-
if (key != RGFW_keyCapsLock)
8446+
if (key != RGFW_capsLock)
84478447
RGFW_keyboard[key + 4].current = 0;
84488448

84498449
win->event.type = RGFW_keyReleased;
@@ -9252,101 +9252,101 @@ EM_BOOL Emscripten_on_gamepad(int eventType, const EmscriptenGamepadEvent *gamep
92529252
u32 RGFW_webasmPhysicalToRGFW(u32 hash) {
92539253
switch(hash) { /* 0x0000 */
92549254
case 0x67243A2DU /* Escape */: return RGFW_escape; /* 0x0001 */
9255-
case 0x67251058U /* Digit0 */: return RGFW_key0; /* 0x0002 */
9256-
case 0x67251059U /* Digit1 */: return RGFW_key1; /* 0x0003 */
9257-
case 0x6725105AU /* Digit2 */: return RGFW_key2; /* 0x0004 */
9258-
case 0x6725105BU /* Digit3 */: return RGFW_key3; /* 0x0005 */
9259-
case 0x6725105CU /* Digit4 */: return RGFW_key4; /* 0x0006 */
9260-
case 0x6725105DU /* Digit5 */: return RGFW_key5; /* 0x0007 */
9261-
case 0x6725105EU /* Digit6 */: return RGFW_key6; /* 0x0008 */
9262-
case 0x6725105FU /* Digit7 */: return RGFW_key7; /* 0x0009 */
9263-
case 0x67251050U /* Digit8 */: return RGFW_key8; /* 0x000A */
9264-
case 0x67251051U /* Digit9 */: return RGFW_key9; /* 0x000B */
9265-
case 0x92E14DD3U /* Minus */: return RGFW_keyMinus; /* 0x000C */
9266-
case 0x92E1FBACU /* Equal */: return RGFW_keyEquals; /* 0x000D */
9267-
case 0x36BF1CB5U /* Backspace */: return RGFW_keyBackSpace; /* 0x000E */
9268-
case 0x7B8E51E2U /* Tab */: return RGFW_keyTab; /* 0x000F */
9269-
case 0x2C595B51U /* KeyQ */: return RGFW_keyQ; /* 0x0010 */
9270-
case 0x2C595B57U /* KeyW */: return RGFW_keyW; /* 0x0011 */
9271-
case 0x2C595B45U /* KeyE */: return RGFW_keyE; /* 0x0012 */
9272-
case 0x2C595B52U /* KeyR */: return RGFW_keyR; /* 0x0013 */
9273-
case 0x2C595B54U /* KeyT */: return RGFW_keyT; /* 0x0014 */
9274-
case 0x2C595B59U /* KeyY */: return RGFW_keyY; /* 0x0015 */
9275-
case 0x2C595B55U /* KeyU */: return RGFW_keyU; /* 0x0016 */
9276-
case 0x2C595B4FU /* KeyO */: return RGFW_keyO; /* 0x0018 */
9277-
case 0x2C595B50U /* KeyP */: return RGFW_keyP; /* 0x0019 */
9278-
case 0x45D8158CU /* BracketLeft */: return RGFW_keyCloseBracket; /* 0x001A */
9279-
case 0xDEEABF7CU /* BracketRight */: return RGFW_keyBracket; /* 0x001B */
9280-
case 0x92E1C5D2U /* Enter */: return RGFW_keyReturn; /* 0x001C */
9281-
case 0xE058958CU /* ControlLeft */: return RGFW_keyControlL; /* 0x001D */
9282-
case 0x2C595B41U /* KeyA */: return RGFW_keyA; /* 0x001E */
9283-
case 0x2C595B53U /* KeyS */: return RGFW_keyS; /* 0x001F */
9284-
case 0x2C595B44U /* KeyD */: return RGFW_keyD; /* 0x0020 */
9285-
case 0x2C595B46U /* KeyF */: return RGFW_keyF; /* 0x0021 */
9286-
case 0x2C595B47U /* KeyG */: return RGFW_keyG; /* 0x0022 */
9287-
case 0x2C595B48U /* KeyH */: return RGFW_keyH; /* 0x0023 */
9288-
case 0x2C595B4AU /* KeyJ */: return RGFW_keyJ; /* 0x0024 */
9289-
case 0x2C595B4BU /* KeyK */: return RGFW_keyK; /* 0x0025 */
9290-
case 0x2C595B4CU /* KeyL */: return RGFW_keyL; /* 0x0026 */
9291-
case 0x2707219EU /* Semicolon */: return RGFW_keySemicolon; /* 0x0027 */
9292-
case 0x92E0B58DU /* Quote */: return RGFW_keyApostrophe; /* 0x0028 */
9293-
case 0x36BF358DU /* Backquote */: return RGFW_keyBacktick; /* 0x0029 */
9294-
case 0x26B1958CU /* ShiftLeft */: return RGFW_keyShiftL; /* 0x002A */
9295-
case 0x36BF2438U /* Backslash */: return RGFW_keyBackSlash; /* 0x002B */
9296-
case 0x2C595B5AU /* KeyZ */: return RGFW_keyZ; /* 0x002C */
9297-
case 0x2C595B58U /* KeyX */: return RGFW_keyX; /* 0x002D */
9298-
case 0x2C595B43U /* KeyC */: return RGFW_keyC; /* 0x002E */
9299-
case 0x2C595B56U /* KeyV */: return RGFW_keyV; /* 0x002F */
9300-
case 0x2C595B42U /* KeyB */: return RGFW_keyB; /* 0x0030 */
9301-
case 0x2C595B4EU /* KeyN */: return RGFW_keyN; /* 0x0031 */
9302-
case 0x2C595B4DU /* KeyM */: return RGFW_keyM; /* 0x0032 */
9303-
case 0x92E1A1C1U /* Comma */: return RGFW_keyComma; /* 0x0033 */
9304-
case 0x672FFAD4U /* Period */: return RGFW_keyPeriod; /* 0x0034 */
9305-
case 0x92E0A438U /* Slash */: return RGFW_keySlash; /* 0x0035 */
9306-
case 0xC5A6BF7CU /* ShiftRight */: return RGFW_keyShiftR;
9307-
case 0x5D64DA91U /* NumpadMultiply */: return RGFW_keyMultiply;
9308-
case 0xC914958CU /* AltLeft */: return RGFW_keyAltL; /* 0x0038 */
9309-
case 0x92E09CB5U /* Space */: return RGFW_keySpace; /* 0x0039 */
9310-
case 0xB8FAE73BU /* CapsLock */: return RGFW_keyCapsLock; /* 0x003A */
9311-
case 0x7174B789U /* F1 */: return RGFW_keyF1; /* 0x003B */
9312-
case 0x7174B78AU /* F2 */: return RGFW_keyF2; /* 0x003C */
9313-
case 0x7174B78BU /* F3 */: return RGFW_keyF3; /* 0x003D */
9314-
case 0x7174B78CU /* F4 */: return RGFW_keyF4; /* 0x003E */
9315-
case 0x7174B78DU /* F5 */: return RGFW_keyF5; /* 0x003F */
9316-
case 0x7174B78EU /* F6 */: return RGFW_keyF6; /* 0x0040 */
9317-
case 0x7174B78FU /* F7 */: return RGFW_keyF7; /* 0x0041 */
9318-
case 0x7174B780U /* F8 */: return RGFW_keyF8; /* 0x0042 */
9319-
case 0x7174B781U /* F9 */: return RGFW_keyF9; /* 0x0043 */
9320-
case 0x7B8E57B0U /* F10 */: return RGFW_keyF10; /* 0x0044 */
9321-
case 0xC925FCDFU /* Numpad7 */: return RGFW_keyMultiply; /* 0x0047 */
9322-
case 0xC925FCD0U /* Numpad8 */: return RGFW_keyKeypad8; /* 0x0048 */
9323-
case 0xC925FCD1U /* Numpad9 */: return RGFW_keyKeypad9; /* 0x0049 */
9324-
case 0x5EA3E8A4U /* NumpadSubtract */: return RGFW_keyMinus; /* 0x004A */
9325-
case 0xC925FCDCU /* Numpad4 */: return RGFW_keyKeypad4; /* 0x004B */
9326-
case 0xC925FCDDU /* Numpad5 */: return RGFW_keyKeypad5; /* 0x004C */
9327-
case 0xC925FCDEU /* Numpad6 */: return RGFW_keyKeypad6; /* 0x004D */
9328-
case 0xC925FCD9U /* Numpad1 */: return RGFW_keyKeypad1; /* 0x004F */
9329-
case 0xC925FCDAU /* Numpad2 */: return RGFW_keyKeypad2; /* 0x0050 */
9330-
case 0xC925FCDBU /* Numpad3 */: return RGFW_keyKeypad3; /* 0x0051 */
9331-
case 0xC925FCD8U /* Numpad0 */: return RGFW_keyKeypad0; /* 0x0052 */
9332-
case 0x95852DACU /* NumpadDecimal */: return RGFW_keyKeypadPeriod; /* 0x0053 */
9333-
case 0x7B8E57B1U /* F11 */: return RGFW_keyF11; /* 0x0057 */
9334-
case 0x7B8E57B2U /* F12 */: return RGFW_keyF12; /* 0x0058 */
9335-
case 0x7393FBACU /* NumpadEqual */: return RGFW_keyKeypadReturn;
9336-
case 0xB88EBF7CU /* AltRight */: return RGFW_keyAltR; /* 0xE038 */
9337-
case 0xC925873BU /* NumLock */: return RGFW_keyNumLock; /* 0xE045 */
9338-
case 0x2C595F45U /* Home */: return RGFW_keyHome; /* 0xE047 */
9339-
case 0xC91BB690U /* ArrowUp */: return RGFW_keyUp; /* 0xE048 */
9340-
case 0x672F9210U /* PageUp */: return RGFW_keyPageUp; /* 0xE049 */
9341-
case 0x3799258CU /* ArrowLeft */: return RGFW_keyLeft; /* 0xE04B */
9342-
case 0x4CE33F7CU /* ArrowRight */: return RGFW_keyRight; /* 0xE04D */
9343-
case 0x7B8E55DCU /* End */: return RGFW_keyEnd; /* 0xE04F */
9344-
case 0x3799379EU /* ArrowDown */: return RGFW_keyDown; /* 0xE050 */
9345-
case 0xBA90179EU /* PageDown */: return RGFW_keyPageDown; /* 0xE051 */
9346-
case 0x6723CB2CU /* Insert */: return RGFW_keyInsert; /* 0xE052 */
9347-
case 0x6725C50DU /* Delete */: return RGFW_keyDelete; /* 0xE053 */
9348-
case 0x6723658CU /* OSLeft */: return RGFW_keySuperL; /* 0xE05B */
9349-
case 0x39643F7CU /* MetaRight */: return RGFW_keySuperR; /* 0xE05C */
9255+
case 0x67251058U /* Digit0 */: return RGFW_0; /* 0x0002 */
9256+
case 0x67251059U /* Digit1 */: return RGFW_1; /* 0x0003 */
9257+
case 0x6725105AU /* Digit2 */: return RGFW_2; /* 0x0004 */
9258+
case 0x6725105BU /* Digit3 */: return RGFW_3; /* 0x0005 */
9259+
case 0x6725105CU /* Digit4 */: return RGFW_4; /* 0x0006 */
9260+
case 0x6725105DU /* Digit5 */: return RGFW_5; /* 0x0007 */
9261+
case 0x6725105EU /* Digit6 */: return RGFW_6; /* 0x0008 */
9262+
case 0x6725105FU /* Digit7 */: return RGFW_7; /* 0x0009 */
9263+
case 0x67251050U /* Digit8 */: return RGFW_8; /* 0x000A */
9264+
case 0x67251051U /* Digit9 */: return RGFW_9; /* 0x000B */
9265+
case 0x92E14DD3U /* Minus */: return RGFW_minus; /* 0x000C */
9266+
case 0x92E1FBACU /* Equal */: return RGFW_equals; /* 0x000D */
9267+
case 0x36BF1CB5U /* Backspace */: return RGFW_backSpace; /* 0x000E */
9268+
case 0x7B8E51E2U /* Tab */: return RGFW_Tab; /* 0x000F */
9269+
case 0x2C595B51U /* KeyQ */: return RGFW_q; /* 0x0010 */
9270+
case 0x2C595B57U /* KeyW */: return RGFW_w; /* 0x0011 */
9271+
case 0x2C595B45U /* KeyE */: return RGFW_e; /* 0x0012 */
9272+
case 0x2C595B52U /* KeyR */: return RGFW_r; /* 0x0013 */
9273+
case 0x2C595B54U /* KeyT */: return RGFW_t; /* 0x0014 */
9274+
case 0x2C595B59U /* KeyY */: return RGFW_y; /* 0x0015 */
9275+
case 0x2C595B55U /* KeyU */: return RGFW_u; /* 0x0016 */
9276+
case 0x2C595B4FU /* KeyO */: return RGFW_o; /* 0x0018 */
9277+
case 0x2C595B50U /* KeyP */: return RGFW_p; /* 0x0019 */
9278+
case 0x45D8158CU /* BracketLeft */: return RGFW_closeBracket; /* 0x001A */
9279+
case 0xDEEABF7CU /* BracketRight */: return RGFW_bracket; /* 0x001B */
9280+
case 0x92E1C5D2U /* Enter */: return RGFW_return; /* 0x001C */
9281+
case 0xE058958CU /* ControlLeft */: return RGFW_controlL; /* 0x001D */
9282+
case 0x2C595B41U /* KeyA */: return RGFW_a; /* 0x001E */
9283+
case 0x2C595B53U /* KeyS */: return RGFW_s; /* 0x001F */
9284+
case 0x2C595B44U /* KeyD */: return RGFW_d; /* 0x0020 */
9285+
case 0x2C595B46U /* KeyF */: return RGFW_f; /* 0x0021 */
9286+
case 0x2C595B47U /* KeyG */: return RGFW_g; /* 0x0022 */
9287+
case 0x2C595B48U /* KeyH */: return RGFW_h; /* 0x0023 */
9288+
case 0x2C595B4AU /* KeyJ */: return RGFW_j; /* 0x0024 */
9289+
case 0x2C595B4BU /* KeyK */: return RGFW_k; /* 0x0025 */
9290+
case 0x2C595B4CU /* KeyL */: return RGFW_l; /* 0x0026 */
9291+
case 0x2707219EU /* Semicolon */: return RGFW_semicolon; /* 0x0027 */
9292+
case 0x92E0B58DU /* Quote */: return RGFW_apostrophe; /* 0x0028 */
9293+
case 0x36BF358DU /* Backquote */: return RGFW_backtick; /* 0x0029 */
9294+
case 0x26B1958CU /* ShiftLeft */: return RGFW_shiftL; /* 0x002A */
9295+
case 0x36BF2438U /* Backslash */: return RGFW_backSlash; /* 0x002B */
9296+
case 0x2C595B5AU /* KeyZ */: return RGFW_z; /* 0x002C */
9297+
case 0x2C595B58U /* KeyX */: return RGFW_x; /* 0x002D */
9298+
case 0x2C595B43U /* KeyC */: return RGFW_c; /* 0x002E */
9299+
case 0x2C595B56U /* KeyV */: return RGFW_v; /* 0x002F */
9300+
case 0x2C595B42U /* KeyB */: return RGFW_b; /* 0x0030 */
9301+
case 0x2C595B4EU /* KeyN */: return RGFW_n; /* 0x0031 */
9302+
case 0x2C595B4DU /* KeyM */: return RGFW_m; /* 0x0032 */
9303+
case 0x92E1A1C1U /* Comma */: return RGFW_comma; /* 0x0033 */
9304+
case 0x672FFAD4U /* Period */: return RGFW_period; /* 0x0034 */
9305+
case 0x92E0A438U /* Slash */: return RGFW_slash; /* 0x0035 */
9306+
case 0xC5A6BF7CU /* ShiftRight */: return RGFW_shiftR;
9307+
case 0x5D64DA91U /* NumpadMultiply */: return RGFW_multiply;
9308+
case 0xC914958CU /* AltLeft */: return RGFW_altL; /* 0x0038 */
9309+
case 0x92E09CB5U /* Space */: return RGFW_space; /* 0x0039 */
9310+
case 0xB8FAE73BU /* CapsLock */: return RGFW_capsLock; /* 0x003A */
9311+
case 0x7174B789U /* F1 */: return RGFW_F1; /* 0x003B */
9312+
case 0x7174B78AU /* F2 */: return RGFW_F2; /* 0x003C */
9313+
case 0x7174B78BU /* F3 */: return RGFW_F3; /* 0x003D */
9314+
case 0x7174B78CU /* F4 */: return RGFW_F4; /* 0x003E */
9315+
case 0x7174B78DU /* F5 */: return RGFW_F5; /* 0x003F */
9316+
case 0x7174B78EU /* F6 */: return RGFW_F6; /* 0x0040 */
9317+
case 0x7174B78FU /* F7 */: return RGFW_F7; /* 0x0041 */
9318+
case 0x7174B780U /* F8 */: return RGFW_F8; /* 0x0042 */
9319+
case 0x7174B781U /* F9 */: return RGFW_F9; /* 0x0043 */
9320+
case 0x7B8E57B0U /* F10 */: return RGFW_F10; /* 0x0044 */
9321+
case 0xC925FCDFU /* Numpad7 */: return RGFW_multiply; /* 0x0047 */
9322+
case 0xC925FCD0U /* Numpad8 */: return RGFW_KP_8; /* 0x0048 */
9323+
case 0xC925FCD1U /* Numpad9 */: return RGFW_KP_9; /* 0x0049 */
9324+
case 0x5EA3E8A4U /* NumpadSubtract */: return RGFW_minus; /* 0x004A */
9325+
case 0xC925FCDCU /* Numpad4 */: return RGFW_KP_4; /* 0x004B */
9326+
case 0xC925FCDDU /* Numpad5 */: return RGFW_KP_5; /* 0x004C */
9327+
case 0xC925FCDEU /* Numpad6 */: return RGFW_KP_6; /* 0x004D */
9328+
case 0xC925FCD9U /* Numpad1 */: return RGFW_KP_1; /* 0x004F */
9329+
case 0xC925FCDAU /* Numpad2 */: return RGFW_KP_2; /* 0x0050 */
9330+
case 0xC925FCDBU /* Numpad3 */: return RGFW_KP_3; /* 0x0051 */
9331+
case 0xC925FCD8U /* Numpad0 */: return RGFW_KP_0; /* 0x0052 */
9332+
case 0x95852DACU /* NumpadDecimal */: return RGFW_period; /* 0x0053 */
9333+
case 0x7B8E57B1U /* F11 */: return RGFW_F11; /* 0x0057 */
9334+
case 0x7B8E57B2U /* F12 */: return RGFW_F12; /* 0x0058 */
9335+
case 0x7393FBACU /* NumpadEqual */: return RGFW_KP_Return;
9336+
case 0xB88EBF7CU /* AltRight */: return RGFW_altR; /* 0xE038 */
9337+
case 0xC925873BU /* NumLock */: return RGFW_numLock; /* 0xE045 */
9338+
case 0x2C595F45U /* Home */: return RGFW_home; /* 0xE047 */
9339+
case 0xC91BB690U /* ArrowUp */: return RGFW_up; /* 0xE048 */
9340+
case 0x672F9210U /* PageUp */: return RGFW_pageUp; /* 0xE049 */
9341+
case 0x3799258CU /* ArrowLeft */: return RGFW_left; /* 0xE04B */
9342+
case 0x4CE33F7CU /* ArrowRight */: return RGFW_right; /* 0xE04D */
9343+
case 0x7B8E55DCU /* End */: return RGFW_end; /* 0xE04F */
9344+
case 0x3799379EU /* ArrowDown */: return RGFW_down; /* 0xE050 */
9345+
case 0xBA90179EU /* PageDown */: return RGFW_pageDown; /* 0xE051 */
9346+
case 0x6723CB2CU /* Insert */: return RGFW_insert; /* 0xE052 */
9347+
case 0x6725C50DU /* Delete */: return RGFW_delete; /* 0xE053 */
9348+
case 0x6723658CU /* OSLeft */: return RGFW_superL; /* 0xE05B */
9349+
case 0x39643F7CU /* MetaRight */: return RGFW_superR; /* 0xE05C */
93509350
}
93519351

93529352
return 0;

0 commit comments

Comments
 (0)