Merge pull request #9872 from bruvzg/3.0-num-enter-fix

Remove duplicate keycode constant for Numpad Enter key (3.0)

core/global_constants.cpp

@@ -106,7 +106,6 @@ static _GlobalConstant _global_constants[] = {
 	BIND_GLOBAL_CONSTANT(KEY_F14),
 	BIND_GLOBAL_CONSTANT(KEY_F15),
 	BIND_GLOBAL_CONSTANT(KEY_F16),
-	BIND_GLOBAL_CONSTANT(KEY_KP_ENTER),
 	BIND_GLOBAL_CONSTANT(KEY_KP_MULTIPLY),
 	BIND_GLOBAL_CONSTANT(KEY_KP_DIVIDE),
 	BIND_GLOBAL_CONSTANT(KEY_KP_SUBTRACT),

core/os/keyboard.cpp

@@ -81,7 +81,6 @@ static const _KeyCodeText _keycodes[] = {
 		{KEY_F14                           ,"F14"},
 		{KEY_F15                           ,"F15"},
 		{KEY_F16                           ,"F16"},
-		{KEY_KP_ENTER                      ,"Kp Enter"},
 		{KEY_KP_MULTIPLY                   ,"Kp Multiply"},
 		{KEY_KP_DIVIDE                     ,"Kp Divide"},
 		{KEY_KP_SUBTRACT                   ,"Kp Subtract"},
@@ -334,7 +333,6 @@ bool keycode_has_unicode(uint32_t p_keycode) {
 		case KEY_F14:
 		case KEY_F15:
 		case KEY_F16:
-		case KEY_KP_ENTER:
 		case KEY_SUPER_L:
 		case KEY_SUPER_R:
 		case KEY_MENU:

core/os/keyboard.h

@@ -96,7 +96,6 @@ enum KeyList {
 	KEY_F14 = SPKEY | 0x29,
 	KEY_F15 = SPKEY | 0x2A,
 	KEY_F16 = SPKEY | 0x2B,
-	KEY_KP_ENTER = SPKEY | 0x80,
 	KEY_KP_MULTIPLY = SPKEY | 0x81,
 	KEY_KP_DIVIDE = SPKEY | 0x82,
 	KEY_KP_SUBTRACT = SPKEY | 0x83,

doc/base/classes.xml

@@ -957,9 +957,6 @@
 		<constant name="KEY_F16" value="16777259">
 			F16 Key
 		</constant>
-		<constant name="KEY_KP_ENTER" value="16777344">
-			Enter Key on Numpad
-		</constant>
 		<constant name="KEY_KP_MULTIPLY" value="16777345">
 			Multiply Key on Numpad
 		</constant>

platform/osx/os_osx.mm

@@ -512,7 +512,7 @@ static int translateKey(unsigned int key) {
 		/* 49 */ KEY_UNKNOWN, /* VolumeDown */
 		/* 4a */ KEY_UNKNOWN, /* Mute */
 		/* 4b */ KEY_KP_DIVIDE,
-		/* 4c */ KEY_KP_ENTER,
+		/* 4c */ KEY_ENTER,
 		/* 4d */ KEY_UNKNOWN,
 		/* 4e */ KEY_KP_SUBTRACT,
 		/* 4f */ KEY_UNKNOWN,

platform/x11/key_mapping_x11.cpp

@@ -94,7 +94,6 @@ static _XTranslatePair _xkeysym_to_keycode[] = {
 	//{ XK_KP_Separator,            KEY_COMMA   },
 	{ XK_KP_Decimal, KEY_KP_PERIOD },
 	{ XK_KP_Delete, KEY_KP_PERIOD },
-	{ XK_KP_Enter, KEY_KP_ENTER },
 	{ XK_KP_Multiply, KEY_KP_MULTIPLY },
 	{ XK_KP_Divide, KEY_KP_DIVIDE },
 	{ XK_KP_Subtract, KEY_KP_SUBTRACT },