Use "enum class" for input enums

3 files changed, 639 insertions, 627 deletions

diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp
index 4c5f0b5220..fdc43da7a5 100644
--- a/core/os/keyboard.cpp
+++ b/core/os/keyboard.cpp
@@ -33,400 +33,399 @@
 #include "core/os/os.h"
 
 struct _KeyCodeText {
-	int code;
+	Key code;
 	const char *text;
 };
 
 static const _KeyCodeText _keycodes[] = {
 	/* clang-format off */
-		{KEY_ESCAPE                        ,"Escape"},
-		{KEY_TAB                           ,"Tab"},
-		{KEY_BACKTAB                       ,"BackTab"},
-		{KEY_BACKSPACE                     ,"BackSpace"},
-		{KEY_ENTER                         ,"Enter"},
-		{KEY_KP_ENTER                      ,"Kp Enter"},
-		{KEY_INSERT                        ,"Insert"},
-		{KEY_DELETE                        ,"Delete"},
-		{KEY_PAUSE                         ,"Pause"},
-		{KEY_PRINT                         ,"Print"},
-		{KEY_SYSREQ                        ,"SysReq"},
-		{KEY_CLEAR                         ,"Clear"},
-		{KEY_HOME                          ,"Home"},
-		{KEY_END                           ,"End"},
-		{KEY_LEFT                          ,"Left"},
-		{KEY_UP                            ,"Up"},
-		{KEY_RIGHT                         ,"Right"},
-		{KEY_DOWN                          ,"Down"},
-		{KEY_PAGEUP                        ,"PageUp"},
-		{KEY_PAGEDOWN                      ,"PageDown"},
-		{KEY_SHIFT                         ,"Shift"},
-		{KEY_CTRL                          ,"Ctrl"},
+	{Key::ESCAPE                ,"Escape"},
+	{Key::TAB                   ,"Tab"},
+	{Key::BACKTAB               ,"BackTab"},
+	{Key::BACKSPACE             ,"BackSpace"},
+	{Key::ENTER                 ,"Enter"},
+	{Key::KP_ENTER              ,"Kp Enter"},
+	{Key::INSERT                ,"Insert"},
+	{Key::KEY_DELETE            ,"Delete"},
+	{Key::PAUSE                 ,"Pause"},
+	{Key::PRINT                 ,"Print"},
+	{Key::SYSREQ                ,"SysReq"},
+	{Key::CLEAR                 ,"Clear"},
+	{Key::HOME                  ,"Home"},
+	{Key::END                   ,"End"},
+	{Key::LEFT                  ,"Left"},
+	{Key::UP                    ,"Up"},
+	{Key::RIGHT                 ,"Right"},
+	{Key::DOWN                  ,"Down"},
+	{Key::PAGEUP                ,"PageUp"},
+	{Key::PAGEDOWN              ,"PageDown"},
+	{Key::SHIFT                 ,"Shift"},
+	{Key::CTRL                  ,"Ctrl"},
 #ifdef OSX_ENABLED
-		{KEY_META                          ,"Command"},
+	{Key::META                  ,"Command"},
 #else
-		{KEY_META                          ,"Meta"},
+	{Key::META                  ,"Meta"},
 #endif
-		{KEY_ALT                           ,"Alt"},
-		{KEY_CAPSLOCK                      ,"CapsLock"},
-		{KEY_NUMLOCK                       ,"NumLock"},
-		{KEY_SCROLLLOCK                    ,"ScrollLock"},
-		{KEY_F1                            ,"F1"},
-		{KEY_F2                            ,"F2"},
-		{KEY_F3                            ,"F3"},
-		{KEY_F4                            ,"F4"},
-		{KEY_F5                            ,"F5"},
-		{KEY_F6                            ,"F6"},
-		{KEY_F7                            ,"F7"},
-		{KEY_F8                            ,"F8"},
-		{KEY_F9                            ,"F9"},
-		{KEY_F10                           ,"F10"},
-		{KEY_F11                           ,"F11"},
-		{KEY_F12                           ,"F12"},
-		{KEY_F13                           ,"F13"},
-		{KEY_F14                           ,"F14"},
-		{KEY_F15                           ,"F15"},
-		{KEY_F16                           ,"F16"},
-		{KEY_KP_MULTIPLY                   ,"Kp Multiply"},
-		{KEY_KP_DIVIDE                     ,"Kp Divide"},
-		{KEY_KP_SUBTRACT                   ,"Kp Subtract"},
-		{KEY_KP_PERIOD                     ,"Kp Period"},
-		{KEY_KP_ADD                        ,"Kp Add"},
-		{KEY_KP_0                          ,"Kp 0"},
-		{KEY_KP_1                          ,"Kp 1"},
-		{KEY_KP_2                          ,"Kp 2"},
-		{KEY_KP_3                          ,"Kp 3"},
-		{KEY_KP_4                          ,"Kp 4"},
-		{KEY_KP_5                          ,"Kp 5"},
-		{KEY_KP_6                          ,"Kp 6"},
-		{KEY_KP_7                          ,"Kp 7"},
-		{KEY_KP_8                          ,"Kp 8"},
-		{KEY_KP_9                          ,"Kp 9"},
-		{KEY_SUPER_L                       ,"Super L"},
-		{KEY_SUPER_R                       ,"Super R"},
-		{KEY_MENU                          ,"Menu"},
-		{KEY_HYPER_L                       ,"Hyper L"},
-		{KEY_HYPER_R                       ,"Hyper R"},
-		{KEY_HELP                          ,"Help"},
-		{KEY_DIRECTION_L                   ,"Direction L"},
-		{KEY_DIRECTION_R                   ,"Direction R"},
-		{KEY_BACK                          ,"Back"},
-		{KEY_FORWARD                       ,"Forward"},
-		{KEY_STOP                          ,"Stop"},
-		{KEY_REFRESH                       ,"Refresh"},
-		{KEY_VOLUMEDOWN                    ,"VolumeDown"},
-		{KEY_VOLUMEMUTE                    ,"VolumeMute"},
-		{KEY_VOLUMEUP                      ,"VolumeUp"},
-		{KEY_BASSBOOST                     ,"BassBoost"},
-		{KEY_BASSUP                        ,"BassUp"},
-		{KEY_BASSDOWN                      ,"BassDown"},
-		{KEY_TREBLEUP                      ,"TrebleUp"},
-		{KEY_TREBLEDOWN                    ,"TrebleDown"},
-		{KEY_MEDIAPLAY                     ,"MediaPlay"},
-		{KEY_MEDIASTOP                     ,"MediaStop"},
-		{KEY_MEDIAPREVIOUS                 ,"MediaPrevious"},
-		{KEY_MEDIANEXT                     ,"MediaNext"},
-		{KEY_MEDIARECORD                   ,"MediaRecord"},
-		{KEY_HOMEPAGE                      ,"HomePage"},
-		{KEY_FAVORITES                     ,"Favorites"},
-		{KEY_SEARCH                        ,"Search"},
-		{KEY_STANDBY                       ,"StandBy"},
-		{KEY_LAUNCHMAIL                    ,"LaunchMail"},
-		{KEY_LAUNCHMEDIA                   ,"LaunchMedia"},
-		{KEY_LAUNCH0                       ,"Launch0"},
-		{KEY_LAUNCH1                       ,"Launch1"},
-		{KEY_LAUNCH2                       ,"Launch2"},
-		{KEY_LAUNCH3                       ,"Launch3"},
-		{KEY_LAUNCH4                       ,"Launch4"},
-		{KEY_LAUNCH5                       ,"Launch5"},
-		{KEY_LAUNCH6                       ,"Launch6"},
-		{KEY_LAUNCH7                       ,"Launch7"},
-		{KEY_LAUNCH8                       ,"Launch8"},
-		{KEY_LAUNCH9                       ,"Launch9"},
-		{KEY_LAUNCHA                       ,"LaunchA"},
-		{KEY_LAUNCHB                       ,"LaunchB"},
-		{KEY_LAUNCHC                       ,"LaunchC"},
-		{KEY_LAUNCHD                       ,"LaunchD"},
-		{KEY_LAUNCHE                       ,"LaunchE"},
-		{KEY_LAUNCHF                       ,"LaunchF"},
-
-		{KEY_UNKNOWN                       ,"Unknown"},
-
-		{KEY_SPACE                         ,"Space"},
-		{KEY_EXCLAM                        ,"Exclam"},
-		{KEY_QUOTEDBL                      ,"QuoteDbl"},
-		{KEY_NUMBERSIGN                    ,"NumberSign"},
-		{KEY_DOLLAR                        ,"Dollar"},
-		{KEY_PERCENT                       ,"Percent"},
-		{KEY_AMPERSAND                     ,"Ampersand"},
-		{KEY_APOSTROPHE                    ,"Apostrophe"},
-		{KEY_PARENLEFT                     ,"ParenLeft"},
-		{KEY_PARENRIGHT                    ,"ParenRight"},
-		{KEY_ASTERISK                      ,"Asterisk"},
-		{KEY_PLUS                          ,"Plus"},
-		{KEY_COMMA                         ,"Comma"},
-		{KEY_MINUS                         ,"Minus"},
-		{KEY_PERIOD                        ,"Period"},
-		{KEY_SLASH                         ,"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                         ,"Colon"},
-		{KEY_SEMICOLON                     ,"Semicolon"},
-		{KEY_LESS                          ,"Less"},
-		{KEY_EQUAL                         ,"Equal"},
-		{KEY_GREATER                       ,"Greater"},
-		{KEY_QUESTION                      ,"Question"},
-		{KEY_AT                            ,"At"},
-		{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"},
-		{KEY_BRACKETLEFT                   ,"BracketLeft"},
-		{KEY_BACKSLASH                     ,"BackSlash"},
-		{KEY_BRACKETRIGHT                  ,"BracketRight"},
-		{KEY_ASCIICIRCUM                   ,"AsciiCircum"},
-		{KEY_UNDERSCORE                    ,"UnderScore"},
-		{KEY_QUOTELEFT                     ,"QuoteLeft"},
-		{KEY_BRACELEFT                     ,"BraceLeft"},
-		{KEY_BAR                           ,"Bar"},
-		{KEY_BRACERIGHT                    ,"BraceRight"},
-		{KEY_ASCIITILDE                    ,"AsciiTilde"},
-		{KEY_NOBREAKSPACE                  ,"NoBreakSpace"},
-		{KEY_EXCLAMDOWN                    ,"ExclamDown"},
-		{KEY_CENT                          ,"Cent"},
-		{KEY_STERLING                      ,"Sterling"},
-		{KEY_CURRENCY                      ,"Currency"},
-		{KEY_YEN                           ,"Yen"},
-		{KEY_BROKENBAR                     ,"BrokenBar"},
-		{KEY_SECTION                       ,"Section"},
-		{KEY_DIAERESIS                     ,"Diaeresis"},
-		{KEY_COPYRIGHT                     ,"Copyright"},
-		{KEY_ORDFEMININE                   ,"Ordfeminine"},
-		{KEY_GUILLEMOTLEFT                 ,"GuillemotLeft"},
-		{KEY_NOTSIGN                       ,"NotSign"},
-		{KEY_HYPHEN                        ,"Hyphen"},
-		{KEY_REGISTERED                    ,"Registered"},
-		{KEY_MACRON                        ,"Macron"},
-		{KEY_DEGREE                        ,"Degree"},
-		{KEY_PLUSMINUS                     ,"PlusMinus"},
-		{KEY_TWOSUPERIOR                   ,"TwoSuperior"},
-		{KEY_THREESUPERIOR                 ,"ThreeSuperior"},
-		{KEY_ACUTE                         ,"Acute"},
-		{KEY_MU                            ,"Mu"},
-		{KEY_PARAGRAPH                     ,"Paragraph"},
-		{KEY_PERIODCENTERED                ,"PeriodCentered"},
-		{KEY_CEDILLA                       ,"Cedilla"},
-		{KEY_ONESUPERIOR                   ,"OneSuperior"},
-		{KEY_MASCULINE                     ,"Masculine"},
-		{KEY_GUILLEMOTRIGHT                ,"GuillemotRight"},
-		{KEY_ONEQUARTER                    ,"OneQuarter"},
-		{KEY_ONEHALF                       ,"OneHalf"},
-		{KEY_THREEQUARTERS                 ,"ThreeQuarters"},
-		{KEY_QUESTIONDOWN                  ,"QuestionDown"},
-		{KEY_AGRAVE                        ,"Agrave"},
-		{KEY_AACUTE                        ,"Aacute"},
-		{KEY_ACIRCUMFLEX                   ,"AcircumFlex"},
-		{KEY_ATILDE                        ,"Atilde"},
-		{KEY_ADIAERESIS                    ,"Adiaeresis"},
-		{KEY_ARING                         ,"Aring"},
-		{KEY_AE                            ,"Ae"},
-		{KEY_CCEDILLA                      ,"Ccedilla"},
-		{KEY_EGRAVE                        ,"Egrave"},
-		{KEY_EACUTE                        ,"Eacute"},
-		{KEY_ECIRCUMFLEX                   ,"Ecircumflex"},
-		{KEY_EDIAERESIS                    ,"Ediaeresis"},
-		{KEY_IGRAVE                        ,"Igrave"},
-		{KEY_IACUTE                        ,"Iacute"},
-		{KEY_ICIRCUMFLEX                   ,"Icircumflex"},
-		{KEY_IDIAERESIS                    ,"Idiaeresis"},
-		{KEY_ETH                           ,"Eth"},
-		{KEY_NTILDE                        ,"Ntilde"},
-		{KEY_OGRAVE                        ,"Ograve"},
-		{KEY_OACUTE                        ,"Oacute"},
-		{KEY_OCIRCUMFLEX                   ,"Ocircumflex"},
-		{KEY_OTILDE                        ,"Otilde"},
-		{KEY_ODIAERESIS                    ,"Odiaeresis"},
-		{KEY_MULTIPLY                      ,"Multiply"},
-		{KEY_OOBLIQUE                      ,"Ooblique"},
-		{KEY_UGRAVE                        ,"Ugrave"},
-		{KEY_UACUTE                        ,"Uacute"},
-		{KEY_UCIRCUMFLEX                   ,"Ucircumflex"},
-		{KEY_UDIAERESIS                    ,"Udiaeresis"},
-		{KEY_YACUTE                        ,"Yacute"},
-		{KEY_THORN                         ,"Thorn"},
-		{KEY_SSHARP                        ,"Ssharp"},
-
-		{KEY_DIVISION                      ,"Division"},
-		{KEY_YDIAERESIS                    ,"Ydiaeresis"},
-		{0                                 ,nullptr}
+	{Key::ALT                   ,"Alt"},
+	{Key::CAPSLOCK              ,"CapsLock"},
+	{Key::NUMLOCK               ,"NumLock"},
+	{Key::SCROLLLOCK            ,"ScrollLock"},
+	{Key::F1                    ,"F1"},
+	{Key::F2                    ,"F2"},
+	{Key::F3                    ,"F3"},
+	{Key::F4                    ,"F4"},
+	{Key::F5                    ,"F5"},
+	{Key::F6                    ,"F6"},
+	{Key::F7                    ,"F7"},
+	{Key::F8                    ,"F8"},
+	{Key::F9                    ,"F9"},
+	{Key::F10                   ,"F10"},
+	{Key::F11                   ,"F11"},
+	{Key::F12                   ,"F12"},
+	{Key::F13                   ,"F13"},
+	{Key::F14                   ,"F14"},
+	{Key::F15                   ,"F15"},
+	{Key::F16                   ,"F16"},
+	{Key::KP_MULTIPLY           ,"Kp Multiply"},
+	{Key::KP_DIVIDE             ,"Kp Divide"},
+	{Key::KP_SUBTRACT           ,"Kp Subtract"},
+	{Key::KP_PERIOD             ,"Kp Period"},
+	{Key::KP_ADD                ,"Kp Add"},
+	{Key::KP_0                  ,"Kp 0"},
+	{Key::KP_1                  ,"Kp 1"},
+	{Key::KP_2                  ,"Kp 2"},
+	{Key::KP_3                  ,"Kp 3"},
+	{Key::KP_4                  ,"Kp 4"},
+	{Key::KP_5                  ,"Kp 5"},
+	{Key::KP_6                  ,"Kp 6"},
+	{Key::KP_7                  ,"Kp 7"},
+	{Key::KP_8                  ,"Kp 8"},
+	{Key::KP_9                  ,"Kp 9"},
+	{Key::SUPER_L               ,"Super L"},
+	{Key::SUPER_R               ,"Super R"},
+	{Key::MENU                  ,"Menu"},
+	{Key::HYPER_L               ,"Hyper L"},
+	{Key::HYPER_R               ,"Hyper R"},
+	{Key::HELP                  ,"Help"},
+	{Key::DIRECTION_L           ,"Direction L"},
+	{Key::DIRECTION_R           ,"Direction R"},
+	{Key::BACK                  ,"Back"},
+	{Key::FORWARD               ,"Forward"},
+	{Key::STOP                  ,"Stop"},
+	{Key::REFRESH               ,"Refresh"},
+	{Key::VOLUMEDOWN            ,"VolumeDown"},
+	{Key::VOLUMEMUTE            ,"VolumeMute"},
+	{Key::VOLUMEUP              ,"VolumeUp"},
+	{Key::BASSBOOST             ,"BassBoost"},
+	{Key::BASSUP                ,"BassUp"},
+	{Key::BASSDOWN              ,"BassDown"},
+	{Key::TREBLEUP              ,"TrebleUp"},
+	{Key::TREBLEDOWN            ,"TrebleDown"},
+	{Key::MEDIAPLAY             ,"MediaPlay"},
+	{Key::MEDIASTOP             ,"MediaStop"},
+	{Key::MEDIAPREVIOUS         ,"MediaPrevious"},
+	{Key::MEDIANEXT             ,"MediaNext"},
+	{Key::MEDIARECORD           ,"MediaRecord"},
+	{Key::HOMEPAGE              ,"HomePage"},
+	{Key::FAVORITES             ,"Favorites"},
+	{Key::SEARCH                ,"Search"},
+	{Key::STANDBY               ,"StandBy"},
+	{Key::LAUNCHMAIL            ,"LaunchMail"},
+	{Key::LAUNCHMEDIA           ,"LaunchMedia"},
+	{Key::LAUNCH0               ,"Launch0"},
+	{Key::LAUNCH1               ,"Launch1"},
+	{Key::LAUNCH2               ,"Launch2"},
+	{Key::LAUNCH3               ,"Launch3"},
+	{Key::LAUNCH4               ,"Launch4"},
+	{Key::LAUNCH5               ,"Launch5"},
+	{Key::LAUNCH6               ,"Launch6"},
+	{Key::LAUNCH7               ,"Launch7"},
+	{Key::LAUNCH8               ,"Launch8"},
+	{Key::LAUNCH9               ,"Launch9"},
+	{Key::LAUNCHA               ,"LaunchA"},
+	{Key::LAUNCHB               ,"LaunchB"},
+	{Key::LAUNCHC               ,"LaunchC"},
+	{Key::LAUNCHD               ,"LaunchD"},
+	{Key::LAUNCHE               ,"LaunchE"},
+	{Key::LAUNCHF               ,"LaunchF"},
+	{Key::UNKNOWN               ,"Unknown"},
+	{Key::SPACE                 ,"Space"},
+	{Key::EXCLAM                ,"Exclam"},
+	{Key::QUOTEDBL              ,"QuoteDbl"},
+	{Key::NUMBERSIGN            ,"NumberSign"},
+	{Key::DOLLAR                ,"Dollar"},
+	{Key::PERCENT               ,"Percent"},
+	{Key::AMPERSAND             ,"Ampersand"},
+	{Key::APOSTROPHE            ,"Apostrophe"},
+	{Key::PARENLEFT             ,"ParenLeft"},
+	{Key::PARENRIGHT            ,"ParenRight"},
+	{Key::ASTERISK              ,"Asterisk"},
+	{Key::PLUS                  ,"Plus"},
+	{Key::COMMA                 ,"Comma"},
+	{Key::MINUS                 ,"Minus"},
+	{Key::PERIOD                ,"Period"},
+	{Key::SLASH                 ,"Slash"},
+	{Key::KEY_0                 ,"0"},
+	{Key::KEY_1                 ,"1"},
+	{Key::KEY_2                 ,"2"},
+	{Key::KEY_3                 ,"3"},
+	{Key::KEY_4                 ,"4"},
+	{Key::KEY_5                 ,"5"},
+	{Key::KEY_6                 ,"6"},
+	{Key::KEY_7                 ,"7"},
+	{Key::KEY_8                 ,"8"},
+	{Key::KEY_9                 ,"9"},
+	{Key::COLON                 ,"Colon"},
+	{Key::SEMICOLON             ,"Semicolon"},
+	{Key::LESS                  ,"Less"},
+	{Key::EQUAL                 ,"Equal"},
+	{Key::GREATER               ,"Greater"},
+	{Key::QUESTION              ,"Question"},
+	{Key::AT                    ,"At"},
+	{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"},
+	{Key::BRACKETLEFT           ,"BracketLeft"},
+	{Key::BACKSLASH             ,"BackSlash"},
+	{Key::BRACKETRIGHT          ,"BracketRight"},
+	{Key::ASCIICIRCUM           ,"AsciiCircum"},
+	{Key::UNDERSCORE            ,"UnderScore"},
+	{Key::QUOTELEFT             ,"QuoteLeft"},
+	{Key::BRACELEFT             ,"BraceLeft"},
+	{Key::BAR                   ,"Bar"},
+	{Key::BRACERIGHT            ,"BraceRight"},
+	{Key::ASCIITILDE            ,"AsciiTilde"},
+	{Key::NOBREAKSPACE          ,"NoBreakSpace"},
+	{Key::EXCLAMDOWN            ,"ExclamDown"},
+	{Key::CENT                  ,"Cent"},
+	{Key::STERLING              ,"Sterling"},
+	{Key::CURRENCY              ,"Currency"},
+	{Key::YEN                   ,"Yen"},
+	{Key::BROKENBAR             ,"BrokenBar"},
+	{Key::SECTION               ,"Section"},
+	{Key::DIAERESIS             ,"Diaeresis"},
+	{Key::COPYRIGHT             ,"Copyright"},
+	{Key::ORDFEMININE           ,"Ordfeminine"},
+	{Key::GUILLEMOTLEFT         ,"GuillemotLeft"},
+	{Key::NOTSIGN               ,"NotSign"},
+	{Key::HYPHEN                ,"Hyphen"},
+	{Key::KEY_REGISTERED        ,"Registered"},
+	{Key::MACRON                ,"Macron"},
+	{Key::DEGREE                ,"Degree"},
+	{Key::PLUSMINUS             ,"PlusMinus"},
+	{Key::TWOSUPERIOR           ,"TwoSuperior"},
+	{Key::THREESUPERIOR         ,"ThreeSuperior"},
+	{Key::ACUTE                 ,"Acute"},
+	{Key::MU                    ,"Mu"},
+	{Key::PARAGRAPH             ,"Paragraph"},
+	{Key::PERIODCENTERED        ,"PeriodCentered"},
+	{Key::CEDILLA               ,"Cedilla"},
+	{Key::ONESUPERIOR           ,"OneSuperior"},
+	{Key::MASCULINE             ,"Masculine"},
+	{Key::GUILLEMOTRIGHT        ,"GuillemotRight"},
+	{Key::ONEQUARTER            ,"OneQuarter"},
+	{Key::ONEHALF               ,"OneHalf"},
+	{Key::THREEQUARTERS         ,"ThreeQuarters"},
+	{Key::QUESTIONDOWN          ,"QuestionDown"},
+	{Key::AGRAVE                ,"Agrave"},
+	{Key::AACUTE                ,"Aacute"},
+	{Key::ACIRCUMFLEX           ,"AcircumFlex"},
+	{Key::ATILDE                ,"Atilde"},
+	{Key::ADIAERESIS            ,"Adiaeresis"},
+	{Key::ARING                 ,"Aring"},
+	{Key::AE                    ,"Ae"},
+	{Key::CCEDILLA              ,"Ccedilla"},
+	{Key::EGRAVE                ,"Egrave"},
+	{Key::EACUTE                ,"Eacute"},
+	{Key::ECIRCUMFLEX           ,"Ecircumflex"},
+	{Key::EDIAERESIS            ,"Ediaeresis"},
+	{Key::IGRAVE                ,"Igrave"},
+	{Key::IACUTE                ,"Iacute"},
+	{Key::ICIRCUMFLEX           ,"Icircumflex"},
+	{Key::IDIAERESIS            ,"Idiaeresis"},
+	{Key::ETH                   ,"Eth"},
+	{Key::NTILDE                ,"Ntilde"},
+	{Key::OGRAVE                ,"Ograve"},
+	{Key::OACUTE                ,"Oacute"},
+	{Key::OCIRCUMFLEX           ,"Ocircumflex"},
+	{Key::OTILDE                ,"Otilde"},
+	{Key::ODIAERESIS            ,"Odiaeresis"},
+	{Key::MULTIPLY              ,"Multiply"},
+	{Key::OOBLIQUE              ,"Ooblique"},
+	{Key::UGRAVE                ,"Ugrave"},
+	{Key::UACUTE                ,"Uacute"},
+	{Key::UCIRCUMFLEX           ,"Ucircumflex"},
+	{Key::UDIAERESIS            ,"Udiaeresis"},
+	{Key::YACUTE                ,"Yacute"},
+	{Key::THORN                 ,"Thorn"},
+	{Key::SSHARP                ,"Ssharp"},
+	{Key::DIVISION              ,"Division"},
+	{Key::YDIAERESIS            ,"Ydiaeresis"},
+	{Key::NONE                  ,nullptr}
 	/* clang-format on */
 };
 
-bool keycode_has_unicode(uint32_t p_keycode) {
+bool keycode_has_unicode(Key p_keycode) {
 	switch (p_keycode) {
-		case KEY_ESCAPE:
-		case KEY_TAB:
-		case KEY_BACKTAB:
-		case KEY_BACKSPACE:
-		case KEY_ENTER:
-		case KEY_KP_ENTER:
-		case KEY_INSERT:
-		case KEY_DELETE:
-		case KEY_PAUSE:
-		case KEY_PRINT:
-		case KEY_SYSREQ:
-		case KEY_CLEAR:
-		case KEY_HOME:
-		case KEY_END:
-		case KEY_LEFT:
-		case KEY_UP:
-		case KEY_RIGHT:
-		case KEY_DOWN:
-		case KEY_PAGEUP:
-		case KEY_PAGEDOWN:
-		case KEY_SHIFT:
-		case KEY_CTRL:
-		case KEY_META:
-		case KEY_ALT:
-		case KEY_CAPSLOCK:
-		case KEY_NUMLOCK:
-		case KEY_SCROLLLOCK:
-		case KEY_F1:
-		case KEY_F2:
-		case KEY_F3:
-		case KEY_F4:
-		case KEY_F5:
-		case KEY_F6:
-		case KEY_F7:
-		case KEY_F8:
-		case KEY_F9:
-		case KEY_F10:
-		case KEY_F11:
-		case KEY_F12:
-		case KEY_F13:
-		case KEY_F14:
-		case KEY_F15:
-		case KEY_F16:
-		case KEY_SUPER_L:
-		case KEY_SUPER_R:
-		case KEY_MENU:
-		case KEY_HYPER_L:
-		case KEY_HYPER_R:
-		case KEY_HELP:
-		case KEY_DIRECTION_L:
-		case KEY_DIRECTION_R:
-		case KEY_BACK:
-		case KEY_FORWARD:
-		case KEY_STOP:
-		case KEY_REFRESH:
-		case KEY_VOLUMEDOWN:
-		case KEY_VOLUMEMUTE:
-		case KEY_VOLUMEUP:
-		case KEY_BASSBOOST:
-		case KEY_BASSUP:
-		case KEY_BASSDOWN:
-		case KEY_TREBLEUP:
-		case KEY_TREBLEDOWN:
-		case KEY_MEDIAPLAY:
-		case KEY_MEDIASTOP:
-		case KEY_MEDIAPREVIOUS:
-		case KEY_MEDIANEXT:
-		case KEY_MEDIARECORD:
-		case KEY_HOMEPAGE:
-		case KEY_FAVORITES:
-		case KEY_SEARCH:
-		case KEY_STANDBY:
-		case KEY_OPENURL:
-		case KEY_LAUNCHMAIL:
-		case KEY_LAUNCHMEDIA:
-		case KEY_LAUNCH0:
-		case KEY_LAUNCH1:
-		case KEY_LAUNCH2:
-		case KEY_LAUNCH3:
-		case KEY_LAUNCH4:
-		case KEY_LAUNCH5:
-		case KEY_LAUNCH6:
-		case KEY_LAUNCH7:
-		case KEY_LAUNCH8:
-		case KEY_LAUNCH9:
-		case KEY_LAUNCHA:
-		case KEY_LAUNCHB:
-		case KEY_LAUNCHC:
-		case KEY_LAUNCHD:
-		case KEY_LAUNCHE:
-		case KEY_LAUNCHF:
+		case Key::ESCAPE:
+		case Key::TAB:
+		case Key::BACKTAB:
+		case Key::BACKSPACE:
+		case Key::ENTER:
+		case Key::KP_ENTER:
+		case Key::INSERT:
+		case Key::KEY_DELETE:
+		case Key::PAUSE:
+		case Key::PRINT:
+		case Key::SYSREQ:
+		case Key::CLEAR:
+		case Key::HOME:
+		case Key::END:
+		case Key::LEFT:
+		case Key::UP:
+		case Key::RIGHT:
+		case Key::DOWN:
+		case Key::PAGEUP:
+		case Key::PAGEDOWN:
+		case Key::SHIFT:
+		case Key::CTRL:
+		case Key::META:
+		case Key::ALT:
+		case Key::CAPSLOCK:
+		case Key::NUMLOCK:
+		case Key::SCROLLLOCK:
+		case Key::F1:
+		case Key::F2:
+		case Key::F3:
+		case Key::F4:
+		case Key::F5:
+		case Key::F6:
+		case Key::F7:
+		case Key::F8:
+		case Key::F9:
+		case Key::F10:
+		case Key::F11:
+		case Key::F12:
+		case Key::F13:
+		case Key::F14:
+		case Key::F15:
+		case Key::F16:
+		case Key::SUPER_L:
+		case Key::SUPER_R:
+		case Key::MENU:
+		case Key::HYPER_L:
+		case Key::HYPER_R:
+		case Key::HELP:
+		case Key::DIRECTION_L:
+		case Key::DIRECTION_R:
+		case Key::BACK:
+		case Key::FORWARD:
+		case Key::STOP:
+		case Key::REFRESH:
+		case Key::VOLUMEDOWN:
+		case Key::VOLUMEMUTE:
+		case Key::VOLUMEUP:
+		case Key::BASSBOOST:
+		case Key::BASSUP:
+		case Key::BASSDOWN:
+		case Key::TREBLEUP:
+		case Key::TREBLEDOWN:
+		case Key::MEDIAPLAY:
+		case Key::MEDIASTOP:
+		case Key::MEDIAPREVIOUS:
+		case Key::MEDIANEXT:
+		case Key::MEDIARECORD:
+		case Key::HOMEPAGE:
+		case Key::FAVORITES:
+		case Key::SEARCH:
+		case Key::STANDBY:
+		case Key::OPENURL:
+		case Key::LAUNCHMAIL:
+		case Key::LAUNCHMEDIA:
+		case Key::LAUNCH0:
+		case Key::LAUNCH1:
+		case Key::LAUNCH2:
+		case Key::LAUNCH3:
+		case Key::LAUNCH4:
+		case Key::LAUNCH5:
+		case Key::LAUNCH6:
+		case Key::LAUNCH7:
+		case Key::LAUNCH8:
+		case Key::LAUNCH9:
+		case Key::LAUNCHA:
+		case Key::LAUNCHB:
+		case Key::LAUNCHC:
+		case Key::LAUNCHD:
+		case Key::LAUNCHE:
+		case Key::LAUNCHF:
 			return false;
+		default: {
+		}
 	}
 
 	return true;
 }
 
-String keycode_get_string(uint32_t p_code) {
+String keycode_get_string(Key p_code) {
 	String codestr;
-	if (p_code & KEY_MASK_SHIFT) {
-		codestr += find_keycode_name(KEY_SHIFT);
+	if ((p_code & KeyModifierMask::SHIFT) != Key::NONE) {
+		codestr += find_keycode_name(Key::SHIFT);
 		codestr += "+";
 	}
-	if (p_code & KEY_MASK_ALT) {
-		codestr += find_keycode_name(KEY_ALT);
+	if ((p_code & KeyModifierMask::ALT) != Key::NONE) {
+		codestr += find_keycode_name(Key::ALT);
 		codestr += "+";
 	}
-	if (p_code & KEY_MASK_CTRL) {
-		codestr += find_keycode_name(KEY_CTRL);
+	if ((p_code & KeyModifierMask::CTRL) != Key::NONE) {
+		codestr += find_keycode_name(Key::CTRL);
 		codestr += "+";
 	}
-	if (p_code & KEY_MASK_META) {
-		codestr += find_keycode_name(KEY_META);
+	if ((p_code & KeyModifierMask::META) != Key::NONE) {
+		codestr += find_keycode_name(Key::META);
 		codestr += "+";
 	}
 
-	p_code &= KEY_CODE_MASK;
+	p_code &= KeyModifierMask::CODE_MASK;
 
 	const _KeyCodeText *kct = &_keycodes[0];
 
 	while (kct->text) {
-		if (kct->code == (int)p_code) {
+		if (kct->code == p_code) {
 			codestr += kct->text;
 			return codestr;
 		}
 		kct++;
 	}
 
-	codestr += String::chr(p_code);
+	codestr += String::chr((char32_t)p_code);
 
 	return codestr;
 }
 
-int find_keycode(const String &p_code) {
+Key find_keycode(const String &p_code) {
 	const _KeyCodeText *kct = &_keycodes[0];
 
 	while (kct->text) {
@@ -436,10 +435,10 @@ int find_keycode(const String &p_code) {
 		kct++;
 	}
 
-	return 0;
+	return Key::NONE;
 }
 
-const char *find_keycode_name(int p_keycode) {
+const char *find_keycode_name(Key p_keycode) {
 	const _KeyCodeText *kct = &_keycodes[0];
 
 	while (kct->text) {
@@ -464,7 +463,7 @@ int keycode_get_count() {
 }
 
 int keycode_get_value_by_index(int p_index) {
-	return _keycodes[p_index].code;
+	return (int)_keycodes[p_index].code;
 }
 
 const char *keycode_get_name_by_index(int p_index) {
diff --git a/core/os/keyboard.h b/core/os/keyboard.h
index 52174432d9..c780099553 100644
--- a/core/os/keyboard.h
+++ b/core/os/keyboard.h
@@ -33,148 +33,142 @@
 
 #include "core/string/ustring.h"
 
-/*
-	Special Key:
-
-	The strategy here is similar to the one used by toolkits,
-	which consists in leaving the 24 bits unicode range for printable
-	characters, and use the upper 8 bits for special keys and
-	modifiers. This way everything (char/keycode) can fit nicely in one 32 bits unsigned integer.
-*/
-enum {
-	SPKEY = (1 << 24)
-};
-
-enum Key {
-	KEY_NONE = 0,
+enum class Key {
+	NONE = 0,
+	// Special key: The strategy here is similar to the one used by toolkits,
+	// which consists in leaving the 24 bits unicode range for printable
+	// characters, and use the upper 8 bits for special keys and modifiers.
+	// This way everything (char/keycode) can fit nicely in one 32-bit
+	// integer (the enum's underlying type is `int` by default).
+	SPECIAL = (1 << 24),
 	/* CURSOR/FUNCTION/BROWSER/MULTIMEDIA/MISC KEYS */
-	KEY_ESCAPE = SPKEY | 0x01,
-	KEY_TAB = SPKEY | 0x02,
-	KEY_BACKTAB = SPKEY | 0x03,
-	KEY_BACKSPACE = SPKEY | 0x04,
-	KEY_ENTER = SPKEY | 0x05,
-	KEY_KP_ENTER = SPKEY | 0x06,
-	KEY_INSERT = SPKEY | 0x07,
-	KEY_DELETE = SPKEY | 0x08,
-	KEY_PAUSE = SPKEY | 0x09,
-	KEY_PRINT = SPKEY | 0x0A,
-	KEY_SYSREQ = SPKEY | 0x0B,
-	KEY_CLEAR = SPKEY | 0x0C,
-	KEY_HOME = SPKEY | 0x0D,
-	KEY_END = SPKEY | 0x0E,
-	KEY_LEFT = SPKEY | 0x0F,
-	KEY_UP = SPKEY | 0x10,
-	KEY_RIGHT = SPKEY | 0x11,
-	KEY_DOWN = SPKEY | 0x12,
-	KEY_PAGEUP = SPKEY | 0x13,
-	KEY_PAGEDOWN = SPKEY | 0x14,
-	KEY_SHIFT = SPKEY | 0x15,
-	KEY_CTRL = SPKEY | 0x16,
-	KEY_META = SPKEY | 0x17,
-	KEY_ALT = SPKEY | 0x18,
-	KEY_CAPSLOCK = SPKEY | 0x19,
-	KEY_NUMLOCK = SPKEY | 0x1A,
-	KEY_SCROLLLOCK = SPKEY | 0x1B,
-	KEY_F1 = SPKEY | 0x1C,
-	KEY_F2 = SPKEY | 0x1D,
-	KEY_F3 = SPKEY | 0x1E,
-	KEY_F4 = SPKEY | 0x1F,
-	KEY_F5 = SPKEY | 0x20,
-	KEY_F6 = SPKEY | 0x21,
-	KEY_F7 = SPKEY | 0x22,
-	KEY_F8 = SPKEY | 0x23,
-	KEY_F9 = SPKEY | 0x24,
-	KEY_F10 = SPKEY | 0x25,
-	KEY_F11 = SPKEY | 0x26,
-	KEY_F12 = SPKEY | 0x27,
-	KEY_F13 = SPKEY | 0x28,
-	KEY_F14 = SPKEY | 0x29,
-	KEY_F15 = SPKEY | 0x2A,
-	KEY_F16 = SPKEY | 0x2B,
-	KEY_KP_MULTIPLY = SPKEY | 0x81,
-	KEY_KP_DIVIDE = SPKEY | 0x82,
-	KEY_KP_SUBTRACT = SPKEY | 0x83,
-	KEY_KP_PERIOD = SPKEY | 0x84,
-	KEY_KP_ADD = SPKEY | 0x85,
-	KEY_KP_0 = SPKEY | 0x86,
-	KEY_KP_1 = SPKEY | 0x87,
-	KEY_KP_2 = SPKEY | 0x88,
-	KEY_KP_3 = SPKEY | 0x89,
-	KEY_KP_4 = SPKEY | 0x8A,
-	KEY_KP_5 = SPKEY | 0x8B,
-	KEY_KP_6 = SPKEY | 0x8C,
-	KEY_KP_7 = SPKEY | 0x8D,
-	KEY_KP_8 = SPKEY | 0x8E,
-	KEY_KP_9 = SPKEY | 0x8F,
-	KEY_SUPER_L = SPKEY | 0x2C,
-	KEY_SUPER_R = SPKEY | 0x2D,
-	KEY_MENU = SPKEY | 0x2E,
-	KEY_HYPER_L = SPKEY | 0x2F,
-	KEY_HYPER_R = SPKEY | 0x30,
-	KEY_HELP = SPKEY | 0x31,
-	KEY_DIRECTION_L = SPKEY | 0x32,
-	KEY_DIRECTION_R = SPKEY | 0x33,
-	KEY_BACK = SPKEY | 0x40,
-	KEY_FORWARD = SPKEY | 0x41,
-	KEY_STOP = SPKEY | 0x42,
-	KEY_REFRESH = SPKEY | 0x43,
-	KEY_VOLUMEDOWN = SPKEY | 0x44,
-	KEY_VOLUMEMUTE = SPKEY | 0x45,
-	KEY_VOLUMEUP = SPKEY | 0x46,
-	KEY_BASSBOOST = SPKEY | 0x47,
-	KEY_BASSUP = SPKEY | 0x48,
-	KEY_BASSDOWN = SPKEY | 0x49,
-	KEY_TREBLEUP = SPKEY | 0x4A,
-	KEY_TREBLEDOWN = SPKEY | 0x4B,
-	KEY_MEDIAPLAY = SPKEY | 0x4C,
-	KEY_MEDIASTOP = SPKEY | 0x4D,
-	KEY_MEDIAPREVIOUS = SPKEY | 0x4E,
-	KEY_MEDIANEXT = SPKEY | 0x4F,
-	KEY_MEDIARECORD = SPKEY | 0x50,
-	KEY_HOMEPAGE = SPKEY | 0x51,
-	KEY_FAVORITES = SPKEY | 0x52,
-	KEY_SEARCH = SPKEY | 0x53,
-	KEY_STANDBY = SPKEY | 0x54,
-	KEY_OPENURL = SPKEY | 0x55,
-	KEY_LAUNCHMAIL = SPKEY | 0x56,
-	KEY_LAUNCHMEDIA = SPKEY | 0x57,
-	KEY_LAUNCH0 = SPKEY | 0x58,
-	KEY_LAUNCH1 = SPKEY | 0x59,
-	KEY_LAUNCH2 = SPKEY | 0x5A,
-	KEY_LAUNCH3 = SPKEY | 0x5B,
-	KEY_LAUNCH4 = SPKEY | 0x5C,
-	KEY_LAUNCH5 = SPKEY | 0x5D,
-	KEY_LAUNCH6 = SPKEY | 0x5E,
-	KEY_LAUNCH7 = SPKEY | 0x5F,
-	KEY_LAUNCH8 = SPKEY | 0x60,
-	KEY_LAUNCH9 = SPKEY | 0x61,
-	KEY_LAUNCHA = SPKEY | 0x62,
-	KEY_LAUNCHB = SPKEY | 0x63,
-	KEY_LAUNCHC = SPKEY | 0x64,
-	KEY_LAUNCHD = SPKEY | 0x65,
-	KEY_LAUNCHE = SPKEY | 0x66,
-	KEY_LAUNCHF = SPKEY | 0x67,
+	ESCAPE = SPECIAL | 0x01,
+	TAB = SPECIAL | 0x02,
+	BACKTAB = SPECIAL | 0x03,
+	BACKSPACE = SPECIAL | 0x04,
+	ENTER = SPECIAL | 0x05,
+	KP_ENTER = SPECIAL | 0x06,
+	INSERT = SPECIAL | 0x07,
+	KEY_DELETE = SPECIAL | 0x08, // "DELETE" is a reserved word on Windows.
+	PAUSE = SPECIAL | 0x09,
+	PRINT = SPECIAL | 0x0A,
+	SYSREQ = SPECIAL | 0x0B,
+	CLEAR = SPECIAL | 0x0C,
+	HOME = SPECIAL | 0x0D,
+	END = SPECIAL | 0x0E,
+	LEFT = SPECIAL | 0x0F,
+	UP = SPECIAL | 0x10,
+	RIGHT = SPECIAL | 0x11,
+	DOWN = SPECIAL | 0x12,
+	PAGEUP = SPECIAL | 0x13,
+	PAGEDOWN = SPECIAL | 0x14,
+	SHIFT = SPECIAL | 0x15,
+	CTRL = SPECIAL | 0x16,
+	META = SPECIAL | 0x17,
+	ALT = SPECIAL | 0x18,
+	CAPSLOCK = SPECIAL | 0x19,
+	NUMLOCK = SPECIAL | 0x1A,
+	SCROLLLOCK = SPECIAL | 0x1B,
+	F1 = SPECIAL | 0x1C,
+	F2 = SPECIAL | 0x1D,
+	F3 = SPECIAL | 0x1E,
+	F4 = SPECIAL | 0x1F,
+	F5 = SPECIAL | 0x20,
+	F6 = SPECIAL | 0x21,
+	F7 = SPECIAL | 0x22,
+	F8 = SPECIAL | 0x23,
+	F9 = SPECIAL | 0x24,
+	F10 = SPECIAL | 0x25,
+	F11 = SPECIAL | 0x26,
+	F12 = SPECIAL | 0x27,
+	F13 = SPECIAL | 0x28,
+	F14 = SPECIAL | 0x29,
+	F15 = SPECIAL | 0x2A,
+	F16 = SPECIAL | 0x2B,
+	KP_MULTIPLY = SPECIAL | 0x81,
+	KP_DIVIDE = SPECIAL | 0x82,
+	KP_SUBTRACT = SPECIAL | 0x83,
+	KP_PERIOD = SPECIAL | 0x84,
+	KP_ADD = SPECIAL | 0x85,
+	KP_0 = SPECIAL | 0x86,
+	KP_1 = SPECIAL | 0x87,
+	KP_2 = SPECIAL | 0x88,
+	KP_3 = SPECIAL | 0x89,
+	KP_4 = SPECIAL | 0x8A,
+	KP_5 = SPECIAL | 0x8B,
+	KP_6 = SPECIAL | 0x8C,
+	KP_7 = SPECIAL | 0x8D,
+	KP_8 = SPECIAL | 0x8E,
+	KP_9 = SPECIAL | 0x8F,
+	SUPER_L = SPECIAL | 0x2C,
+	SUPER_R = SPECIAL | 0x2D,
+	MENU = SPECIAL | 0x2E,
+	HYPER_L = SPECIAL | 0x2F,
+	HYPER_R = SPECIAL | 0x30,
+	HELP = SPECIAL | 0x31,
+	DIRECTION_L = SPECIAL | 0x32,
+	DIRECTION_R = SPECIAL | 0x33,
+	BACK = SPECIAL | 0x40,
+	FORWARD = SPECIAL | 0x41,
+	STOP = SPECIAL | 0x42,
+	REFRESH = SPECIAL | 0x43,
+	VOLUMEDOWN = SPECIAL | 0x44,
+	VOLUMEMUTE = SPECIAL | 0x45,
+	VOLUMEUP = SPECIAL | 0x46,
+	BASSBOOST = SPECIAL | 0x47,
+	BASSUP = SPECIAL | 0x48,
+	BASSDOWN = SPECIAL | 0x49,
+	TREBLEUP = SPECIAL | 0x4A,
+	TREBLEDOWN = SPECIAL | 0x4B,
+	MEDIAPLAY = SPECIAL | 0x4C,
+	MEDIASTOP = SPECIAL | 0x4D,
+	MEDIAPREVIOUS = SPECIAL | 0x4E,
+	MEDIANEXT = SPECIAL | 0x4F,
+	MEDIARECORD = SPECIAL | 0x50,
+	HOMEPAGE = SPECIAL | 0x51,
+	FAVORITES = SPECIAL | 0x52,
+	SEARCH = SPECIAL | 0x53,
+	STANDBY = SPECIAL | 0x54,
+	OPENURL = SPECIAL | 0x55,
+	LAUNCHMAIL = SPECIAL | 0x56,
+	LAUNCHMEDIA = SPECIAL | 0x57,
+	LAUNCH0 = SPECIAL | 0x58,
+	LAUNCH1 = SPECIAL | 0x59,
+	LAUNCH2 = SPECIAL | 0x5A,
+	LAUNCH3 = SPECIAL | 0x5B,
+	LAUNCH4 = SPECIAL | 0x5C,
+	LAUNCH5 = SPECIAL | 0x5D,
+	LAUNCH6 = SPECIAL | 0x5E,
+	LAUNCH7 = SPECIAL | 0x5F,
+	LAUNCH8 = SPECIAL | 0x60,
+	LAUNCH9 = SPECIAL | 0x61,
+	LAUNCHA = SPECIAL | 0x62,
+	LAUNCHB = SPECIAL | 0x63,
+	LAUNCHC = SPECIAL | 0x64,
+	LAUNCHD = SPECIAL | 0x65,
+	LAUNCHE = SPECIAL | 0x66,
+	LAUNCHF = SPECIAL | 0x67,
 
-	KEY_UNKNOWN = SPKEY | 0xFFFFFF,
+	UNKNOWN = SPECIAL | 0xFFFFFF,
 
 	/* PRINTABLE LATIN 1 CODES */
 
-	KEY_SPACE = 0x0020,
-	KEY_EXCLAM = 0x0021,
-	KEY_QUOTEDBL = 0x0022,
-	KEY_NUMBERSIGN = 0x0023,
-	KEY_DOLLAR = 0x0024,
-	KEY_PERCENT = 0x0025,
-	KEY_AMPERSAND = 0x0026,
-	KEY_APOSTROPHE = 0x0027,
-	KEY_PARENLEFT = 0x0028,
-	KEY_PARENRIGHT = 0x0029,
-	KEY_ASTERISK = 0x002A,
-	KEY_PLUS = 0x002B,
-	KEY_COMMA = 0x002C,
-	KEY_MINUS = 0x002D,
-	KEY_PERIOD = 0x002E,
-	KEY_SLASH = 0x002F,
+	SPACE = 0x0020,
+	EXCLAM = 0x0021,
+	QUOTEDBL = 0x0022,
+	NUMBERSIGN = 0x0023,
+	DOLLAR = 0x0024,
+	PERCENT = 0x0025,
+	AMPERSAND = 0x0026,
+	APOSTROPHE = 0x0027,
+	PARENLEFT = 0x0028,
+	PARENRIGHT = 0x0029,
+	ASTERISK = 0x002A,
+	PLUS = 0x002B,
+	COMMA = 0x002C,
+	MINUS = 0x002D,
+	PERIOD = 0x002E,
+	SLASH = 0x002F,
 	KEY_0 = 0x0030,
 	KEY_1 = 0x0031,
 	KEY_2 = 0x0032,
@@ -185,134 +179,133 @@ enum Key {
 	KEY_7 = 0x0037,
 	KEY_8 = 0x0038,
 	KEY_9 = 0x0039,
-	KEY_COLON = 0x003A,
-	KEY_SEMICOLON = 0x003B,
-	KEY_LESS = 0x003C,
-	KEY_EQUAL = 0x003D,
-	KEY_GREATER = 0x003E,
-	KEY_QUESTION = 0x003F,
-	KEY_AT = 0x0040,
-	KEY_A = 0x0041,
-	KEY_B = 0x0042,
-	KEY_C = 0x0043,
-	KEY_D = 0x0044,
-	KEY_E = 0x0045,
-	KEY_F = 0x0046,
-	KEY_G = 0x0047,
-	KEY_H = 0x0048,
-	KEY_I = 0x0049,
-	KEY_J = 0x004A,
-	KEY_K = 0x004B,
-	KEY_L = 0x004C,
-	KEY_M = 0x004D,
-	KEY_N = 0x004E,
-	KEY_O = 0x004F,
-	KEY_P = 0x0050,
-	KEY_Q = 0x0051,
-	KEY_R = 0x0052,
-	KEY_S = 0x0053,
-	KEY_T = 0x0054,
-	KEY_U = 0x0055,
-	KEY_V = 0x0056,
-	KEY_W = 0x0057,
-	KEY_X = 0x0058,
-	KEY_Y = 0x0059,
-	KEY_Z = 0x005A,
-	KEY_BRACKETLEFT = 0x005B,
-	KEY_BACKSLASH = 0x005C,
-	KEY_BRACKETRIGHT = 0x005D,
-	KEY_ASCIICIRCUM = 0x005E,
-	KEY_UNDERSCORE = 0x005F,
-	KEY_QUOTELEFT = 0x0060,
-	KEY_BRACELEFT = 0x007B,
-	KEY_BAR = 0x007C,
-	KEY_BRACERIGHT = 0x007D,
-	KEY_ASCIITILDE = 0x007E,
-	KEY_NOBREAKSPACE = 0x00A0,
-	KEY_EXCLAMDOWN = 0x00A1,
-	KEY_CENT = 0x00A2,
-	KEY_STERLING = 0x00A3,
-	KEY_CURRENCY = 0x00A4,
-	KEY_YEN = 0x00A5,
-	KEY_BROKENBAR = 0x00A6,
-	KEY_SECTION = 0x00A7,
-	KEY_DIAERESIS = 0x00A8,
-	KEY_COPYRIGHT = 0x00A9,
-	KEY_ORDFEMININE = 0x00AA,
-	KEY_GUILLEMOTLEFT = 0x00AB,
-	KEY_NOTSIGN = 0x00AC,
-	KEY_HYPHEN = 0x00AD,
-	KEY_REGISTERED = 0x00AE,
-	KEY_MACRON = 0x00AF,
-	KEY_DEGREE = 0x00B0,
-	KEY_PLUSMINUS = 0x00B1,
-	KEY_TWOSUPERIOR = 0x00B2,
-	KEY_THREESUPERIOR = 0x00B3,
-	KEY_ACUTE = 0x00B4,
-	KEY_MU = 0x00B5,
-	KEY_PARAGRAPH = 0x00B6,
-	KEY_PERIODCENTERED = 0x00B7,
-	KEY_CEDILLA = 0x00B8,
-	KEY_ONESUPERIOR = 0x00B9,
-	KEY_MASCULINE = 0x00BA,
-	KEY_GUILLEMOTRIGHT = 0x00BB,
-	KEY_ONEQUARTER = 0x00BC,
-	KEY_ONEHALF = 0x00BD,
-	KEY_THREEQUARTERS = 0x00BE,
-	KEY_QUESTIONDOWN = 0x00BF,
-	KEY_AGRAVE = 0x00C0,
-	KEY_AACUTE = 0x00C1,
-	KEY_ACIRCUMFLEX = 0x00C2,
-	KEY_ATILDE = 0x00C3,
-	KEY_ADIAERESIS = 0x00C4,
-	KEY_ARING = 0x00C5,
-	KEY_AE = 0x00C6,
-	KEY_CCEDILLA = 0x00C7,
-	KEY_EGRAVE = 0x00C8,
-	KEY_EACUTE = 0x00C9,
-	KEY_ECIRCUMFLEX = 0x00CA,
-	KEY_EDIAERESIS = 0x00CB,
-	KEY_IGRAVE = 0x00CC,
-	KEY_IACUTE = 0x00CD,
-	KEY_ICIRCUMFLEX = 0x00CE,
-	KEY_IDIAERESIS = 0x00CF,
-	KEY_ETH = 0x00D0,
-	KEY_NTILDE = 0x00D1,
-	KEY_OGRAVE = 0x00D2,
-	KEY_OACUTE = 0x00D3,
-	KEY_OCIRCUMFLEX = 0x00D4,
-	KEY_OTILDE = 0x00D5,
-	KEY_ODIAERESIS = 0x00D6,
-	KEY_MULTIPLY = 0x00D7,
-	KEY_OOBLIQUE = 0x00D8,
-	KEY_UGRAVE = 0x00D9,
-	KEY_UACUTE = 0x00DA,
-	KEY_UCIRCUMFLEX = 0x00DB,
-	KEY_UDIAERESIS = 0x00DC,
-	KEY_YACUTE = 0x00DD,
-	KEY_THORN = 0x00DE,
-	KEY_SSHARP = 0x00DF,
+	COLON = 0x003A,
+	SEMICOLON = 0x003B,
+	LESS = 0x003C,
+	EQUAL = 0x003D,
+	GREATER = 0x003E,
+	QUESTION = 0x003F,
+	AT = 0x0040,
+	A = 0x0041,
+	B = 0x0042,
+	C = 0x0043,
+	D = 0x0044,
+	E = 0x0045,
+	F = 0x0046,
+	G = 0x0047,
+	H = 0x0048,
+	I = 0x0049,
+	J = 0x004A,
+	K = 0x004B,
+	L = 0x004C,
+	M = 0x004D,
+	N = 0x004E,
+	O = 0x004F,
+	P = 0x0050,
+	Q = 0x0051,
+	R = 0x0052,
+	S = 0x0053,
+	T = 0x0054,
+	U = 0x0055,
+	V = 0x0056,
+	W = 0x0057,
+	X = 0x0058,
+	Y = 0x0059,
+	Z = 0x005A,
+	BRACKETLEFT = 0x005B,
+	BACKSLASH = 0x005C,
+	BRACKETRIGHT = 0x005D,
+	ASCIICIRCUM = 0x005E,
+	UNDERSCORE = 0x005F,
+	QUOTELEFT = 0x0060,
+	BRACELEFT = 0x007B,
+	BAR = 0x007C,
+	BRACERIGHT = 0x007D,
+	ASCIITILDE = 0x007E,
+	NOBREAKSPACE = 0x00A0,
+	EXCLAMDOWN = 0x00A1,
+	CENT = 0x00A2,
+	STERLING = 0x00A3,
+	CURRENCY = 0x00A4,
+	YEN = 0x00A5,
+	BROKENBAR = 0x00A6,
+	SECTION = 0x00A7,
+	DIAERESIS = 0x00A8,
+	COPYRIGHT = 0x00A9,
+	ORDFEMININE = 0x00AA,
+	GUILLEMOTLEFT = 0x00AB,
+	NOTSIGN = 0x00AC,
+	HYPHEN = 0x00AD,
+	KEY_REGISTERED = 0x00AE, // "REGISTERED" is a reserved word on Windows.
+	MACRON = 0x00AF,
+	DEGREE = 0x00B0,
+	PLUSMINUS = 0x00B1,
+	TWOSUPERIOR = 0x00B2,
+	THREESUPERIOR = 0x00B3,
+	ACUTE = 0x00B4,
+	MU = 0x00B5,
+	PARAGRAPH = 0x00B6,
+	PERIODCENTERED = 0x00B7,
+	CEDILLA = 0x00B8,
+	ONESUPERIOR = 0x00B9,
+	MASCULINE = 0x00BA,
+	GUILLEMOTRIGHT = 0x00BB,
+	ONEQUARTER = 0x00BC,
+	ONEHALF = 0x00BD,
+	THREEQUARTERS = 0x00BE,
+	QUESTIONDOWN = 0x00BF,
+	AGRAVE = 0x00C0,
+	AACUTE = 0x00C1,
+	ACIRCUMFLEX = 0x00C2,
+	ATILDE = 0x00C3,
+	ADIAERESIS = 0x00C4,
+	ARING = 0x00C5,
+	AE = 0x00C6,
+	CCEDILLA = 0x00C7,
+	EGRAVE = 0x00C8,
+	EACUTE = 0x00C9,
+	ECIRCUMFLEX = 0x00CA,
+	EDIAERESIS = 0x00CB,
+	IGRAVE = 0x00CC,
+	IACUTE = 0x00CD,
+	ICIRCUMFLEX = 0x00CE,
+	IDIAERESIS = 0x00CF,
+	ETH = 0x00D0,
+	NTILDE = 0x00D1,
+	OGRAVE = 0x00D2,
+	OACUTE = 0x00D3,
+	OCIRCUMFLEX = 0x00D4,
+	OTILDE = 0x00D5,
+	ODIAERESIS = 0x00D6,
+	MULTIPLY = 0x00D7,
+	OOBLIQUE = 0x00D8,
+	UGRAVE = 0x00D9,
+	UACUTE = 0x00DA,
+	UCIRCUMFLEX = 0x00DB,
+	UDIAERESIS = 0x00DC,
+	YACUTE = 0x00DD,
+	THORN = 0x00DE,
+	SSHARP = 0x00DF,
 
-	KEY_DIVISION = 0x00F7,
-	KEY_YDIAERESIS = 0x00FF,
+	DIVISION = 0x00F7,
+	YDIAERESIS = 0x00FF,
+	END_LATIN1 = 0x0100,
 };
 
-enum KeyModifierMask {
-	KEY_CODE_MASK = ((1 << 25) - 1), ///< Apply this mask to any keycode to remove modifiers.
-	KEY_MODIFIER_MASK = (0xFF << 24), ///< Apply this mask to isolate modifiers.
-	KEY_MASK_SHIFT = (1 << 25),
-	KEY_MASK_ALT = (1 << 26),
-	KEY_MASK_META = (1 << 27),
-	KEY_MASK_CTRL = (1 << 28),
+enum class KeyModifierMask {
+	CODE_MASK = ((1 << 25) - 1), ///< Apply this mask to any keycode to remove modifiers.
+	MODIFIER_MASK = (0xFF << 24), ///< Apply this mask to isolate modifiers.
+	SHIFT = (1 << 25),
+	ALT = (1 << 26),
+	META = (1 << 27),
+	CTRL = (1 << 28),
 #ifdef APPLE_STYLE_KEYS
-	KEY_MASK_CMD = KEY_MASK_META,
+	CMD = META,
 #else
-	KEY_MASK_CMD = KEY_MASK_CTRL,
+	CMD = CTRL,
 #endif
-
-	KEY_MASK_KPAD = (1 << 29),
-	KEY_MASK_GROUP_SWITCH = (1 << 30)
-	// bit 31 can't be used because variant uses regular 32 bits int as datatype
+	KPAD = (1 << 29),
+	GROUP_SWITCH = (1 << 30)
 };
 
 // To avoid having unnecessary operators, only define the ones that are needed.
@@ -325,10 +318,26 @@ inline Key &operator-=(Key &a, int b) {
 	return (Key &)((int &)a -= b);
 }
 
+inline Key operator+(Key a, int b) {
+	return (Key)((int)a + (int)b);
+}
+
 inline Key operator+(Key a, Key b) {
+	return (Key)((int)a + (int)b);
+}
+
+inline Key operator-(Key a, Key b) {
 	return (Key)((int)a - (int)b);
 }
 
+inline Key operator&(Key a, Key b) {
+	return (Key)((int)a & (int)b);
+}
+
+inline Key operator|(Key a, Key b) {
+	return (Key)((int)a | (int)b);
+}
+
 inline Key &operator|=(Key &a, Key b) {
 	return (Key &)((int &)a |= (int)b);
 }
@@ -337,6 +346,10 @@ inline Key &operator|=(Key &a, KeyModifierMask b) {
 	return (Key &)((int &)a |= (int)b);
 }
 
+inline Key &operator&=(Key &a, KeyModifierMask b) {
+	return (Key &)((int &)a &= (int)b);
+}
+
 inline Key operator|(Key a, KeyModifierMask b) {
 	return (Key)((int)a | (int)b);
 }
@@ -361,10 +374,10 @@ inline KeyModifierMask operator|(KeyModifierMask a, KeyModifierMask b) {
 	return (KeyModifierMask)((int)a | (int)b);
 }
 
-String keycode_get_string(uint32_t p_code);
-bool keycode_has_unicode(uint32_t p_keycode);
-int find_keycode(const String &p_code);
-const char *find_keycode_name(int p_keycode);
+String keycode_get_string(Key p_code);
+bool keycode_has_unicode(Key p_keycode);
+Key find_keycode(const String &p_code);
+const char *find_keycode_name(Key p_keycode);
 int keycode_get_count();
 int keycode_get_value_by_index(int p_index);
 const char *keycode_get_name_by_index(int p_index);
diff --git a/core/os/midi_driver.cpp b/core/os/midi_driver.cpp
index ee87346dfc..ee33eef83f 100644
--- a/core/os/midi_driver.cpp
+++ b/core/os/midi_driver.cpp
@@ -68,46 +68,46 @@ void MIDIDriver::receive_input_packet(uint64_t timestamp, uint8_t *data, uint32_
 	}
 
 	switch (event->get_message()) {
-		case MIDI_MESSAGE_AFTERTOUCH:
+		case MIDIMessage::AFTERTOUCH:
 			if (length >= 2 + param_position) {
 				event->set_pitch(data[param_position]);
 				event->set_pressure(data[param_position + 1]);
 			}
 			break;
 
-		case MIDI_MESSAGE_CONTROL_CHANGE:
+		case MIDIMessage::CONTROL_CHANGE:
 			if (length >= 2 + param_position) {
 				event->set_controller_number(data[param_position]);
 				event->set_controller_value(data[param_position + 1]);
 			}
 			break;
 
-		case MIDI_MESSAGE_NOTE_ON:
-		case MIDI_MESSAGE_NOTE_OFF:
+		case MIDIMessage::NOTE_ON:
+		case MIDIMessage::NOTE_OFF:
 			if (length >= 2 + param_position) {
 				event->set_pitch(data[param_position]);
 				event->set_velocity(data[param_position + 1]);
 
-				if (event->get_message() == MIDI_MESSAGE_NOTE_ON && event->get_velocity() == 0) {
+				if (event->get_message() == MIDIMessage::NOTE_ON && event->get_velocity() == 0) {
 					// https://www.midi.org/forum/228-writing-midi-software-send-note-off,-or-zero-velocity-note-on
-					event->set_message(MIDI_MESSAGE_NOTE_OFF);
+					event->set_message(MIDIMessage::NOTE_OFF);
 				}
 			}
 			break;
 
-		case MIDI_MESSAGE_PITCH_BEND:
+		case MIDIMessage::PITCH_BEND:
 			if (length >= 2 + param_position) {
 				event->set_pitch((data[param_position + 1] << 7) | data[param_position]);
 			}
 			break;
 
-		case MIDI_MESSAGE_PROGRAM_CHANGE:
+		case MIDIMessage::PROGRAM_CHANGE:
 			if (length >= 1 + param_position) {
 				event->set_instrument(data[param_position]);
 			}
 			break;
 
-		case MIDI_MESSAGE_CHANNEL_PRESSURE:
+		case MIDIMessage::CHANNEL_PRESSURE:
 			if (length >= 1 + param_position) {
 				event->set_pressure(data[param_position]);
 			}