diff options
| author | jmcneill <jmcneill> | 2015-01-29 12:22:04 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2015-01-29 12:22:04 +0000 |
| commit | 5706b688266589f493b2e3f8c603b9362a00ddb0 (patch) | |
| tree | 62cee389a89c7b31914e095f5224101c464b745a | |
| parent | 5e6b7cf70af260ffaa9c7515a3906c0fa1ef4226 (diff) | |
| download | pkgsrc-5706b688266589f493b2e3f8c603b9362a00ddb0.tar.gz | |
initialize keysym->unicode in wskbd input path
| -rw-r--r-- | devel/SDL/distinfo | 4 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index 90787c57ce2..2225dd86670 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2015/01/29 11:28:50 jmcneill Exp $ +$NetBSD: distinfo,v 1.70 2015/01/29 12:22:04 jmcneill Exp $ SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3 @@ -8,7 +8,7 @@ SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876 SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8 -SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1205a549f4ba1f1bc7185081407f79545421e75e +SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 459a72044beba6655298b5ef2b4a5073a2fdb9a8 SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 17e048ccb201ae961e820ab880d5a588b2db2639 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.h) = efc75da910cfe370b7361a0b9d2b90837c6b9aa9 diff --git a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c index 713dee22517..83089c22e69 100644 --- a/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c +++ b/devel/SDL/patches/patch-src_video_wscons_SDL__wsconsevents.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.7 2015/01/29 11:28:50 jmcneill Exp $ +$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.8 2015/01/29 12:22:04 jmcneill Exp $ --- src/video/wscons/SDL_wsconsevents.c.orig 2012-01-19 06:30:06.000000000 +0000 +++ src/video/wscons/SDL_wsconsevents.c @@ -120,7 +120,19 @@ $NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.7 2015/01/29 11:28:50 jm } static SDLKey keymap[128]; -@@ -120,19 +194,42 @@ static void updateKeyboard(_THIS) +@@ -107,6 +181,11 @@ static SDL_keysym *TranslateKey(int scan + if (keysym->sym == SDLK_UNKNOWN) + printf("Unknown mapping for scancode %d\n", scancode); + ++ keysym->unicode = 0; ++ if (SDL_TranslateUNICODE) { ++ keysym->unicode = keysym->sym; ++ } ++ + return keysym; + } + +@@ -120,19 +199,42 @@ static void updateKeyboard(_THIS) for (i = 0; i < n; i++) { unsigned char c = buf[i] & 0x7f; if (c == 224) // special key prefix -- what should we do with it? @@ -167,7 +179,7 @@ $NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.7 2015/01/29 11:28:50 jm } while (posted); } -@@ -146,8 +243,10 @@ void WSCONS_InitOSKeymap(_THIS) +@@ -146,8 +248,10 @@ void WSCONS_InitOSKeymap(_THIS) } switch (private->kbdType) { @@ -179,7 +191,7 @@ $NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.7 2015/01/29 11:28:50 jm /* top row */ keymap[2] = SDLK_1; keymap[3] = SDLK_2; -@@ -220,7 +319,6 @@ void WSCONS_InitOSKeymap(_THIS) +@@ -220,7 +324,6 @@ void WSCONS_InitOSKeymap(_THIS) keymap[77] = SDLK_RIGHT; keymap[80] = SDLK_DOWN; break; |