Skip to content

Commit

Permalink
x11: add XK_Cancel to the list of special keys
Browse files Browse the repository at this point in the history
Some IR receivers emit this key by default for remote control
buttons. Make it mappable.
  • Loading branch information
Martin Herkt committed Feb 14, 2015
1 parent 5247416 commit 9aaec7c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions input/keycodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
1 change: 1 addition & 0 deletions input/keycodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions video/out/x11_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down

0 comments on commit 9aaec7c

Please sign in to comment.