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] Test patch to check if fixing the group fixes the issue.

keysym.patch (text/plain), 2.23 KB, created by Jason Wyatt on 2015-08-14 15:28:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Wyatt

Created: 2015-08-14 15:28:34 UTC

Size: 2.23 KB

patch

obsolete

># HG changeset patch
># User Jason Wyatt <jwyatt@feralinteractive.com>
># Date 1439565811 -3600
>#      Fri Aug 14 16:23:31 2015 +0100
># Node ID 8a89b58895c164c024371f943fed172157f27f8b
># Parent  aa1321ce84258efed1fa3e69d9524addc1042db4
>Supply current group when translating X11 Keycodes to Keysyms.
>
>diff -r aa1321ce8425 -r 8a89b58895c1 src/video/x11/SDL_x11keyboard.c
>--- a/src/video/x11/SDL_x11keyboard.c	Fri Aug 14 01:20:41 2015 -0400
>+++ b/src/video/x11/SDL_x11keyboard.c	Fri Aug 14 16:23:31 2015 +0100
>@@ -29,6 +29,7 @@
> #include "../../events/scancodes_xfree86.h"
> 
> #include <X11/keysym.h>
>+#include <X11/XKBlib.h>
> 
> #include "imKStoUCS.h"
> 
>@@ -177,12 +178,12 @@
> }
> 
> static Uint32
>-X11_KeyCodeToUcs4(Display *display, KeyCode keycode)
>+X11_KeyCodeToUcs4(Display *display, KeyCode keycode, unsigned char group)
> {
>     KeySym keysym;
> 
> #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>-    keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
>+    keysym = X11_XkbKeycodeToKeysym(display, keycode, group, 0);
> #else
>     keysym = X11_XKeycodeToKeysym(display, keycode, 0);
> #endif
>@@ -300,8 +301,17 @@
>     int i;
>     SDL_Scancode scancode;
>     SDL_Keycode keymap[SDL_NUM_SCANCODES];
>+    unsigned char group = 0;
> 
>     SDL_GetDefaultKeymap(keymap);
>+    
>+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>+    XkbStateRec state;
>+    if(0 == X11_XkbGetState(data->display, XkbUseCoreKbd, &state))
>+        group = state.group;
>+#endif
>+
>+
>     for (i = 0; i < SDL_arraysize(data->key_layout); i++) {
>         Uint32 key;
> 
>@@ -312,7 +322,7 @@
>         }
> 
>         /* See if there is a UCS keycode for this scancode */
>-        key = X11_KeyCodeToUcs4(data->display, (KeyCode)i);
>+        key = X11_KeyCodeToUcs4(data->display, (KeyCode)i, group);
>         if (key) {
>             keymap[scancode] = key;
>         } else {
>diff -r aa1321ce8425 -r 8a89b58895c1 src/video/x11/SDL_x11sym.h
>--- a/src/video/x11/SDL_x11sym.h	Fri Aug 14 01:20:41 2015 -0400
>+++ b/src/video/x11/SDL_x11sym.h	Fri Aug 14 16:23:31 2015 +0100
>@@ -165,6 +165,7 @@
> #else
> SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,KeyCode b,int c,int d),(a,b,c,d),return)
> #endif
>+SDL_X11_SYM(Status,XkbGetState,(Display* a,unsigned int b,XkbStatePtr c),(a,b,c),return)
> #endif
> 
> #if NeedWidePrototypes

Actions: View | Diff

Attachments on bug 3050: 2239

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.