Use "enum class" for input enums

3 files changed, 228 insertions, 228 deletions

diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h
index c45b470078..3cc0b10c5b 100644
--- a/platform/osx/display_server_osx.h
+++ b/platform/osx/display_server_osx.h
@@ -84,8 +84,8 @@ public:
 		bool pressed = false;
 		bool echo = false;
 		bool raw = false;
-		Key keycode = KEY_NONE;
-		uint32_t physical_keycode = 0;
+		Key keycode = Key::NONE;
+		Key physical_keycode = Key::NONE;
 		uint32_t unicode = 0;
 	};
 
@@ -172,7 +172,7 @@ public:
 
 	MouseMode mouse_mode;
 	Point2i last_mouse_pos;
-	MouseButton last_button_state = MOUSE_BUTTON_NONE;
+	MouseButton last_button_state = MouseButton::NONE;
 
 	bool window_focused;
 	bool drop_events;
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index 647f501e6b..fec5c98a99 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -579,8 +579,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 		ke.pressed = true;
 		ke.echo = false;
 		ke.raw = false; // IME input event
-		ke.keycode = KEY_NONE;
-		ke.physical_keycode = 0;
+		ke.keycode = Key::NONE;
+		ke.physical_keycode = Key::NONE;
 		ke.unicode = codepoint;
 
 		_push_to_key_event_buffer(ke);
@@ -680,7 +680,7 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 	mb->set_position(pos);
 	mb->set_global_position(pos);
 	mb->set_button_mask(DS_OSX->last_button_state);
-	if (index == MOUSE_BUTTON_LEFT && pressed) {
+	if (index == MouseButton::LEFT && pressed) {
 		mb->set_double_click([event clickCount] == 2);
 	}
 
@@ -693,10 +693,10 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 
 	if (([event modifierFlags] & NSEventModifierFlagControl)) {
 		wd.mouse_down_control = true;
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_MASK_RIGHT, true);
+		_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, true);
 	} else {
 		wd.mouse_down_control = false;
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_LEFT, MOUSE_BUTTON_MASK_LEFT, true);
+		_mouseDownEvent(window_id, event, MouseButton::LEFT, MouseButton::MASK_LEFT, true);
 	}
 }
 
@@ -709,9 +709,9 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
 
 	if (wd.mouse_down_control) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_MASK_RIGHT, false);
+		_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, false);
 	} else {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_LEFT, MOUSE_BUTTON_MASK_LEFT, false);
+		_mouseDownEvent(window_id, event, MouseButton::LEFT, MouseButton::MASK_LEFT, false);
 	}
 }
 
@@ -797,7 +797,7 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 }
 
 - (void)rightMouseDown:(NSEvent *)event {
-	_mouseDownEvent(window_id, event, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_MASK_RIGHT, true);
+	_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, true);
 }
 
 - (void)rightMouseDragged:(NSEvent *)event {
@@ -805,16 +805,16 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 }
 
 - (void)rightMouseUp:(NSEvent *)event {
-	_mouseDownEvent(window_id, event, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_MASK_RIGHT, false);
+	_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, false);
 }
 
 - (void)otherMouseDown:(NSEvent *)event {
 	if ((int)[event buttonNumber] == 2) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_MIDDLE, MOUSE_BUTTON_MASK_MIDDLE, true);
+		_mouseDownEvent(window_id, event, MouseButton::MIDDLE, MouseButton::MASK_MIDDLE, true);
 	} else if ((int)[event buttonNumber] == 3) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_XBUTTON1, MOUSE_BUTTON_MASK_XBUTTON1, true);
+		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON1, MouseButton::MASK_XBUTTON1, true);
 	} else if ((int)[event buttonNumber] == 4) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_XBUTTON2, MOUSE_BUTTON_MASK_XBUTTON2, true);
+		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON2, MouseButton::MASK_XBUTTON2, true);
 	} else {
 		return;
 	}
@@ -826,11 +826,11 @@ static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, M
 
 - (void)otherMouseUp:(NSEvent *)event {
 	if ((int)[event buttonNumber] == 2) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_MIDDLE, MOUSE_BUTTON_MASK_MIDDLE, false);
+		_mouseDownEvent(window_id, event, MouseButton::MIDDLE, MouseButton::MASK_MIDDLE, false);
 	} else if ((int)[event buttonNumber] == 3) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_XBUTTON1, MOUSE_BUTTON_MASK_XBUTTON1, false);
