From 9aaec7cffb2fb1543d4c3cabb55165f606c0b87d Mon Sep 17 00:00:00 2001
From: Martin Herkt <lachs0r@srsfckn.biz>
Date: Sat, 14 Feb 2015 03:50:26 +0100
Subject: x11: add XK_Cancel to the list of special keys

Some IR receivers emit this key by default for remote control
buttons. Make it mappable.
---
 input/keycodes.c       | 1 +
 input/keycodes.h       | 1 +
 video/out/x11_common.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/input/keycodes.c b/input/keycodes.c
index e5ca0bf77d..e448a9bd31 100644
--- a/input/keycodes.c
+++ b/input/keycodes.c
@@ -194,6 +194,7 @@ static const struct key_name key_names[] = {
   { MP_KEY_FAVORITES,   "FAVORITES" },
   { MP_KEY_SEARCH,      "SEARCH" },
   { MP_KEY_SLEEP,       "SLEEP" },
+  { MP_KEY_CANCEL,      "CANCEL" },
 
   // These are kept for backward compatibility
   { MP_KEY_PAUSE,   "XF86_PAUSE" },
diff --git a/input/keycodes.h b/input/keycodes.h
index 1326df6902..3922cfca6e 100644
--- a/input/keycodes.h
+++ b/input/keycodes.h
@@ -75,6 +75,7 @@
 #define MP_KEY_FAVORITES        (MP_KEY_MM_BASE+16)
 #define MP_KEY_SEARCH           (MP_KEY_MM_BASE+17)
 #define MP_KEY_SLEEP            (MP_KEY_MM_BASE+18)
+#define MP_KEY_CANCEL           (MP_KEY_MM_BASE+19)
 
 /*  Function keys  */
 #define MP_KEY_F (MP_KEY_BASE+0x40)
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 3a1b47540f..3dfb6e1218 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -551,6 +551,7 @@ static const struct mp_keymap keymap[] = {
     {XK_Pause, MP_KEY_PAUSE}, {XK_Escape, MP_KEY_ESC},
     {XK_BackSpace, MP_KEY_BS}, {XK_Tab, MP_KEY_TAB}, {XK_Return, MP_KEY_ENTER},
     {XK_Menu, MP_KEY_MENU}, {XK_Print, MP_KEY_PRINT},
+    {XK_Cancel, MP_KEY_CANCEL},
 
     // cursor keys
     {XK_Left, MP_KEY_LEFT}, {XK_Right, MP_KEY_RIGHT}, {XK_Up, MP_KEY_UP},
-- 
cgit v1.2.3