[MPlayer-cvslog] r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep

[Ingo Brückl]

> Author: reimar
> Date: Thu Mar 14 20:59:35 2013
> New Revision: 35961

> Log:
> Add support for binding any key in UTF-8 range.

> X11 part is a bit hackish since we need to use
> setlocale to get desired behaviour for XLookupString.

> Modified: trunk/Changelog
> =========================================================================
> +++ trunk/Changelog     Thu Mar 14 20:59:35 2013        (r35961)
> @@ -13,6 +13,7 @@ MPlayer
>        better than -vo gl (it is in many ways worse).
>      * Fixes for DVB, teletext and closed-caption based subtitles.
>      * Support teletext and CC subtitles in WTV.
> +    * Support binding keys corresponding to non-ASCII characters.

+    * Support binding keys corresponding to non-Latin-1 characters.

> Modified: trunk/libvo/x11_common.c
> =========================================================================
> +++ trunk/libvo/x11_common.c    Thu Mar 14 20:59:35 2013        (r35961)
> @@ -427,6 +428,9 @@ int vo_init(void)
>          return 1;               // already called
>      }
>
> +    // Required so that XLookupString returns UTF-8
> +    if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8"))
> +        mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n");

+        mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, non-Latin-1 keys will no be handled.\n");

Reimar, would you mind these changes? "Some keys" sounds somehow randomly
(and I was asking myself which of my keys might not be handled; answer:
none won't be handled, all keys are fine).

According to the Xlib manual, KeySym is mapped, if possible, to an ISO
Latin-1 character, and the patch only takes effect beyond this range.

Ingo