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 to fall back to old method if server does not support XKB extension

xkbpatch.txt (text/plain), 4.67 KB, created by Bill Lash on 2015-08-15 00:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Lash

Created: 2015-08-15 00:00:20 UTC

Size: 4.67 KB

patch

obsolete

># HG changeset patch
># User Bill Lash <william.lash@gmail.com>
># Date 1439595689 18000
>#      Fri Aug 14 18:41:29 2015 -0500
># Node ID f8dde5aca7128ab9a0b16dc918ef99d53dcd97ae
># Parent  aa1321ce84258efed1fa3e69d9524addc1042db4
>Fall back to old XKeysym handling if the server doesn't support the XKB extension
>
>diff -r aa1321ce8425 -r f8dde5aca712 src/video/x11/SDL_x11events.c
>--- a/src/video/x11/SDL_x11events.c	Fri Aug 14 01:20:41 2015 -0400
>+++ b/src/video/x11/SDL_x11events.c	Fri Aug 14 18:41:29 2015 -0500
>@@ -755,11 +755,7 @@
>             if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) {
>                 int min_keycode, max_keycode;
>                 X11_XDisplayKeycodes(display, &min_keycode, &max_keycode);
>-#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>-                keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
>-#else
>-                keysym = X11_XKeycodeToKeysym(display, keycode, 0);
>-#endif
>+                keysym = x11KeycodeToKeysym(display, keycode);
>                 fprintf(stderr,
>                         "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n",
>                         keycode, keycode - min_keycode, keysym,
>diff -r aa1321ce8425 -r f8dde5aca712 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 18:41:29 2015 -0500
>@@ -32,6 +32,25 @@
> 
> #include "imKStoUCS.h"
> 
>+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>+int useXkb = 1;
>+#else
>+int useXkb = 0;
>+#endif
>+
>+KeySym x11KeycodeToKeysym(Display *display, KeyCode keycode) {
>+
>+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>+    if (useXkb) {
>+        return X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
>+    } else {
>+        return X11_XKeycodeToKeysym(display, keycode, 0);
>+    }
>+#else
>+    return X11_XKeycodeToKeysym(display, keycode, 0);
>+#endif
>+}
>+
> /* *INDENT-OFF* */
> static const struct {
>     KeySym keysym;
>@@ -151,11 +170,7 @@
>     KeySym keysym;
>     int i;
> 
>-#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>-    keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
>-#else
>-    keysym = X11_XKeycodeToKeysym(display, keycode, 0);
>-#endif
>+    keysym = x11KeycodeToKeysym(display,keycode);
>     if (keysym == NoSymbol) {
>         return SDL_SCANCODE_UNKNOWN;
>     }
>@@ -181,11 +196,7 @@
> {
>     KeySym keysym;
> 
>-#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>-    keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
>-#else
>-    keysym = X11_XKeycodeToKeysym(display, keycode, 0);
>-#endif
>+    keysym = x11KeycodeToKeysym(display, keycode);
>     if (keysym == NoSymbol) {
>         return 0;
>     }
>@@ -218,6 +229,18 @@
> 
>     X11_XAutoRepeatOn(data->display);
> 
>+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>+    if (useXkb)
>+    {
>+	int major, minor;
>+	major = XkbMajorVersion;
>+	minor = XkbMinorVersion;
>+	if (!X11_XkbQueryExtension(data->display, NULL, NULL, NULL, &major, &minor)) {
>+	    useXkb = 0;
>+	}
>+    }
>+#endif
>+
>     /* Try to determine which scancodes are being used based on fingerprint */
>     best_distance = SDL_arraysize(fingerprint) + 1;
>     best_index = -1;
>@@ -262,11 +285,7 @@
>         SDL_GetDefaultKeymap(keymap);
>         for (i = min_keycode; i <= max_keycode; ++i) {
>             KeySym sym;
>-#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>-            sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0);
>-#else
>-            sym = X11_XKeycodeToKeysym(data->display, i, 0);
>-#endif
>+            sym = x11KeycodeToKeysym(data->display, i);
>             if (sym != NoSymbol) {
>                 SDL_Scancode scancode;
>                 printf("code = %d, sym = 0x%X (%s) ", i - min_keycode,
>diff -r aa1321ce8425 -r f8dde5aca712 src/video/x11/SDL_x11keyboard.h
>--- a/src/video/x11/SDL_x11keyboard.h	Fri Aug 14 01:20:41 2015 -0400
>+++ b/src/video/x11/SDL_x11keyboard.h	Fri Aug 14 18:41:29 2015 -0500
>@@ -29,6 +29,7 @@
> extern void X11_StartTextInput(_THIS);
> extern void X11_StopTextInput(_THIS);
> extern void X11_SetTextInputRect(_THIS, SDL_Rect *rect);
>+extern KeySym x11KeycodeToKeysym(Display *, KeyCode);
> 
> #endif /* _SDL_x11keyboard_h */
> 
>diff -r aa1321ce8425 -r f8dde5aca712 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 18:41:29 2015 -0500
>@@ -160,6 +160,7 @@
> #endif
> 
> #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
>+SDL_X11_SYM(Bool,XkbQueryExtension,(Display* a,int * b,int * c,int * d,int * e, int *f),(a,b,c,d,e,f),return)
> #if NeedWidePrototypes
> SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,unsigned int b,int c,int d),(a,b,c,d),return)
> #else

Actions: View

Attachments on bug 3094: 2240 | 2241 | 2572

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.