summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-01-13 08:25:21 +0100
committerUoti Urpala <uau@mplayer2.org>2012-03-25 22:30:37 +0300
commit7f6dae08e11fa90f7c8cb170daaf7ad23812f66d (patch)
tree3e144552a92d51d0ecb4ef2fe5b389db597ee451 /libvo
parent467817ff9f653ce1ee188a149634129c9eaafb01 (diff)
downloadmpv-7f6dae08e11fa90f7c8cb170daaf7ad23812f66d.tar.bz2
mpv-7f6dae08e11fa90f7c8cb170daaf7ad23812f66d.tar.xz
x11: add KP_Separator to key mapping
At least on some keyboards, the key between '0' and 'Enter' on the key pad is mapped to KP_Separator. Since X11 VOs accept unicode input, the mplayer keycode this key generates depended on the numlock state, and with numlock enabled this mapped to an ASCII character. This is probably not what the user wanted, since two physical keys will always map to the same key code. Map it to KP_DEC.
Diffstat (limited to 'libvo')
-rw-r--r--libvo/wskeys.h1
-rw-r--r--libvo/x11_common.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index a236a9fd55..2f9523f2d1 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -56,6 +56,7 @@
#define wsEscape 0xff1b
#define wsGrayEnter 0xff8d
#define wsGrayPlus 0xffab
+#define wsGraySeparator 0xffac
#define wsGrayMinus 0xffad
#define wsGrayMul 0xffaa
#define wsGrayDiv 0xffaf
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 8cabd3dd09..7030be9d8b 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -564,6 +564,7 @@ static const struct mp_keymap keymap[] = {
{wsGray3, KEY_KP3}, {wsGray4, KEY_KP4}, {wsGray5, KEY_KP5},
{wsGray6, KEY_KP6}, {wsGray7, KEY_KP7}, {wsGray8, KEY_KP8},
{wsGray9, KEY_KP9}, {wsGrayDecimal, KEY_KPDEC},
+ {wsGraySeparator, KEY_KPDEC},
// numpad without numlock
{wsGrayInsert, KEY_KPINS}, {wsGrayEnd, KEY_KP1}, {wsGrayDown, KEY_KP2},