From 2426e6f62de8b6fc318ae104942929c66033338a Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 14:03:07 -0700 Subject: [PATCH 1/9] CamelCase underscores in `KeyCode` --- NAS2D/EnumKeyCode.h | 308 ++++++++++++++++----------------- test-graphics/TestGraphics.cpp | 6 +- 2 files changed, 157 insertions(+), 157 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index 5311195d..c824603f 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -18,175 +18,175 @@ namespace NAS2D { enum class KeyCode : uint32_t { - KEY_FIRST = 0, - KEY_UNKNOWN = 0, - KEY_BACKSPACE = '\b', - KEY_TAB = '\t', - KEY_RETURN = '\r', - KEY_ENTER = '\r', - KEY_ESCAPE = '\033', - KEY_SPACE = ' ', - KEY_EXCLAIM = '!', - KEY_QUOTEDBL = '"', - KEY_HASH = '#', - KEY_PERCENT = '%', - KEY_DOLLAR = '$', - KEY_AMPERSAND = '&', - KEY_QUOTE = '\'', - KEY_LEFTPAREN = '(', - KEY_RIGHTPAREN = ')', - KEY_ASTERISK = '*', - KEY_PLUS = '+', - KEY_COMMA = ',', - KEY_MINUS = '-', - KEY_PERIOD = '.', - KEY_SLASH = '/', - KEY_0 = '0', - KEY_1 = '1', - KEY_2 = '2', - KEY_3 = '3', - KEY_4 = '4', - KEY_5 = '5', - KEY_6 = '6', - KEY_7 = '7', - KEY_8 = '8', - KEY_9 = '9', - KEY_COLON = ':', - KEY_SEMICOLON = ';', - KEY_LESS = '<', - KEY_EQUALS = '=', - KEY_GREATER = '>', - KEY_QUESTION = '?', - KEY_AT = '@', + KeyFirst = 0, + KeyUnknown = 0, + KeyBackspace = '\b', + KeyTab = '\t', + KeyReturn = '\r', + KeyEnter = '\r', + KeyEscape = '\033', + KeySpace = ' ', + KeyExclaim = '!', + KeyQuotedbl = '"', + KeyHash = '#', + KeyPercent = '%', + KeyDollar = '$', + KeyAmpersand = '&', + KeyQuote = '\'', + KeyLeftparen = '(', + KeyRightparen = ')', + KeyAsterisk = '*', + KeyPlus = '+', + KeyComma = ',', + KeyMinus = '-', + KeyPeriod = '.', + KeySlash = '/', + Key0 = '0', + Key1 = '1', + Key2 = '2', + Key3 = '3', + Key4 = '4', + Key5 = '5', + Key6 = '6', + Key7 = '7', + Key8 = '8', + Key9 = '9', + KeyColon = ':', + KeySemicolon = ';', + KeyLess = '<', + KeyEquals = '=', + KeyGreater = '>', + KeyQuestion = '?', + KeyAt = '@', // Special Symbols - KEY_LEFTBRACKET = '[', - KEY_BACKSLASH = '\\', - KEY_RIGHTBRACKET = ']', - KEY_CARET = '^', - KEY_UNDERSCORE = '_', - KEY_BACKQUOTE = '`', + KeyLeftbracket = '[', + KeyBackslash = '\\', + KeyRightbracket = ']', + KeyCaret = '^', + KeyUnderscore = '_', + KeyBackquote = '`', - KEY_a = 'a', - KEY_b = 'b', - KEY_c = 'c', - KEY_d = 'd', - KEY_e = 'e', - KEY_f = 'f', - KEY_g = 'g', - KEY_h = 'h', - KEY_i = 'i', - KEY_j = 'j', - KEY_k = 'k', - KEY_l = 'l', - KEY_m = 'm', - KEY_n = 'n', - KEY_o = 'o', - KEY_p = 'p', - KEY_q = 'q', - KEY_r = 'r', - KEY_s = 's', - KEY_t = 't', - KEY_u = 'u', - KEY_v = 'v', - KEY_w = 'w', - KEY_x = 'x', - KEY_y = 'y', - KEY_z = 'z', + KeyA = 'a', + KeyB = 'b', + KeyC = 'c', + KeyD = 'd', + KeyE = 'e', + KeyF = 'f', + KeyG = 'g', + KeyH = 'h', + KeyI = 'i', + KeyJ = 'j', + KeyK = 'k', + KeyL = 'l', + KeyM = 'm', + KeyN = 'n', + KeyO = 'o', + KeyP = 'p', + KeyQ = 'q', + KeyR = 'r', + KeyS = 's', + KeyT = 't', + KeyU = 'u', + KeyV = 'v', + KeyW = 'w', + KeyX = 'x', + KeyY = 'y', + KeyZ = 'z', // Numeric Keypad - KEY_KP1 = scanCodeToKeyCode(89), - KEY_KP2 = scanCodeToKeyCode(90), - KEY_KP3 = scanCodeToKeyCode(91), - KEY_KP4 = scanCodeToKeyCode(92), - KEY_KP5 = scanCodeToKeyCode(93), - KEY_KP6 = scanCodeToKeyCode(94), - KEY_KP7 = scanCodeToKeyCode(95), - KEY_KP8 = scanCodeToKeyCode(96), - KEY_KP9 = scanCodeToKeyCode(97), - KEY_KP0 = scanCodeToKeyCode(98), - KEY_KP_PERIOD = scanCodeToKeyCode(99), - KEY_KP_DIVIDE = scanCodeToKeyCode(84), - KEY_KP_MULTIPLY = scanCodeToKeyCode(85), - KEY_KP_MINUS = scanCodeToKeyCode(86), - KEY_KP_PLUS = scanCodeToKeyCode(87), - KEY_KP_ENTER = scanCodeToKeyCode(88), - KEY_KP_EQUALS = scanCodeToKeyCode(103), - KEY_KP_COMMA = scanCodeToKeyCode(133), + KeyKp1 = scanCodeToKeyCode(89), + KeyKp2 = scanCodeToKeyCode(90), + KeyKp3 = scanCodeToKeyCode(91), + KeyKp4 = scanCodeToKeyCode(92), + KeyKp5 = scanCodeToKeyCode(93), + KeyKp6 = scanCodeToKeyCode(94), + KeyKp7 = scanCodeToKeyCode(95), + KeyKp8 = scanCodeToKeyCode(96), + KeyKp9 = scanCodeToKeyCode(97), + KeyKp0 = scanCodeToKeyCode(98), + KeyKpPeriod = scanCodeToKeyCode(99), + KeyKpDivide = scanCodeToKeyCode(84), + KeyKpMultiply = scanCodeToKeyCode(85), + KeyKpMinus = scanCodeToKeyCode(86), + KeyKpPlus = scanCodeToKeyCode(87), + KeyKpEnter = scanCodeToKeyCode(88), + KeyKpEquals = scanCodeToKeyCode(103), + KeyKpComma = scanCodeToKeyCode(133), // Arrows/Home/End - KEY_UP = scanCodeToKeyCode(82), - KEY_DOWN = scanCodeToKeyCode(81), - KEY_RIGHT = scanCodeToKeyCode(79), - KEY_LEFT = scanCodeToKeyCode(80), - KEY_INSERT = scanCodeToKeyCode(73), - KEY_PAUSE = scanCodeToKeyCode(72), - KEY_HOME = scanCodeToKeyCode(74), - KEY_END = scanCodeToKeyCode(77), - KEY_DELETE = '\177', - KEY_PAGEUP = scanCodeToKeyCode(75), - KEY_PAGEDOWN = scanCodeToKeyCode(78), + KeyUp = scanCodeToKeyCode(82), + KeyDown = scanCodeToKeyCode(81), + KeyRight = scanCodeToKeyCode(79), + KeyLeft = scanCodeToKeyCode(80), + KeyInsert = scanCodeToKeyCode(73), + KeyPause = scanCodeToKeyCode(72), + KeyHome = scanCodeToKeyCode(74), + KeyEnd = scanCodeToKeyCode(77), + KeyDelete = '\177', + KeyPageup = scanCodeToKeyCode(75), + KeyPagedown = scanCodeToKeyCode(78), // Function Keys - KEY_F1 = scanCodeToKeyCode(58), - KEY_F2 = scanCodeToKeyCode(59), - KEY_F3 = scanCodeToKeyCode(60), - KEY_F4 = scanCodeToKeyCode(61), - KEY_F5 = scanCodeToKeyCode(62), - KEY_F6 = scanCodeToKeyCode(63), - KEY_F7 = scanCodeToKeyCode(64), - KEY_F8 = scanCodeToKeyCode(65), - KEY_F9 = scanCodeToKeyCode(66), - KEY_F10 = scanCodeToKeyCode(67), - KEY_F11 = scanCodeToKeyCode(68), - KEY_F12 = scanCodeToKeyCode(69), - KEY_F13 = scanCodeToKeyCode(104), - KEY_F14 = scanCodeToKeyCode(105), - KEY_F15 = scanCodeToKeyCode(106), - KEY_F16 = scanCodeToKeyCode(107), - KEY_F17 = scanCodeToKeyCode(108), - KEY_F18 = scanCodeToKeyCode(109), - KEY_F19 = scanCodeToKeyCode(110), - KEY_F20 = scanCodeToKeyCode(111), - KEY_F21 = scanCodeToKeyCode(112), - KEY_F22 = scanCodeToKeyCode(113), - KEY_F23 = scanCodeToKeyCode(114), - KEY_F24 = scanCodeToKeyCode(115), + KeyF1 = scanCodeToKeyCode(58), + KeyF2 = scanCodeToKeyCode(59), + KeyF3 = scanCodeToKeyCode(60), + KeyF4 = scanCodeToKeyCode(61), + KeyF5 = scanCodeToKeyCode(62), + KeyF6 = scanCodeToKeyCode(63), + KeyF7 = scanCodeToKeyCode(64), + KeyF8 = scanCodeToKeyCode(65), + KeyF9 = scanCodeToKeyCode(66), + KeyF10 = scanCodeToKeyCode(67), + KeyF11 = scanCodeToKeyCode(68), + KeyF12 = scanCodeToKeyCode(69), + KeyF13 = scanCodeToKeyCode(104), + KeyF14 = scanCodeToKeyCode(105), + KeyF15 = scanCodeToKeyCode(106), + KeyF16 = scanCodeToKeyCode(107), + KeyF17 = scanCodeToKeyCode(108), + KeyF18 = scanCodeToKeyCode(109), + KeyF19 = scanCodeToKeyCode(110), + KeyF20 = scanCodeToKeyCode(111), + KeyF21 = scanCodeToKeyCode(112), + KeyF22 = scanCodeToKeyCode(113), + KeyF23 = scanCodeToKeyCode(114), + KeyF24 = scanCodeToKeyCode(115), // Key State Modifiers - KEY_NUMLOCK = scanCodeToKeyCode(83), - KEY_CAPSLOCK = scanCodeToKeyCode(57), - KEY_SCROLLOCK = scanCodeToKeyCode(71), - KEY_RSHIFT = scanCodeToKeyCode(229), - KEY_LSHIFT = scanCodeToKeyCode(225), - KEY_RCTRL = scanCodeToKeyCode(228), - KEY_LCTRL = scanCodeToKeyCode(224), - KEY_RALT = scanCodeToKeyCode(230), - KEY_LALT = scanCodeToKeyCode(226), - KEY_RGUI = scanCodeToKeyCode(231), - KEY_LGUI = scanCodeToKeyCode(227), - KEY_MODE = scanCodeToKeyCode(257), + KeyNumlock = scanCodeToKeyCode(83), + KeyCapslock = scanCodeToKeyCode(57), + KeyScrollock = scanCodeToKeyCode(71), + KeyRshift = scanCodeToKeyCode(229), + KeyLshift = scanCodeToKeyCode(225), + KeyRctrl = scanCodeToKeyCode(228), + KeyLctrl = scanCodeToKeyCode(224), + KeyRalt = scanCodeToKeyCode(230), + KeyLalt = scanCodeToKeyCode(226), + KeyRgui = scanCodeToKeyCode(231), + KeyLgui = scanCodeToKeyCode(227), + KeyMode = scanCodeToKeyCode(257), // Miscellaneous function keys - KEY_HELP = scanCodeToKeyCode(117), - KEY_PRINTSCREEN = scanCodeToKeyCode(70), - KEY_ALTERASE = scanCodeToKeyCode(153), - KEY_SYSREQ = scanCodeToKeyCode(154), - KEY_CLEAR = scanCodeToKeyCode(159), - KEY_MENU = scanCodeToKeyCode(118), - KEY_POWER = scanCodeToKeyCode(102), - KEY_UNDO = scanCodeToKeyCode(122), + KeyHelp = scanCodeToKeyCode(117), + KeyPrintscreen = scanCodeToKeyCode(70), + KeyAlterase = scanCodeToKeyCode(153), + KeySysreq = scanCodeToKeyCode(154), + KeyClear = scanCodeToKeyCode(159), + KeyMenu = scanCodeToKeyCode(118), + KeyPower = scanCodeToKeyCode(102), + KeyUndo = scanCodeToKeyCode(122), // Audio Control - KEY_MUTE = scanCodeToKeyCode(127), - KEY_VOLUME_UP = scanCodeToKeyCode(128), - KEY_VOLUME_DOWN = scanCodeToKeyCode(129), - KEY_AUDIO_NEXT = scanCodeToKeyCode(258), - KEY_AUDIO_PREV = scanCodeToKeyCode(259), - KEY_AUDIO_STOP = scanCodeToKeyCode(260), - KEY_AUDIO_PLAY = scanCodeToKeyCode(261), - KEY_AUDIO_MUTE = scanCodeToKeyCode(262), + KeyMute = scanCodeToKeyCode(127), + KeyVolumeUp = scanCodeToKeyCode(128), + KeyVolumeDown = scanCodeToKeyCode(129), + KeyAudioNext = scanCodeToKeyCode(258), + KeyAudioPrev = scanCodeToKeyCode(259), + KeyAudioStop = scanCodeToKeyCode(260), + KeyAudioPlay = scanCodeToKeyCode(261), + KeyAudioMute = scanCodeToKeyCode(262), - KEY_LAST, + KeyLast, }; } diff --git a/test-graphics/TestGraphics.cpp b/test-graphics/TestGraphics.cpp index 93c91f64..73bb6f66 100644 --- a/test-graphics/TestGraphics.cpp +++ b/test-graphics/TestGraphics.cpp @@ -119,16 +119,16 @@ void TestGraphics::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, boo { switch (key) { - case NAS2D::KeyCode::KEY_ESCAPE: + case NAS2D::KeyCode::KeyEscape: NAS2D::postQuitEvent(); break; - case NAS2D::KeyCode::KEY_F1: + case NAS2D::KeyCode::KeyF1: { auto& renderer = NAS2D::Utility::get(); renderer.fullscreen(!renderer.fullscreen()); break; } - case NAS2D::KeyCode::KEY_F2: + case NAS2D::KeyCode::KeyF2: { auto& renderer = NAS2D::Utility::get(); renderer.resizeable(!renderer.resizeable()); From fb7464612f970f88210937bc1ee213a21a9c043f Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 14:10:05 -0700 Subject: [PATCH 2/9] Rename "Kp" prefix to "Keypad" --- NAS2D/EnumKeyCode.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index c824603f..b00fba76 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -95,24 +95,24 @@ namespace NAS2D KeyZ = 'z', // Numeric Keypad - KeyKp1 = scanCodeToKeyCode(89), - KeyKp2 = scanCodeToKeyCode(90), - KeyKp3 = scanCodeToKeyCode(91), - KeyKp4 = scanCodeToKeyCode(92), - KeyKp5 = scanCodeToKeyCode(93), - KeyKp6 = scanCodeToKeyCode(94), - KeyKp7 = scanCodeToKeyCode(95), - KeyKp8 = scanCodeToKeyCode(96), - KeyKp9 = scanCodeToKeyCode(97), - KeyKp0 = scanCodeToKeyCode(98), - KeyKpPeriod = scanCodeToKeyCode(99), - KeyKpDivide = scanCodeToKeyCode(84), - KeyKpMultiply = scanCodeToKeyCode(85), - KeyKpMinus = scanCodeToKeyCode(86), - KeyKpPlus = scanCodeToKeyCode(87), - KeyKpEnter = scanCodeToKeyCode(88), - KeyKpEquals = scanCodeToKeyCode(103), - KeyKpComma = scanCodeToKeyCode(133), + KeyKeypad1 = scanCodeToKeyCode(89), + KeyKeypad2 = scanCodeToKeyCode(90), + KeyKeypad3 = scanCodeToKeyCode(91), + KeyKeypad4 = scanCodeToKeyCode(92), + KeyKeypad5 = scanCodeToKeyCode(93), + KeyKeypad6 = scanCodeToKeyCode(94), + KeyKeypad7 = scanCodeToKeyCode(95), + KeyKeypad8 = scanCodeToKeyCode(96), + KeyKeypad9 = scanCodeToKeyCode(97), + KeyKeypad0 = scanCodeToKeyCode(98), + KeyKeypadPeriod = scanCodeToKeyCode(99), + KeyKeypadDivide = scanCodeToKeyCode(84), + KeyKeypadMultiply = scanCodeToKeyCode(85), + KeyKeypadMinus = scanCodeToKeyCode(86), + KeyKeypadPlus = scanCodeToKeyCode(87), + KeyKeypadEnter = scanCodeToKeyCode(88), + KeyKeypadEquals = scanCodeToKeyCode(103), + KeyKeypadComma = scanCodeToKeyCode(133), // Arrows/Home/End KeyUp = scanCodeToKeyCode(82), From 3b321aea2ba1941ad2254c3bea55a1ad6b8b9822 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 14:22:46 -0700 Subject: [PATCH 3/9] Spell out "Right" and "Left" --- NAS2D/EnumKeyCode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index b00fba76..a59159d4 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -157,14 +157,14 @@ namespace NAS2D KeyNumlock = scanCodeToKeyCode(83), KeyCapslock = scanCodeToKeyCode(57), KeyScrollock = scanCodeToKeyCode(71), - KeyRshift = scanCodeToKeyCode(229), - KeyLshift = scanCodeToKeyCode(225), - KeyRctrl = scanCodeToKeyCode(228), - KeyLctrl = scanCodeToKeyCode(224), - KeyRalt = scanCodeToKeyCode(230), - KeyLalt = scanCodeToKeyCode(226), - KeyRgui = scanCodeToKeyCode(231), - KeyLgui = scanCodeToKeyCode(227), + KeyRightshift = scanCodeToKeyCode(229), + KeyLeftshift = scanCodeToKeyCode(225), + KeyRightctrl = scanCodeToKeyCode(228), + KeyLeftctrl = scanCodeToKeyCode(224), + KeyRightalt = scanCodeToKeyCode(230), + KeyLeftalt = scanCodeToKeyCode(226), + KeyRightgui = scanCodeToKeyCode(231), + KeyLeftgui = scanCodeToKeyCode(227), KeyMode = scanCodeToKeyCode(257), // Miscellaneous function keys From e0f13b41f98a309f44d4feb3ceebdc07358ebf69 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 14:23:52 -0700 Subject: [PATCH 4/9] Fix typo in scroll lock The right way really does look quite wrong. --- NAS2D/EnumKeyCode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index a59159d4..6f4e7838 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -156,7 +156,7 @@ namespace NAS2D // Key State Modifiers KeyNumlock = scanCodeToKeyCode(83), KeyCapslock = scanCodeToKeyCode(57), - KeyScrollock = scanCodeToKeyCode(71), + KeyScrolllock = scanCodeToKeyCode(71), KeyRightshift = scanCodeToKeyCode(229), KeyLeftshift = scanCodeToKeyCode(225), KeyRightctrl = scanCodeToKeyCode(228), From 008d329c0c606ab7170be0ac03f0394e397776ea Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 14:25:59 -0700 Subject: [PATCH 5/9] CamelCase compound names in `KeyCode` --- NAS2D/EnumKeyCode.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index 6f4e7838..ba4ef2d1 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -33,8 +33,8 @@ namespace NAS2D KeyDollar = '$', KeyAmpersand = '&', KeyQuote = '\'', - KeyLeftparen = '(', - KeyRightparen = ')', + KeyLeftParen = '(', + KeyRightParen = ')', KeyAsterisk = '*', KeyPlus = '+', KeyComma = ',', @@ -60,9 +60,9 @@ namespace NAS2D KeyAt = '@', // Special Symbols - KeyLeftbracket = '[', + KeyLeftBracket = '[', KeyBackslash = '\\', - KeyRightbracket = ']', + KeyRightBracket = ']', KeyCaret = '^', KeyUnderscore = '_', KeyBackquote = '`', @@ -124,8 +124,8 @@ namespace NAS2D KeyHome = scanCodeToKeyCode(74), KeyEnd = scanCodeToKeyCode(77), KeyDelete = '\177', - KeyPageup = scanCodeToKeyCode(75), - KeyPagedown = scanCodeToKeyCode(78), + KeyPageUp = scanCodeToKeyCode(75), + KeyPageDown = scanCodeToKeyCode(78), // Function Keys KeyF1 = scanCodeToKeyCode(58), @@ -154,24 +154,24 @@ namespace NAS2D KeyF24 = scanCodeToKeyCode(115), // Key State Modifiers - KeyNumlock = scanCodeToKeyCode(83), - KeyCapslock = scanCodeToKeyCode(57), - KeyScrolllock = scanCodeToKeyCode(71), - KeyRightshift = scanCodeToKeyCode(229), - KeyLeftshift = scanCodeToKeyCode(225), - KeyRightctrl = scanCodeToKeyCode(228), - KeyLeftctrl = scanCodeToKeyCode(224), - KeyRightalt = scanCodeToKeyCode(230), - KeyLeftalt = scanCodeToKeyCode(226), - KeyRightgui = scanCodeToKeyCode(231), - KeyLeftgui = scanCodeToKeyCode(227), + KeyNumLock = scanCodeToKeyCode(83), + KeyCapsLock = scanCodeToKeyCode(57), + KeyScrollLock = scanCodeToKeyCode(71), + KeyRightShift = scanCodeToKeyCode(229), + KeyLeftShift = scanCodeToKeyCode(225), + KeyRightCtrl = scanCodeToKeyCode(228), + KeyLeftCtrl = scanCodeToKeyCode(224), + KeyRightAlt = scanCodeToKeyCode(230), + KeyLeftAlt = scanCodeToKeyCode(226), + KeyRightGui = scanCodeToKeyCode(231), + KeyLeftGui = scanCodeToKeyCode(227), KeyMode = scanCodeToKeyCode(257), // Miscellaneous function keys KeyHelp = scanCodeToKeyCode(117), - KeyPrintscreen = scanCodeToKeyCode(70), - KeyAlterase = scanCodeToKeyCode(153), - KeySysreq = scanCodeToKeyCode(154), + KeyPrintScreen = scanCodeToKeyCode(70), + KeyAltErase = scanCodeToKeyCode(153), + KeySysReq = scanCodeToKeyCode(154), KeyClear = scanCodeToKeyCode(159), KeyMenu = scanCodeToKeyCode(118), KeyPower = scanCodeToKeyCode(102), From f15b520073f3c10fc72d9e38e70ec294a1de2a6c Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 16:08:55 -0700 Subject: [PATCH 6/9] Rename key to "equal" --- NAS2D/EnumKeyCode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index ba4ef2d1..1901cfd4 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -54,7 +54,7 @@ namespace NAS2D KeyColon = ':', KeySemicolon = ';', KeyLess = '<', - KeyEquals = '=', + KeyEqual = '=', KeyGreater = '>', KeyQuestion = '?', KeyAt = '@', @@ -111,7 +111,7 @@ namespace NAS2D KeyKeypadMinus = scanCodeToKeyCode(86), KeyKeypadPlus = scanCodeToKeyCode(87), KeyKeypadEnter = scanCodeToKeyCode(88), - KeyKeypadEquals = scanCodeToKeyCode(103), + KeyKeypadEqual = scanCodeToKeyCode(103), KeyKeypadComma = scanCodeToKeyCode(133), // Arrows/Home/End From ff42659af4a77875a694ed09c2f8ef6e4d58740d Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 16:09:46 -0700 Subject: [PATCH 7/9] Rename "Quote" and "SingleQuote" --- NAS2D/EnumKeyCode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index 1901cfd4..6ae671f3 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -27,12 +27,12 @@ namespace NAS2D KeyEscape = '\033', KeySpace = ' ', KeyExclaim = '!', - KeyQuotedbl = '"', + KeyQuote = '"', KeyHash = '#', KeyPercent = '%', KeyDollar = '$', KeyAmpersand = '&', - KeyQuote = '\'', + KeySingleQuote = '\'', KeyLeftParen = '(', KeyRightParen = ')', KeyAsterisk = '*', From 6818821b137e05a689c9ba4dca299d35a8fb0208 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 16:13:18 -0700 Subject: [PATCH 8/9] Add prefix "Num" to numeric values --- NAS2D/EnumKeyCode.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index 6ae671f3..ef89e067 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -41,16 +41,16 @@ namespace NAS2D KeyMinus = '-', KeyPeriod = '.', KeySlash = '/', - Key0 = '0', - Key1 = '1', - Key2 = '2', - Key3 = '3', - Key4 = '4', - Key5 = '5', - Key6 = '6', - Key7 = '7', - Key8 = '8', - Key9 = '9', + KeyNum0 = '0', + KeyNum1 = '1', + KeyNum2 = '2', + KeyNum3 = '3', + KeyNum4 = '4', + KeyNum5 = '5', + KeyNum6 = '6', + KeyNum7 = '7', + KeyNum8 = '8', + KeyNum9 = '9', KeyColon = ':', KeySemicolon = ';', KeyLess = '<', From 50a2f3a6062eb4460ac6b36ed602da6a78675e4c Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Thu, 13 Feb 2025 16:16:07 -0700 Subject: [PATCH 9/9] Remove "Key" prefix from all enum value names Value name prefixes should be avoided when using `enum class`, since the enum name is always present as a prefix. --- NAS2D/EnumKeyCode.h | 308 ++++++++++++++++----------------- test-graphics/TestGraphics.cpp | 6 +- 2 files changed, 157 insertions(+), 157 deletions(-) diff --git a/NAS2D/EnumKeyCode.h b/NAS2D/EnumKeyCode.h index ef89e067..91788bad 100644 --- a/NAS2D/EnumKeyCode.h +++ b/NAS2D/EnumKeyCode.h @@ -18,175 +18,175 @@ namespace NAS2D { enum class KeyCode : uint32_t { - KeyFirst = 0, - KeyUnknown = 0, - KeyBackspace = '\b', - KeyTab = '\t', - KeyReturn = '\r', - KeyEnter = '\r', - KeyEscape = '\033', - KeySpace = ' ', - KeyExclaim = '!', - KeyQuote = '"', - KeyHash = '#', - KeyPercent = '%', - KeyDollar = '$', - KeyAmpersand = '&', - KeySingleQuote = '\'', - KeyLeftParen = '(', - KeyRightParen = ')', - KeyAsterisk = '*', - KeyPlus = '+', - KeyComma = ',', - KeyMinus = '-', - KeyPeriod = '.', - KeySlash = '/', - KeyNum0 = '0', - KeyNum1 = '1', - KeyNum2 = '2', - KeyNum3 = '3', - KeyNum4 = '4', - KeyNum5 = '5', - KeyNum6 = '6', - KeyNum7 = '7', - KeyNum8 = '8', - KeyNum9 = '9', - KeyColon = ':', - KeySemicolon = ';', - KeyLess = '<', - KeyEqual = '=', - KeyGreater = '>', - KeyQuestion = '?', - KeyAt = '@', + First = 0, + Unknown = 0, + Backspace = '\b', + Tab = '\t', + Return = '\r', + Enter = '\r', + Escape = '\033', + Space = ' ', + Exclaim = '!', + Quote = '"', + Hash = '#', + Percent = '%', + Dollar = '$', + Ampersand = '&', + SingleQuote = '\'', + LeftParen = '(', + RightParen = ')', + Asterisk = '*', + Plus = '+', + Comma = ',', + Minus = '-', + Period = '.', + Slash = '/', + Num0 = '0', + Num1 = '1', + Num2 = '2', + Num3 = '3', + Num4 = '4', + Num5 = '5', + Num6 = '6', + Num7 = '7', + Num8 = '8', + Num9 = '9', + Colon = ':', + Semicolon = ';', + Less = '<', + Equal = '=', + Greater = '>', + Question = '?', + At = '@', // Special Symbols - KeyLeftBracket = '[', - KeyBackslash = '\\', - KeyRightBracket = ']', - KeyCaret = '^', - KeyUnderscore = '_', - KeyBackquote = '`', + LeftBracket = '[', + Backslash = '\\', + RightBracket = ']', + Caret = '^', + Underscore = '_', + Backquote = '`', - KeyA = 'a', - KeyB = 'b', - KeyC = 'c', - KeyD = 'd', - KeyE = 'e', - KeyF = 'f', - KeyG = 'g', - KeyH = 'h', - KeyI = 'i', - KeyJ = 'j', - KeyK = 'k', - KeyL = 'l', - KeyM = 'm', - KeyN = 'n', - KeyO = 'o', - KeyP = 'p', - KeyQ = 'q', - KeyR = 'r', - KeyS = 's', - KeyT = 't', - KeyU = 'u', - KeyV = 'v', - KeyW = 'w', - KeyX = 'x', - KeyY = 'y', - KeyZ = 'z', + A = 'a', + B = 'b', + C = 'c', + D = 'd', + E = 'e', + F = 'f', + G = 'g', + H = 'h', + I = 'i', + J = 'j', + K = 'k', + L = 'l', + M = 'm', + N = 'n', + O = 'o', + P = 'p', + Q = 'q', + R = 'r', + S = 's', + T = 't', + U = 'u', + V = 'v', + W = 'w', + X = 'x', + Y = 'y', + Z = 'z', // Numeric Keypad - KeyKeypad1 = scanCodeToKeyCode(89), - KeyKeypad2 = scanCodeToKeyCode(90), - KeyKeypad3 = scanCodeToKeyCode(91), - KeyKeypad4 = scanCodeToKeyCode(92), - KeyKeypad5 = scanCodeToKeyCode(93), - KeyKeypad6 = scanCodeToKeyCode(94), - KeyKeypad7 = scanCodeToKeyCode(95), - KeyKeypad8 = scanCodeToKeyCode(96), - KeyKeypad9 = scanCodeToKeyCode(97), - KeyKeypad0 = scanCodeToKeyCode(98), - KeyKeypadPeriod = scanCodeToKeyCode(99), - KeyKeypadDivide = scanCodeToKeyCode(84), - KeyKeypadMultiply = scanCodeToKeyCode(85), - KeyKeypadMinus = scanCodeToKeyCode(86), - KeyKeypadPlus = scanCodeToKeyCode(87), - KeyKeypadEnter = scanCodeToKeyCode(88), - KeyKeypadEqual = scanCodeToKeyCode(103), - KeyKeypadComma = scanCodeToKeyCode(133), + Keypad1 = scanCodeToKeyCode(89), + Keypad2 = scanCodeToKeyCode(90), + Keypad3 = scanCodeToKeyCode(91), + Keypad4 = scanCodeToKeyCode(92), + Keypad5 = scanCodeToKeyCode(93), + Keypad6 = scanCodeToKeyCode(94), + Keypad7 = scanCodeToKeyCode(95), + Keypad8 = scanCodeToKeyCode(96), + Keypad9 = scanCodeToKeyCode(97), + Keypad0 = scanCodeToKeyCode(98), + KeypadPeriod = scanCodeToKeyCode(99), + KeypadDivide = scanCodeToKeyCode(84), + KeypadMultiply = scanCodeToKeyCode(85), + KeypadMinus = scanCodeToKeyCode(86), + KeypadPlus = scanCodeToKeyCode(87), + KeypadEnter = scanCodeToKeyCode(88), + KeypadEqual = scanCodeToKeyCode(103), + KeypadComma = scanCodeToKeyCode(133), // Arrows/Home/End - KeyUp = scanCodeToKeyCode(82), - KeyDown = scanCodeToKeyCode(81), - KeyRight = scanCodeToKeyCode(79), - KeyLeft = scanCodeToKeyCode(80), - KeyInsert = scanCodeToKeyCode(73), - KeyPause = scanCodeToKeyCode(72), - KeyHome = scanCodeToKeyCode(74), - KeyEnd = scanCodeToKeyCode(77), - KeyDelete = '\177', - KeyPageUp = scanCodeToKeyCode(75), - KeyPageDown = scanCodeToKeyCode(78), + Up = scanCodeToKeyCode(82), + Down = scanCodeToKeyCode(81), + Right = scanCodeToKeyCode(79), + Left = scanCodeToKeyCode(80), + Insert = scanCodeToKeyCode(73), + Pause = scanCodeToKeyCode(72), + Home = scanCodeToKeyCode(74), + End = scanCodeToKeyCode(77), + Delete = '\177', + PageUp = scanCodeToKeyCode(75), + PageDown = scanCodeToKeyCode(78), // Function Keys - KeyF1 = scanCodeToKeyCode(58), - KeyF2 = scanCodeToKeyCode(59), - KeyF3 = scanCodeToKeyCode(60), - KeyF4 = scanCodeToKeyCode(61), - KeyF5 = scanCodeToKeyCode(62), - KeyF6 = scanCodeToKeyCode(63), - KeyF7 = scanCodeToKeyCode(64), - KeyF8 = scanCodeToKeyCode(65), - KeyF9 = scanCodeToKeyCode(66), - KeyF10 = scanCodeToKeyCode(67), - KeyF11 = scanCodeToKeyCode(68), - KeyF12 = scanCodeToKeyCode(69), - KeyF13 = scanCodeToKeyCode(104), - KeyF14 = scanCodeToKeyCode(105), - KeyF15 = scanCodeToKeyCode(106), - KeyF16 = scanCodeToKeyCode(107), - KeyF17 = scanCodeToKeyCode(108), - KeyF18 = scanCodeToKeyCode(109), - KeyF19 = scanCodeToKeyCode(110), - KeyF20 = scanCodeToKeyCode(111), - KeyF21 = scanCodeToKeyCode(112), - KeyF22 = scanCodeToKeyCode(113), - KeyF23 = scanCodeToKeyCode(114), - KeyF24 = scanCodeToKeyCode(115), + F1 = scanCodeToKeyCode(58), + F2 = scanCodeToKeyCode(59), + F3 = scanCodeToKeyCode(60), + F4 = scanCodeToKeyCode(61), + F5 = scanCodeToKeyCode(62), + F6 = scanCodeToKeyCode(63), + F7 = scanCodeToKeyCode(64), + F8 = scanCodeToKeyCode(65), + F9 = scanCodeToKeyCode(66), + F10 = scanCodeToKeyCode(67), + F11 = scanCodeToKeyCode(68), + F12 = scanCodeToKeyCode(69), + F13 = scanCodeToKeyCode(104), + F14 = scanCodeToKeyCode(105), + F15 = scanCodeToKeyCode(106), + F16 = scanCodeToKeyCode(107), + F17 = scanCodeToKeyCode(108), + F18 = scanCodeToKeyCode(109), + F19 = scanCodeToKeyCode(110), + F20 = scanCodeToKeyCode(111), + F21 = scanCodeToKeyCode(112), + F22 = scanCodeToKeyCode(113), + F23 = scanCodeToKeyCode(114), + F24 = scanCodeToKeyCode(115), // Key State Modifiers - KeyNumLock = scanCodeToKeyCode(83), - KeyCapsLock = scanCodeToKeyCode(57), - KeyScrollLock = scanCodeToKeyCode(71), - KeyRightShift = scanCodeToKeyCode(229), - KeyLeftShift = scanCodeToKeyCode(225), - KeyRightCtrl = scanCodeToKeyCode(228), - KeyLeftCtrl = scanCodeToKeyCode(224), - KeyRightAlt = scanCodeToKeyCode(230), - KeyLeftAlt = scanCodeToKeyCode(226), - KeyRightGui = scanCodeToKeyCode(231), - KeyLeftGui = scanCodeToKeyCode(227), - KeyMode = scanCodeToKeyCode(257), + NumLock = scanCodeToKeyCode(83), + CapsLock = scanCodeToKeyCode(57), + ScrollLock = scanCodeToKeyCode(71), + RightShift = scanCodeToKeyCode(229), + LeftShift = scanCodeToKeyCode(225), + RightCtrl = scanCodeToKeyCode(228), + LeftCtrl = scanCodeToKeyCode(224), + RightAlt = scanCodeToKeyCode(230), + LeftAlt = scanCodeToKeyCode(226), + RightGui = scanCodeToKeyCode(231), + LeftGui = scanCodeToKeyCode(227), + Mode = scanCodeToKeyCode(257), // Miscellaneous function keys - KeyHelp = scanCodeToKeyCode(117), - KeyPrintScreen = scanCodeToKeyCode(70), - KeyAltErase = scanCodeToKeyCode(153), - KeySysReq = scanCodeToKeyCode(154), - KeyClear = scanCodeToKeyCode(159), - KeyMenu = scanCodeToKeyCode(118), - KeyPower = scanCodeToKeyCode(102), - KeyUndo = scanCodeToKeyCode(122), + Help = scanCodeToKeyCode(117), + PrintScreen = scanCodeToKeyCode(70), + AltErase = scanCodeToKeyCode(153), + SysReq = scanCodeToKeyCode(154), + Clear = scanCodeToKeyCode(159), + Menu = scanCodeToKeyCode(118), + Power = scanCodeToKeyCode(102), + Undo = scanCodeToKeyCode(122), // Audio Control - KeyMute = scanCodeToKeyCode(127), - KeyVolumeUp = scanCodeToKeyCode(128), - KeyVolumeDown = scanCodeToKeyCode(129), - KeyAudioNext = scanCodeToKeyCode(258), - KeyAudioPrev = scanCodeToKeyCode(259), - KeyAudioStop = scanCodeToKeyCode(260), - KeyAudioPlay = scanCodeToKeyCode(261), - KeyAudioMute = scanCodeToKeyCode(262), + Mute = scanCodeToKeyCode(127), + VolumeUp = scanCodeToKeyCode(128), + VolumeDown = scanCodeToKeyCode(129), + AudioNext = scanCodeToKeyCode(258), + AudioPrev = scanCodeToKeyCode(259), + AudioStop = scanCodeToKeyCode(260), + AudioPlay = scanCodeToKeyCode(261), + AudioMute = scanCodeToKeyCode(262), - KeyLast, + Last, }; } diff --git a/test-graphics/TestGraphics.cpp b/test-graphics/TestGraphics.cpp index 73bb6f66..acab6346 100644 --- a/test-graphics/TestGraphics.cpp +++ b/test-graphics/TestGraphics.cpp @@ -119,16 +119,16 @@ void TestGraphics::onKeyDown(NAS2D::KeyCode key, NAS2D::KeyModifier /*mod*/, boo { switch (key) { - case NAS2D::KeyCode::KeyEscape: + case NAS2D::KeyCode::Escape: NAS2D::postQuitEvent(); break; - case NAS2D::KeyCode::KeyF1: + case NAS2D::KeyCode::F1: { auto& renderer = NAS2D::Utility::get(); renderer.fullscreen(!renderer.fullscreen()); break; } - case NAS2D::KeyCode::KeyF2: + case NAS2D::KeyCode::F2: { auto& renderer = NAS2D::Utility::get(); renderer.resizeable(!renderer.resizeable());