X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=sdl_omap.git;a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;fp=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=96388f23c1551171518306e301b31b720b94887e;hp=b367c3a825c7153775d9c4f0486d49c5ba88c692;hb=89df27462960a9edac9a4eb9919a20038c6f2c8d;hpb=3af567bec0b9f4c99170d5cff7045f2a79da131b

diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c
index b367c3a..96388f2 100644
--- a/src/video/omapdss/sdlif.c
+++ b/src/video/omapdss/sdlif.c
@@ -237,9 +237,45 @@ static void omap_InitOSKeymap(SDL_VideoDevice *this)
 static int key_event_cb(void *cb_arg, int sdl_kc, int sdl_sc, int is_pressed)
 {
 	SDL_keysym keysym = { 0, };
+	int shift = 0;
+	SDLMod mod;
+	int ret;
 
 	keysym.sym = sdl_kc;
 	keysym.scancode = sdl_sc;
+
+	/* 0xff if pandora's Fn, so we exclude it too.. */
+	if (is_pressed && sdl_kc < 0xff && SDL_TranslateUNICODE) {
+		mod = SDL_GetModState();
+		if (!(mod & KMOD_CTRL) && (!!(mod & KMOD_SHIFT) ^ !!(mod & KMOD_CAPS)))
+			shift = 1;
+
+		/* prefer X mapping, if that doesn't work use hardcoded one */
+		ret = xenv_keycode_to_keysym(sdl_sc, shift);
+		if (ret >= 0) {
+			keysym.unicode = ret;
+			if ((mod & KMOD_CTRL)
+			    && 0x60 <= keysym.unicode && keysym.unicode <= 0x7f)
+			{
+				keysym.unicode -= 0x60;
+			}
+			/* hmh.. */
+			if ((keysym.unicode & 0xff00) == 0xff00)
+				keysym.unicode &= ~0xff00;
+		}
+		else {
+			keysym.unicode = sdl_kc;
+			if ((mod & KMOD_CTRL) && 0x60 <= sdl_kc && sdl_kc <= 0x7f)
+			{
+				keysym.unicode = sdl_kc - 0x60;
+			}
+			else if (shift && 'a' <= sdl_kc && sdl_kc <= 'z')
+			{
+				keysym.unicode = sdl_kc - 'a' + 'A';
+			}
+		}
+	}
+
 	SDL_PrivateKeyboard(is_pressed, &keysym);
 }