History

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.

Martin Herkt committed 11 years ago

Commit 9aaec7c1 parent 52474163 files · +3 −0Browse files

Unified · Split

3 files
  1. input/keycodes.c +1 −0
  2. input/keycodes.h +1 −0
  3. video/out/x11_common.c +1 −0
input/keycodes.c+1−0
@@ -194,6 +194,7 @@ static const struct key_name key_names[] = { · 193 unmodified lines
194 { MP_KEY_FAVORITES, "FAVORITES" },194 { MP_KEY_FAVORITES, "FAVORITES" },
195 { MP_KEY_SEARCH, "SEARCH" },195 { MP_KEY_SEARCH, "SEARCH" },
196 { MP_KEY_SLEEP, "SLEEP" },196 { MP_KEY_SLEEP, "SLEEP" },
197 { MP_KEY_CANCEL, "CANCEL" },
197 198
198 // These are kept for backward compatibility199 // These are kept for backward compatibility
199 { MP_KEY_PAUSE, "XF86_PAUSE" },200 { MP_KEY_PAUSE, "XF86_PAUSE" },
input/keycodes.h+1−0
@@ -75,6 +75,7 @@ · 74 unmodified lines
75#define MP_KEY_FAVORITES (MP_KEY_MM_BASE+16)75#define MP_KEY_FAVORITES (MP_KEY_MM_BASE+16)
76#define MP_KEY_SEARCH (MP_KEY_MM_BASE+17)76#define MP_KEY_SEARCH (MP_KEY_MM_BASE+17)
77#define MP_KEY_SLEEP (MP_KEY_MM_BASE+18)77#define MP_KEY_SLEEP (MP_KEY_MM_BASE+18)
78#define MP_KEY_CANCEL (MP_KEY_MM_BASE+19)
78 79
79/* Function keys */80/* Function keys */
80#define MP_KEY_F (MP_KEY_BASE+0x40)81#define MP_KEY_F (MP_KEY_BASE+0x40)
video/out/x11_common.c+1−0
@@ -551,6 +551,7 @@ static const struct mp_keymap keymap[] = { · 550 unmodified lines
551 {XK_Pause, MP_KEY_PAUSE}, {XK_Escape, MP_KEY_ESC},551 {XK_Pause, MP_KEY_PAUSE}, {XK_Escape, MP_KEY_ESC},
552 {XK_BackSpace, MP_KEY_BS}, {XK_Tab, MP_KEY_TAB}, {XK_Return, MP_KEY_ENTER},552 {XK_BackSpace, MP_KEY_BS}, {XK_Tab, MP_KEY_TAB}, {XK_Return, MP_KEY_ENTER},
553 {XK_Menu, MP_KEY_MENU}, {XK_Print, MP_KEY_PRINT},553 {XK_Menu, MP_KEY_MENU}, {XK_Print, MP_KEY_PRINT},
554 {XK_Cancel, MP_KEY_CANCEL},
554 555
555 // cursor keys556 // cursor keys
556 {XK_Left, MP_KEY_LEFT}, {XK_Right, MP_KEY_RIGHT}, {XK_Up, MP_KEY_UP},557 {XK_Left, MP_KEY_LEFT}, {XK_Right, MP_KEY_RIGHT}, {XK_Up, MP_KEY_UP},

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t