+		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON1, MouseButton::MASK_XBUTTON1, false);
 	} else if ((int)[event buttonNumber] == 4) {
-		_mouseDownEvent(window_id, event, MOUSE_BUTTON_XBUTTON2, MOUSE_BUTTON_MASK_XBUTTON2, false);
+		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON2, MouseButton::MASK_XBUTTON2, false);
 	} else {
 		return;
 	}
@@ -922,140 +922,140 @@ static bool isNumpadKey(unsigned int key) {
 
 // Keyboard symbol translation table
 static const Key _osx_to_godot_table[128] = {
-	/* 00 */ KEY_A,
-	/* 01 */ KEY_S,
-	/* 02 */ KEY_D,
-	/* 03 */ KEY_F,
-	/* 04 */ KEY_H,
-	/* 05 */ KEY_G,
-	/* 06 */ KEY_Z,
-	/* 07 */ KEY_X,
-	/* 08 */ KEY_C,
-	/* 09 */ KEY_V,
-	/* 0a */ KEY_SECTION, /* ISO Section */
-	/* 0b */ KEY_B,
-	/* 0c */ KEY_Q,
-	/* 0d */ KEY_W,
-	/* 0e */ KEY_E,
-	/* 0f */ KEY_R,
-	/* 10 */ KEY_Y,
-	/* 11 */ KEY_T,
-	/* 12 */ KEY_1,
-	/* 13 */ KEY_2,
-	/* 14 */ KEY_3,
-	/* 15 */ KEY_4,
-	/* 16 */ KEY_6,
-	/* 17 */ KEY_5,
-	/* 18 */ KEY_EQUAL,
-	/* 19 */ KEY_9,
-	/* 1a */ KEY_7,
-	/* 1b */ KEY_MINUS,
-	/* 1c */ KEY_8,
-	/* 1d */ KEY_0,
-	/* 1e */ KEY_BRACERIGHT,
-	/* 1f */ KEY_O,
-	/* 20 */ KEY_U,
-	/* 21 */ KEY_BRACELEFT,
-	/* 22 */ KEY_I,
-	/* 23 */ KEY_P,
-	/* 24 */ KEY_ENTER,
-	/* 25 */ KEY_L,
-	/* 26 */ KEY_J,
-	/* 27 */ KEY_APOSTROPHE,
-	/* 28 */ KEY_K,
-	/* 29 */ KEY_SEMICOLON,
-	/* 2a */ KEY_BACKSLASH,
-	/* 2b */ KEY_COMMA,
-	/* 2c */ KEY_SLASH,
-	/* 2d */ KEY_N,
-	/* 2e */ KEY_M,
-	/* 2f */ KEY_PERIOD,
-	/* 30 */ KEY_TAB,
-	/* 31 */ KEY_SPACE,
-	/* 32 */ KEY_QUOTELEFT,
-	/* 33 */ KEY_BACKSPACE,
-	/* 34 */ KEY_UNKNOWN,
-	/* 35 */ KEY_ESCAPE,
-	/* 36 */ KEY_META,
-	/* 37 */ KEY_META,
-	/* 38 */ KEY_SHIFT,
-	/* 39 */ KEY_CAPSLOCK,
-	/* 3a */ KEY_ALT,
-	/* 3b */ KEY_CTRL,
-	/* 3c */ KEY_SHIFT,
-	/* 3d */ KEY_ALT,
-	/* 3e */ KEY_CTRL,
-	/* 3f */ KEY_UNKNOWN, /* Function */
-	/* 40 */ KEY_UNKNOWN, /* F17 */
-	/* 41 */ KEY_KP_PERIOD,
-	/* 42 */ KEY_UNKNOWN,
-	/* 43 */ KEY_KP_MULTIPLY,
-	/* 44 */ KEY_UNKNOWN,
-	/* 45 */ KEY_KP_ADD,
-	/* 46 */ KEY_UNKNOWN,
-	/* 47 */ KEY_NUMLOCK, /* Really KeypadClear... */
-	/* 48 */ KEY_VOLUMEUP, /* VolumeUp */
-	/* 49 */ KEY_VOLUMEDOWN, /* VolumeDown */
-	/* 4a */ KEY_VOLUMEMUTE, /* Mute */
-	/* 4b */ KEY_KP_DIVIDE,
-	/* 4c */ KEY_KP_ENTER,
-	/* 4d */ KEY_UNKNOWN,
-	/* 4e */ KEY_KP_SUBTRACT,
-	/* 4f */ KEY_UNKNOWN, /* F18 */
-	/* 50 */ KEY_UNKNOWN, /* F19 */
-	/* 51 */ KEY_EQUAL, /* KeypadEqual */
-	/* 52 */ KEY_KP_0,
-	/* 53 */ KEY_KP_1,
-	/* 54 */ KEY_KP_2,
-	/* 55 */ KEY_KP_3,
-	/* 56 */ KEY_KP_4,
-	/* 57 */ KEY_KP_5,
-	/* 58 */ KEY_KP_6,
-	/* 59 */ KEY_KP_7,
-	/* 5a */ KEY_UNKNOWN, /* F20 */
-	/* 5b */ KEY_KP_8,
-	/* 5c */ KEY_KP_9,
-	/* 5d */ KEY_YEN, /* JIS Yen */
-	/* 5e */ KEY_UNDERSCORE, /* JIS Underscore */
-	/* 5f */ KEY_COMMA, /* JIS KeypadComma */
-	/* 60 */ KEY_F5,
-	/* 61 */ KEY_F6,
-	/* 62 */ KEY_F7,
-	/* 63 */ KEY_F3,
-	/* 64 */ KEY_F8,
-	/* 65 */ KEY_F9,
-	/* 66 */ KEY_UNKNOWN, /* JIS Eisu */
-	/* 67 */ KEY_F11,
-	/* 68 */ KEY_UNKNOWN, /* JIS Kana */
-	/* 69 */ KEY_F13,
-	/* 6a */ KEY_F16,
-	/* 6b */ KEY_F14,
-	/* 6c */ KEY_UNKNOWN,
-	/* 6d */ KEY_F10,
-	/* 6e */ KEY_MENU,
-	/* 6f */ KEY_F12,
-	/* 70 */ KEY_UNKNOWN,
-	/* 71 */ KEY_F15,
-	/* 72 */ KEY_INSERT, /* Really Help... */
-	/* 73 */ KEY_HOME,
-	/* 74 */ KEY_PAGEUP,
-	/* 75 */ KEY_DELETE,
-	/* 76 */ KEY_F4,
-	/* 77 */ KEY_END,
-	/* 78 */ KEY_F2,
-	/* 79 */ KEY_PAGEDOWN,
-	/* 7a */ KEY_F1,
-	/* 7b */ KEY_LEFT,
-	/* 7c */ KEY_RIGHT,
-	/* 7d */ KEY_DOWN,
-	/* 7e */ KEY_UP,
-	/* 7f */ KEY_UNKNOWN,
+	/* 00 */ Key::A,
+	/* 01 */ Key::S,
+	/* 02 */ Key::D,
+	/* 03 */ Key::F,
+	/* 04 */ Key::H,
+	/* 05 */ Key::G,
+	/* 06 */ Key::Z,
+	/* 07 */ Key::X,
+	/* 08 */ Key::C,
+	/* 09 */ Key::V,
+	/* 0a */ Key::SECTION, /* ISO Section */
+	/* 0b */ Key::B,
+	/* 0c */ Key::Q,
+	/* 0d */ Key::W,
+	/* 0e */ Key::E,
+	/* 0f */ Key::R,
+	/* 10 */ Key::Y,
+	/* 11 */ Key::T,
+	/* 12 */ Key::KEY_1,
+	/* 13 */ Key::KEY_2,
+	/* 14 */ Key::KEY_3,
+	/* 15 */ Key::KEY_4,
+	/* 16 */ Key::KEY_6,
+	/* 17 */ Key::KEY_5,
+	/* 18 */ Key::EQUAL,
+	/* 19 */ Key::KEY_9,
+	/* 1a */ Key::KEY_7,
+	/* 1b */ Key::MINUS,
+	/* 1c */ Key::KEY_8,
+	/* 1d */ Key::KEY_0,
+	/* 1e */ Key::BRACERIGHT,
+	/* 1f */ Key::O,
+	/* 20 */ Key::U,
+	/* 21 */ Key::BRACELEFT,
+	/* 22 */ Key::I,
+	/* 23 */ Key::P,
+	/* 24 */ Key::ENTER,
+	/* 25 */ Key::L,
+	/* 26 */ Key::J,
+	/* 27 */ Key::APOSTROPHE,
+	/* 28 */ Key::K,
+	/* 29 */ Key::SEMICOLON,
+	/* 2a */ Key::BACKSLASH,
+	/* 2b */ Key::COMMA,
+	/* 2c */ Key::SLASH,
+	/* 2d */ Key::N,
+	/* 2e */ Key::M,
+	/* 2f */ Key::PERIOD,
+	/* 30 */ Key::TAB,
+	/* 31 */ Key::SPACE,
+	/* 32 */ Key::QUOTELEFT,
+	/* 33 */ Key::BACKSPACE,
+	/* 34 */ Key::UNKNOWN,
+	/* 35 */ Key::ESCAPE,
+	/* 36 */ Key::META,
+	/* 37 */ Key::META,
+	/* 38 */ Key::SHIFT,
+	/* 39 */ Key::CAPSLOCK,
+	/* 3a */ Key::ALT,
+	/* 3b */ Key::CTRL,
+	/* 3c */ Key::SHIFT,
+	/* 3d */ Key::ALT,
+	/* 3e */ Key::CTRL,
+	/* 3f */ Key::UNKNOWN, /* Function */
+	/* 40 */ Key::UNKNOWN, /* F17 */
+	/* 41 */ Key::KP_PERIOD,
+	/* 42 */ Key::UNKNOWN,
+	/* 43 */ Key::KP_MULTIPLY,
+	/* 44 */ Key::UNKNOWN,
+	/* 45 */ Key::KP_ADD,
+	/* 46 */ Key::UNKNOWN,
+	/* 47 */ Key::NUMLOCK, /* Really KeypadClear... */
+	/* 48 */ Key::VOLUMEUP, /* VolumeUp */
+	/* 49 */ Key::VOLUMEDOWN, /* VolumeDown */
+	/* 4a */ Key::VOLUMEMUTE, /* Mute */
+	/* 4b */ Key::KP_DIVIDE,
+	/* 4c */ Key::KP_ENTER,
+	/* 4d */ Key::UNKNOWN,
+	/* 4e */ Key::KP_SUBTRACT,
+	/* 4f */ Key::UNKNOWN, /* F18 */
+	/* 50 */ Key::UNKNOWN, /* F19 */
+	/* 51 */ Key::EQUAL, /* KeypadEqual */
+	/* 52 */ Key::KP_0,
+	/* 53 */ Key::KP_1,
+	/* 54 */ Key::KP_2,
+	/* 55 */ Key::KP_3,
+	/* 56 */ Key::KP_4,
+	/* 57 */ Key::KP_5,
+	/* 58 */ Key::KP_6,
+	/* 59 */ Key::KP_7,
+	/* 5a */ Key::UNKNOWN, /* F20 */
+	/* 5b */ Key::KP_8,
+	/* 5c */ Key::KP_9,
+	/* 5d */ Key::YEN, /* JIS Yen */
+	/* 5e */ Key::UNDERSCORE, /* JIS Underscore */
+	/* 5f */ Key::COMMA, /* JIS KeypadComma */
+	/* 60 */ Key::F5,
+	/* 61 */ Key::F6,
+	/* 62 */ Key::F7,
+	/* 63 */ Key::F3,
+	/* 64 */ Key::F8,
+	/* 65 */ Key::F9,
+	/* 66 */ Key::UNKNOWN, /* JIS Eisu */
+	/* 67 */ Key::F11,
+	/* 68 */ Key::UNKNOWN, /* JIS Kana */
+	/* 69 */ Key::F13,
+	/* 6a */ Key::F16,
+	/* 6b */ Key::F14,
+	/* 6c */ Key::UNKNOWN,
+	/* 6d */ Key::F10,
+	/* 6e */ Key::MENU,
+	/* 6f */ Key::F12,
+	/* 70 */ Key::UNKNOWN,
+	/* 71 */ Key::F15,
+	/* 72 */ Key::INSERT, /* Really Help... */
+	/* 73 */ Key::HOME,
+	/* 74 */ Key::PAGEUP,
+	/* 75 */ Key::KEY_DELETE,
+	/* 76 */ Key::F4,
+	/* 77 */ Key::END,
+	/* 78 */ Key::F2,
+	/* 79 */ Key::PAGEDOWN,
+	/* 7a */ Key::F1,
+	/* 7b */ Key::LEFT,
+	/* 7c */ Key::RIGHT,
+	/* 7d */ Key::DOWN,
+	/* 7e */ Key::UP,
+	/* 7f */ Key::UNKNOWN,
 };
 
 // Translates a OS X keycode to a Godot keycode
 static Key translateKey(unsigned int key) {
 	if (key >= 128) {
-		return KEY_UNKNOWN;
+		return Key::UNKNOWN;
 	}
 
 	return _osx_to_godot_table[key];
@@ -1077,61 +1077,61 @@ struct _KeyCodeMap {
 };
 
 static const _KeyCodeMap _keycodes[55] = {
-	{ '`', KEY_QUOTELEFT },
-	{ '~', KEY_ASCIITILDE },
-	{ '0', KEY_0 },
-	{ '1', KEY_1 },
-	{ '2', KEY_2 },
-	{ '3', KEY_3 },
-	{ '4', KEY_4 },
-	{ '5', KEY_5 },
-	{ '6', KEY_6 },
-	{ '7', KEY_7 },
-	{ '8', KEY_8 },
-	{ '9', KEY_9 },
-	{ '-', KEY_MINUS },
-	{ '_', KEY_UNDERSCORE },
-	{ '=', KEY_EQUAL },
-	{ '+', KEY_PLUS },
-	{ 'q', KEY_Q },
-	{ 'w', KEY_W },
-	{ 'e', KEY_E },
-	{ 'r', KEY_R },
-	{ 't', KEY_T },
-	{ 'y', KEY_Y },
-	{ 'u', KEY_U },
-	{ 'i', KEY_I },
-	{ 'o', KEY_O },
-	{ 'p', KEY_P },
-	{ '[', KEY_BRACELEFT },
-	{ ']', KEY_BRACERIGHT },
-	{ '{', KEY_BRACELEFT },
-	{ '}', KEY_BRACERIGHT },
-	{ 'a', KEY_A },
-	{ 's', KEY_S },
-	{ 'd', KEY_D },
-	{ 'f', KEY_F },
-	{ 'g', KEY_G },
-	{ 'h', KEY_H },
-	{ 'j', KEY_J },
-	{ 'k', KEY_K },
-	{ 'l', KEY_L },
-	{ ';', KEY_SEMICOLON },
-	{ ':', KEY_COLON },
-	{ '\'', KEY_APOSTROPHE },
-	{ '\"', KEY_QUOTEDBL },
-	{ '\\', KEY_BACKSLASH },
-	{ '#', KEY_NUMBERSIGN },
-	{ 'z', KEY_Z },
-	{ 'x', KEY_X },
-	{ 'c', KEY_C },
-	{ 'v', KEY_V },
-	{ 'b', KEY_B },
-	{ 'n', KEY_N },
-	{ 'm', KEY_M },
-	{ ',', KEY_COMMA },
-	{ '.', KEY_PERIOD },
-	{ '/', KEY_SLASH }
+	{ '`', Key::QUOTELEFT },
+	{ '~', Key::ASCIITILDE },
+	{ '0', Key::KEY_0 },
+	{ '1', Key::KEY_1 },
+	{ '2', Key::KEY_2 },
+	{ '3', Key::KEY_3 },
+	{ '4', Key::KEY_4 },
+	{ '5', Key::KEY_5 },
+	{ '6', Key::KEY_6 },
+	{ '7', Key::KEY_7 },
+	{ '8', Key::KEY_8 },
+	{ '9', Key::KEY_9 },
+	{ '-', Key::MINUS },
+	{ '_', Key::UNDERSCORE },
+	{ '=', Key::EQUAL },
+	{ '+', Key::PLUS },
+	{ 'q', Key::Q },
+	{ 'w', Key::W },
+	{ 'e', Key::E },
+	{ 'r', Key::R },
+	{ 't', Key::T },
+	{ 'y', Key::Y },
+	{ 'u', Key::U },
+	{ 'i', Key::I },
+	{ 'o', Key::O },
+	{ 'p', Key::P },
+	{ '[', Key::BRACELEFT },
+	{ ']', Key::BRACERIGHT },
+	{ '{', Key::BRACELEFT },
+	{ '}', Key::BRACERIGHT },
+	{ 'a', Key::A },
+	{ 's', Key::S },
+	{ 'd', Key::D },
+	{ 'f', Key::F },
+	{ 'g', Key::G },
+	{ 'h', Key::H },
+	{ 'j', Key::J },
+	{ 'k', Key::K },
+	{ 'l', Key::L },
+	{ ';', Key::SEMICOLON },
+	{ ':', Key::COLON },
+	{ '\'', Key::APOSTROPHE },
+	{ '\"', Key::QUOTEDBL },
+	{ '\\', Key::BACKSLASH },
+	{ '#', Key::NUMBERSIGN },
+	{ 'z', Key::Z },
+	{ 'x', Key::X },
+	{ 'c', Key::C },
+	{ 'v', Key::V },
+	{ 'b', Key::B },
+	{ 'n', Key::N },
+	{ 'm', Key::M },
+	{ ',', Key::COMMA },
+	{ '.', Key::PERIOD },
+	{ '/', Key::SLASH }
 };
 
 static Key remapKey(unsigned int key, unsigned int state) {
@@ -1345,7 +1345,7 @@ inline void sendScrollEvent(DisplayServer::WindowID window_id, MouseButton butto
 	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
 	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
 
-	MouseButton mask = MouseButton(1 << (button - 1));
+	MouseButton mask = mouse_button_to_mask(button);
 
 	Ref<InputEventMouseButton> sc;
 	sc.instantiate();
@@ -1418,10 +1418,10 @@ inline void sendPanEvent(DisplayServer::WindowID window_id, double dx, double dy
 		sendPanEvent(window_id, deltaX, deltaY, [event modifierFlags]);
 	} else {
 		if (fabs(deltaX)) {
-			sendScrollEvent(window_id, 0 > deltaX ? MOUSE_BUTTON_WHEEL_RIGHT : MOUSE_BUTTON_WHEEL_LEFT, fabs(deltaX * 0.3), [event modifierFlags]);
+			sendScrollEvent(window_id, 0 > deltaX ? MouseButton::WHEEL_RIGHT : MouseButton::WHEEL_LEFT, fabs(deltaX * 0.3), [event modifierFlags]);
 		}
 		if (fabs(deltaY)) {
-			sendScrollEvent(window_id, 0 < deltaY ? MOUSE_BUTTON_WHEEL_UP : MOUSE_BUTTON_WHEEL_DOWN, fabs(deltaY * 0.3), [event modifierFlags]);
+			sendScrollEvent(window_id, 0 < deltaY ? MouseButton::WHEEL_UP : MouseButton::WHEEL_DOWN, fabs(deltaY * 0.3), [event modifierFlags]);
 		}
 	}
 }
@@ -3205,12 +3205,12 @@ String DisplayServerOSX::keyboard_get_layout_name(int p_index) const {
 }
 
 Key DisplayServerOSX::keyboard_get_keycode_from_physical(Key p_keycode) const {
-	if (p_keycode == KEY_PAUSE) {
+	if (p_keycode == Key::PAUSE) {
 		return p_keycode;
 	}
 
-	unsigned int modifiers = p_keycode & KEY_MODIFIER_MASK;
-	unsigned int keycode_no_mod = p_keycode & KEY_CODE_MASK;
+	Key modifiers = p_keycode & KeyModifierMask::MODIFIER_MASK;
+	Key keycode_no_mod = p_keycode & KeyModifierMask::CODE_MASK;
 	unsigned int osx_keycode = unmapKey((Key)keycode_no_mod);
 	return (Key)(remapKey(osx_keycode, 0) | modifiers);
 }
@@ -3268,8 +3268,8 @@ void DisplayServerOSX::_send_event(NSEvent *p_event) {
 			_get_key_modifier_state([p_event modifierFlags], k);
 			k->set_window_id(DisplayServerOSX::INVALID_WINDOW_ID);
 			k->set_pressed(true);
-			k->set_keycode(KEY_PERIOD);
-			k->set_physical_keycode(KEY_PERIOD);
+			k->set_keycode(Key::PERIOD);
+			k->set_physical_keycode(Key::PERIOD);
 			k->set_echo([p_event isARepeat]);
 
 			Input::get_singleton()->parse_input_event(k);
@@ -3296,20 +3296,20 @@ void DisplayServerOSX::_process_key_events() {
 			_push_input(k);
 		} else {
 			// IME input
-			if ((i == 0 && ke.keycode == 0) || (i > 0 && key_event_buffer[i - 1].keycode == 0)) {
+			if ((i == 0 && ke.keycode == Key::NONE) || (i > 0 && key_event_buffer[i - 1].keycode == Key::NONE)) {
 				k.instantiate();
 
 				k->set_window_id(ke.window_id);
 				_get_key_modifier_state(ke.osx_state, k);
 				k->set_pressed(ke.pressed);
 				k->set_echo(ke.echo);
-				k->set_keycode(KEY_NONE);
-				k->set_physical_keycode(KEY_NONE);
+				k->set_keycode(Key::NONE);
+				k->set_physical_keycode(Key::NONE);
 				k->set_unicode(ke.unicode);
 
 				_push_input(k);
 			}
-			if (ke.keycode != 0) {
+			if (ke.keycode != Key::NONE) {
 				k.instantiate();
 
 				k->set_window_id(ke.window_id);
@@ -3319,7 +3319,7 @@ void DisplayServerOSX::_process_key_events() {
 				k->set_keycode(ke.keycode);
 				k->set_physical_keycode((Key)ke.physical_keycode);
 
-				if (i + 1 < key_event_pos && key_event_buffer[i + 1].keycode == 0) {
+				if (i + 1 < key_event_pos && key_event_buffer[i + 1].keycode == Key::NONE) {
 					k->set_unicode(key_event_buffer[i + 1].unicode);
 				}
 
diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp
index 46ed651384..d4ba7879f1 100644
--- a/platform/osx/joypad_osx.cpp
+++ b/platform/osx/joypad_osx.cpp
@@ -397,10 +397,10 @@ bool joypad::check_ff_features() {
 	return false;
 }
 
-static int process_hat_value(int p_min, int p_max, int p_value, bool p_offset_hat) {
+static HatMask process_hat_value(int p_min, int p_max, int p_value, bool p_offset_hat) {
 	int range = (p_max - p_min + 1);
 	int value = p_value - p_min;
-	int hat_value = HatMask::HAT_MASK_CENTER;
+	HatMask hat_value = HatMask::CENTER;
 	if (range == 4) {
 		value *= 2;
 	}
@@ -410,31 +410,31 @@ static int process_hat_value(int p_min, int p_max, int p_value, bool p_offset_ha
 
 	switch (value) {
 		case 0:
-			hat_value = (HatMask)HatMask::HAT_MASK_UP;
+			hat_value = HatMask::UP;
 			break;
 		case 1:
-			hat_value = (HatMask)(HatMask::HAT_MASK_UP | HatMask::HAT_MASK_RIGHT);
+			hat_value = (HatMask::UP | HatMask::RIGHT);
 			break;
 		case 2:
-			hat_value = (HatMask)HatMask::HAT_MASK_RIGHT;
+			hat_value = HatMask::RIGHT;
 			break;
 		case 3:
-			hat_value = (HatMask)(HatMask::HAT_MASK_DOWN | HatMask::HAT_MASK_RIGHT);
+			hat_value = (HatMask::DOWN | HatMask::RIGHT);
 			break;
 		case 4:
-			hat_value = (HatMask)HatMask::HAT_MASK_DOWN;
+			hat_value = HatMask::DOWN;
 			break;
 		case 5:
-			hat_value = (HatMask)(HatMask::HAT_MASK_DOWN | HatMask::HAT_MASK_LEFT);
+			hat_value = (HatMask::DOWN | HatMask::LEFT);
 			break;
 		case 6:
-			hat_value = (HatMask)HatMask::HAT_MASK_LEFT;
+			hat_value = HatMask::LEFT;
 			break;
 		case 7:
-			hat_value = (HatMask)(HatMask::HAT_MASK_UP | HatMask::HAT_MASK_LEFT);
+			hat_value = (HatMask::UP | HatMask::LEFT);
 			break;
 		default:
-			hat_value = (HatMask)HatMask::HAT_MASK_CENTER;
+			hat_value = HatMask::CENTER;
 			break;
 	}
 	return hat_value;
@@ -480,8 +480,8 @@ void JoypadOSX::process_joypads() {
 		for (int j = 0; j < joy.hat_elements.size(); j++) {
 			rec_element &elem = joy.hat_elements.write[j];
 			int value = joy.get_hid_element_state(&elem);
-			int hat_value = process_hat_value(elem.min, elem.max, value, joy.offset_hat);
-			input->joy_hat(joy.id, (HatMask)hat_value);
+			HatMask hat_value = process_hat_value(elem.min, elem.max, value, joy.offset_hat);
+			input->joy_hat(joy.id, hat_value);
 		}
 
 		if (joy.ffservice) {