We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Translate dead keys to their normal form

sdl2-translate-deadkeys-v2.patch (text/plain), 1.41 KB, created by Mickaël Thomas on 2017-04-08 01:08:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mickaël Thomas

Created: 2017-04-08 01:08:41 UTC

Size: 1.41 KB

patch

obsolete

>diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c
>index f5b719359..9ec333c0e 100644
>--- a/src/video/x11/SDL_x11keyboard.c
>+++ b/src/video/x11/SDL_x11keyboard.c
>@@ -199,12 +199,24 @@ X11_KeyCodeToSDLScancode(_THIS, KeyCode keycode)
> static Uint32
> X11_KeyCodeToUcs4(_THIS, KeyCode keycode, unsigned char group)
> {
>+    static const KeySym deadkeys_translation[] = {
>+        XK_grave, XK_acute, XK_asciicircum, XK_asciitilde,
>+        XK_macron, XK_breve, XK_abovedot, XK_diaeresis,
>+        XK_degree, XK_doubleacute, XK_caron, XK_cedilla,
>+        XK_ogonek, XK_Greek_iota, XK_voicedsound, XK_semivoicedsound
>+    };
>+
>     KeySym keysym = X11_KeyCodeToSym(_this, keycode, group);
> 
>     if (keysym == NoSymbol) {
>         return 0;
>     }
> 
>+    /* Convert common dead keys to their normal form */
>+    if (keysym >= XK_dead_grave && keysym <= XK_dead_semivoiced_sound) {
>+        keysym = deadkeys_translation[keysym - XK_dead_grave];
>+    }
>+
>     return X11_KeySymToUcs4(keysym);
> }
> 
>@@ -453,6 +465,8 @@ X11_UpdateKeymap(_THIS)
>             SDL_Scancode keyScancode = X11_KeyCodeToSDLScancode(_this, (KeyCode)i);
> 
>             switch (keyScancode) {
>+                case SDL_SCANCODE_UNKNOWN:
>+                    break; /* just keep the default one from SDL_GetDefaultKeymap() */
>                 case SDL_SCANCODE_RETURN:
>                     keymap[scancode] = SDLK_RETURN;
>                     break;

Actions: View | Diff

Attachments on bug 3624: 2715 | 2718 | 2719

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.