XCB/window: legacy non-Unicode key symbols

modules/video_output/Modules.am

@@ -53,7 +53,7 @@ libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XLIB_XCB_LIBS) $(GL_LIBS)
 libxcb_glx_plugin_la_DEPENDENCIES =
 
-libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
+libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XPROTO_CFLAGS) \
 	$(XCB_CFLAGS) \

modules/video_output/xcb/keys.c

@@ -173,6 +173,8 @@ static uint_fast32_t ConvertKeySym (xcb_keysym_t sym)
         { XF86XK_Favorites,        KEY_BROWSER_FAVORITES, },
         { XF86XK_AudioPause,       KEY_MEDIA_PLAY_PAUSE, },
         { XF86XK_Reload,           KEY_BROWSER_REFRESH, },
+    }, old[] = {
+#include "keysym.h"
     };
 
     /* X11 Latin-1 range */
@@ -187,6 +189,11 @@ static uint_fast32_t ConvertKeySym (xcb_keysym_t sym)
                    keysymcmp);
     if (res != NULL)
         return res->vlc;
+    /* Legacy X11 symbols outside the Unicode range */
+    res = bsearch (&sym, old, sizeof (old) / sizeof (old[0]), sizeof (old[0]),
+                   keysymcmp);
+    if (res != NULL)
+        return res->vlc;
 
     return KEY_UNSET;
 }