Merge b08ee987a6b06d9baedf09ad7c1198c65f935689 into 4c001bd24854b56f6e09372c4ac6870770053f98

doc/lua_api.md

@@ -3902,7 +3902,6 @@ Operators
 ---------
 
 Operators can be used if all of the involved vectors have metatables:
-
 * `v1 == v2`:
     * Returns whether `v1` and `v2` are identical.
 * `-v`:

irr/src/CIrrDeviceSDL.cpp

@@ -129,9 +129,9 @@ EM_BOOL CIrrDeviceSDL::MouseLeaveCallback(int eventType, const EmscriptenMouseEv
 }
 #endif
 
-bool CIrrDeviceSDL::keyIsKnownSpecial(EKEY_CODE irrlichtKey)
+bool CIrrDeviceSDL::keyIsKnownSpecial(EKEY_CODE key)
 {
-	switch (irrlichtKey) {
+	switch (key) {
 	// keys which are known to have safe special character interpretation
 	// could need changes over time (removals and additions!)
 	case KEY_RETURN:
@@ -189,68 +189,24 @@ bool CIrrDeviceSDL::keyIsKnownSpecial(EKEY_CODE irrlichtKey)
 	}
 }
 
-int CIrrDeviceSDL::findCharToPassToIrrlicht(uint32_t sdlKey, EKEY_CODE irrlichtKey, bool numlock)
+int CIrrDeviceSDL::findCharToPassToIrrlicht(int assumedChar, EKEY_CODE key)
 {
-	switch (irrlichtKey) {
 	// special cases that always return a char regardless of how the SDL keycode
 	// looks
+	switch (key) {
 	case KEY_RETURN:
 	case KEY_ESCAPE:
-		return (int)irrlichtKey;
-
-	// This is necessary for keys on the numpad because they don't use the same
-	// keycodes as their non-numpad versions (whose keycodes correspond to chars),
-	// but have their own SDL keycodes and their own Irrlicht keycodes (which
-	// don't correspond to chars).
-	case KEY_MULTIPLY:
-		return '*';
-	case KEY_ADD:
-		return '+';
-	case KEY_SUBTRACT:
-		return '-';
-	case KEY_DIVIDE:
-		return '/';
-
+		return (int)key;
 	default:
 		break;
 	}
 
-	if (numlock) {
-		// Number keys on the numpad are also affected, but we only want them
-		// to produce number chars when numlock is enabled.
-		switch (irrlichtKey) {
-		case KEY_NUMPAD0:
-			return '0';
-		case KEY_NUMPAD1:
-			return '1';
-		case KEY_NUMPAD2:
-			return '2';
-		case KEY_NUMPAD3:
-			return '3';
-		case KEY_NUMPAD4:
-			return '4';
-		case KEY_NUMPAD5:
-			return '5';
-		case KEY_NUMPAD6:
-			return '6';
-		case KEY_NUMPAD7:
-			return '7';
-		case KEY_NUMPAD8:
-			return '8';
-		case KEY_NUMPAD9:
-			return '9';
-		default:
-			break;
-		}
-	}
-
 	// SDL in-place ORs values with no character representation with 1<<30
 	// https://wiki.libsdl.org/SDL2/SDLKeycodeLookup
-	// This also affects the numpad keys btw.
-	if (sdlKey & (1 << 30))
+	if (assumedChar & (1 << 30))
 		return 0;
 
-	switch (irrlichtKey) {
+	switch (key) {
 	case KEY_PRIOR:
 	case KEY_NEXT:
 	case KEY_HOME:
@@ -262,7 +218,7 @@ int CIrrDeviceSDL::findCharToPassToIrrlicht(uint32_t sdlKey, EKEY_CODE irrlichtK
 	case KEY_NUMLOCK:
 		return 0;
 	default:
-		return sdlKey;
+		return assumedChar;
 	}
 }
 
@@ -869,8 +825,7 @@ bool CIrrDeviceSDL::run()
 			irrevent.KeyInput.PressedDown = (SDL_event.type == SDL_KEYDOWN);
 			irrevent.KeyInput.Shift = (SDL_event.key.keysym.mod & KMOD_SHIFT) != 0;
 			irrevent.KeyInput.Control = (SDL_event.key.keysym.mod & KMOD_CTRL) != 0;
-			irrevent.KeyInput.Char = findCharToPassToIrrlicht(mp.SDLKey, key,
-					(SDL_event.key.keysym.mod & KMOD_NUM) != 0);
+			irrevent.KeyInput.Char = findCharToPassToIrrlicht(mp.SDLKey, key);
 			postEventFromUser(irrevent);
 		} break;
 

irr/src/CIrrDeviceSDL.h

@@ -273,10 +273,10 @@ class CIrrDeviceSDL : public CIrrDeviceStub
 
 #endif
 	// Check if a key is a known special character with no side effects on text boxes.
-	static bool keyIsKnownSpecial(EKEY_CODE irrlichtKey);
+	static bool keyIsKnownSpecial(EKEY_CODE key);
 
 	// Return the Char that should be sent to Irrlicht for the given key (either the one passed in or 0).
-	static int findCharToPassToIrrlicht(uint32_t sdlKey, EKEY_CODE irrlichtKey, bool numlock);
+	static int findCharToPassToIrrlicht(int assumedChar, EKEY_CODE key);
 
 	// Check if a text box is in focus. Enable or disable SDL_TEXTINPUT events only if in focus.
 	void resetReceiveTextInputEvents();