X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Fin_sdl.c;fp=frontend%2Fcommon%2Fin_sdl.c;h=14749e5c039569704f157d2f1e4a2e3622fa9ede;hp=e5577bea00d5a56f7e5e8cc028b9a3465560e7ea;hb=61f97bb0518cde50b243fba8ce2e8a907a0fc2e9;hpb=5905989e5215a4e29e6be27216ea46f288ed16a5

diff --git a/frontend/common/in_sdl.c b/frontend/common/in_sdl.c
index e5577bea..14749e5c 100644
--- a/frontend/common/in_sdl.c
+++ b/frontend/common/in_sdl.c
@@ -270,8 +270,9 @@ static const struct {
 
 #define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
 
-static int in_sdl_menu_translate(void *drv_data, int keycode)
+static int in_sdl_menu_translate(void *drv_data, int keycode, char *charcode)
 {
+	int ret = 0;
 	int i;
 
 	if (keycode < 0)
@@ -284,12 +285,22 @@ static int in_sdl_menu_translate(void *drv_data, int keycode)
 	}
 	else
 	{
-		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
-			if (key_pbtn_map[i].key == keycode)
-				return key_pbtn_map[i].pbtn;
+		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++) {
+			if (key_pbtn_map[i].key == keycode) {
+				ret = key_pbtn_map[i].pbtn;
+				break;
+			}
+		}
+
+		if (charcode != NULL && (unsigned int)keycode < SDLK_LAST &&
+		    in_sdl_keys[keycode] != NULL && in_sdl_keys[keycode][1] == 0)
+		{
+			ret |= PBTN_CHAR;
+			*charcode = in_sdl_keys[keycode][0];
+		}
 	}
 
-	return 0;
+	return ret;
 }
 
 static const in_drv_t in_sdl_drv = {