RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-01 12:42:04 +00:00
Code Issues Releases Wiki Activity

Prefix keycode defines with MP_

Browse Source 
Do this to reduce conflicts with <linux/input.h>, which contains some
conflicting defines.

This changes the meaning of MP_KEY_DOWN:

  KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key)
  MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
This commit is contained in:
wm4 2013-02-12 01:34:04 +01:00
parent 3ded26ccba
commit 75e6584ab3
14 changed files with 600 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/input/appleir.c
View File

@ -39,8 +39,6 @@
#include "core/mp_msg.h"
// keycodes.h defines would conflict with linux/input.h ones
#define AR_DEFINES_ONLY
#include "keycodes.h"
#define EVDEV_MAX_EVENTS 32
@ -63,16 +61,16 @@ static const struct {
int value;
int mp_keycode;
} apple_ir_mapping[] = {
{ APPLE_IR_PLAY, 1, AR_PLAY },
{ APPLE_IR_PLAY, 2, AR_PLAY_HOLD },
{ APPLE_IR_FORWARD, 1, AR_NEXT },
{ APPLE_IR_FORWARD, 2, AR_NEXT_HOLD },
{ APPLE_IR_BACKWARD, 1, AR_PREV },
{ APPLE_IR_BACKWARD, 2, AR_PREV_HOLD },
{ APPLE_IR_MENU, 1, AR_MENU },
{ APPLE_IR_MENU, 2, AR_MENU_HOLD },
{ APPLE_IR_PLUS, 1, AR_VUP },
{ APPLE_IR_MINUS, 1, AR_VDOWN },
{ APPLE_IR_PLAY, 1, MP_AR_PLAY },
{ APPLE_IR_PLAY, 2, MP_AR_PLAY_HOLD },
{ APPLE_IR_FORWARD, 1, MP_AR_NEXT },
{ APPLE_IR_FORWARD, 2, MP_AR_NEXT_HOLD },
{ APPLE_IR_BACKWARD, 1, MP_AR_PREV },
{ APPLE_IR_BACKWARD, 2, MP_AR_PREV_HOLD },
{ APPLE_IR_MENU, 1, MP_AR_MENU },
{ APPLE_IR_MENU, 2, MP_AR_MENU_HOLD },
{ APPLE_IR_PLUS, 1, MP_AR_VUP },
{ APPLE_IR_MINUS, 1, MP_AR_VDOWN },
{ -1, -1, -1 }
};

74
core/input/ar.c
View File

@ -75,30 +75,30 @@ typedef struct cookie_keycode_map {
*/
static const cookie_keycode_map_t ar_codes_tiger[] = {
{ "\x0E\x06\x03\x02", 4, AR_PREV_HOLD },
{ "\x0E\x06\x04\x02", 4, AR_NEXT_HOLD },
{ "\x0E\x06\x0E\x06", 4, AR_MENU_HOLD },
{ "\x0E\x0C\x0B\x06", 4, AR_VUP },
{ "\x0E\x0D\x0B\x06", 4, AR_VDOWN },
{ "\x0E\x07\x06\x0E\x07\x06", 6, AR_MENU },
{ "\x0E\x08\x06\x0E\x08\x06", 6, AR_PLAY },
{ "\x0E\x09\x06\x0E\x09\x06", 6, AR_NEXT },
{ "\x0E\x0A\x06\x0E\x0A\x06", 6, AR_PREV },
{ "\x12\x0E\x06\x12\x0E\x06", 6, AR_PLAY_HOLD },
{ "\x0E\x06\x03\x02", 4, MP_AR_PREV_HOLD },
{ "\x0E\x06\x04\x02", 4, MP_AR_NEXT_HOLD },
{ "\x0E\x06\x0E\x06", 4, MP_AR_MENU_HOLD },
{ "\x0E\x0C\x0B\x06", 4, MP_AR_VUP },
{ "\x0E\x0D\x0B\x06", 4, MP_AR_VDOWN },
{ "\x0E\x07\x06\x0E\x07\x06", 6, MP_AR_MENU },
{ "\x0E\x08\x06\x0E\x08\x06", 6, MP_AR_PLAY },
{ "\x0E\x09\x06\x0E\x09\x06", 6, MP_AR_NEXT },
{ "\x0E\x0A\x06\x0E\x0A\x06", 6, MP_AR_PREV },
{ "\x12\x0E\x06\x12\x0E\x06", 6, MP_AR_PLAY_HOLD },
{ NULL, 0, MP_INPUT_NOTHING },
};
static const cookie_keycode_map_t ar_codes_leopard[] = {
{ "\x1F\x13\x03\x02", 4, AR_PREV_HOLD },
{ "\x1F\x13\x04\x02", 4, AR_NEXT_HOLD },
{ "\x1F\x13\x1F\x13", 4, AR_MENU_HOLD },
{ "\x1F\x1D\x1C\x13", 4, AR_VUP },
{ "\x1F\x1E\x1C\x13", 4, AR_VDOWN },
{ "\x1F\x14\x13\x1F\x14\x13", 6, AR_MENU },
{ "\x1F\x15\x13\x1F\x15\x13", 6, AR_PLAY },
{ "\x1F\x16\x13\x1F\x16\x13", 6, AR_NEXT },
{ "\x1F\x17\x13\x1F\x17\x13", 6, AR_PREV },
{ "\x23\x1F\x13\x23\x1F\x13", 6, AR_PLAY_HOLD },
{ "\x1F\x13\x03\x02", 4, MP_AR_PREV_HOLD },
{ "\x1F\x13\x04\x02", 4, MP_AR_NEXT_HOLD },
{ "\x1F\x13\x1F\x13", 4, MP_AR_MENU_HOLD },
{ "\x1F\x1D\x1C\x13", 4, MP_AR_VUP },
{ "\x1F\x1E\x1C\x13", 4, MP_AR_VDOWN },
{ "\x1F\x14\x13\x1F\x14\x13", 6, MP_AR_MENU },
{ "\x1F\x15\x13\x1F\x15\x13", 6, MP_AR_PLAY },
{ "\x1F\x16\x13\x1F\x16\x13", 6, MP_AR_NEXT },
{ "\x1F\x17\x13\x1F\x17\x13", 6, MP_AR_PREV },
{ "\x23\x1F\x13\x23\x1F\x13", 6, MP_AR_PLAY_HOLD },
{ NULL, 0, MP_INPUT_NOTHING },
};
@ -368,13 +368,13 @@ int mp_input_ar_read(void *ctx, int fd)
ret = ar_code->keycode;
switch (ret) {
// For these 4 keys, the remote can keep a hold state.
case AR_VUP:
case AR_VDOWN:
case AR_NEXT_HOLD:
case AR_PREV_HOLD:
case MP_AR_VUP:
case MP_AR_VDOWN:
case MP_AR_NEXT_HOLD:
case MP_AR_PREV_HOLD:
for (i = cookie_nr-ar_code->seq_len; i < cookie_nr; ++i) {
if (value_queue[i]) {
down = MP_KEY_DOWN;
down = MP_KEY_STATE_DOWN;
break;
}
}
@ -445,19 +445,19 @@ int main(void)
}
while (1) {
switch ((ret = mp_input_ar_read(NULL, 0)) & ~MP_KEY_DOWN) {
case AR_PLAY: printf(" - AR_PLAY."); break;
case AR_PLAY_HOLD: printf(" - AR_PLAY_HOLD."); break;
case AR_NEXT: printf(" - AR_NEXT."); break;
case AR_NEXT_HOLD: printf(" - AR_NEXT_HOLD."); break;
case AR_PREV: printf(" - AR_PREV."); break;
case AR_PREV_HOLD: printf(" - AR_PREV_HOLD."); break;
case AR_MENU: printf(" - AR_MENU."); break;
case AR_MENU_HOLD: printf(" - AR_MENU_HOLD."); break;
case AR_VUP: printf(" - AR_VUP."); break;
case AR_VDOWN: printf(" - AR_VDOWN."); break;
switch ((ret = mp_input_ar_read(NULL, 0)) & ~MP_KEY_STATE_DOWN) {
case MP_AR_PLAY: printf(" - MP_AR_PLAY."); break;
case MP_AR_PLAY_HOLD: printf(" - MP_AR_PLAY_HOLD."); break;
case MP_AR_NEXT: printf(" - MP_AR_NEXT."); break;
case MP_AR_NEXT_HOLD: printf(" - MP_AR_NEXT_HOLD."); break;
case MP_AR_PREV: printf(" - MP_AR_PREV."); break;
case MP_AR_PREV_HOLD: printf(" - MP_AR_PREV_HOLD."); break;
case MP_AR_MENU: printf(" - MP_AR_MENU."); break;
case MP_AR_MENU_HOLD: printf(" - MP_AR_MENU_HOLD."); break;
case MP_AR_VUP: printf(" - MP_AR_VUP."); break;
case MP_AR_VDOWN: printf(" - MP_AR_VDOWN."); break;
}
if ((ret > 0 )&&(ret & MP_KEY_DOWN))
if ((ret > 0 )&&(ret & MP_KEY_STATE_DOWN))
printf(" [hold]");
if (ret > 0)
printf("\n");

310
core/input/input.c
View File

@ -268,170 +268,168 @@ static const struct legacy_cmd legacy_cmds[] = {
static const struct key_name key_names[] = {
{ ' ', "SPACE" },
{ '#', "SHARP" },
{ KEY_ENTER, "ENTER" },
{ KEY_TAB, "TAB" },
{ KEY_BACKSPACE, "BS" },
{ KEY_DELETE, "DEL" },
{ KEY_INSERT, "INS" },
{ KEY_HOME, "HOME" },
{ KEY_END, "END" },
{ KEY_PAGE_UP, "PGUP" },
{ KEY_PAGE_DOWN, "PGDWN" },
{ KEY_ESC, "ESC" },
{ KEY_PRINT, "PRINT" },
{ KEY_RIGHT, "RIGHT" },
{ KEY_LEFT, "LEFT" },
{ KEY_DOWN, "DOWN" },
{ KEY_UP, "UP" },
{ KEY_F+1, "F1" },
{ KEY_F+2, "F2" },
{ KEY_F+3, "F3" },
{ KEY_F+4, "F4" },
{ KEY_F+5, "F5" },
{ KEY_F+6, "F6" },
{ KEY_F+7, "F7" },
{ KEY_F+8, "F8" },
{ KEY_F+9, "F9" },
{ KEY_F+10, "F10" },
{ KEY_F+11, "F11" },
{ KEY_F+12, "F12" },
{ KEY_KP0, "KP0" },
{ KEY_KP1, "KP1" },
{ KEY_KP2, "KP2" },
{ KEY_KP3, "KP3" },
{ KEY_KP4, "KP4" },
{ KEY_KP5, "KP5" },
{ KEY_KP6, "KP6" },
{ KEY_KP7, "KP7" },
{ KEY_KP8, "KP8" },
{ KEY_KP9, "KP9" },
{ KEY_KPDEL, "KP_DEL" },
{ KEY_KPDEC, "KP_DEC" },
{ KEY_KPINS, "KP_INS" },
{ KEY_KPENTER, "KP_ENTER" },
{ MOUSE_BTN0, "MOUSE_BTN0" },
{ MOUSE_BTN1, "MOUSE_BTN1" },
{ MOUSE_BTN2, "MOUSE_BTN2" },
{ MOUSE_BTN3, "MOUSE_BTN3" },
{ MOUSE_BTN4, "MOUSE_BTN4" },
{ MOUSE_BTN5, "MOUSE_BTN5" },
{ MOUSE_BTN6, "MOUSE_BTN6" },
{ MOUSE_BTN7, "MOUSE_BTN7" },
{ MOUSE_BTN8, "MOUSE_BTN8" },
{ MOUSE_BTN9, "MOUSE_BTN9" },
{ MOUSE_BTN10, "MOUSE_BTN10" },
{ MOUSE_BTN11, "MOUSE_BTN11" },
{ MOUSE_BTN12, "MOUSE_BTN12" },
{ MOUSE_BTN13, "MOUSE_BTN13" },
{ MOUSE_BTN14, "MOUSE_BTN14" },
{ MOUSE_BTN15, "MOUSE_BTN15" },
{ MOUSE_BTN16, "MOUSE_BTN16" },
{ MOUSE_BTN17, "MOUSE_BTN17" },
{ MOUSE_BTN18, "MOUSE_BTN18" },
{ MOUSE_BTN19, "MOUSE_BTN19" },
{ MOUSE_BTN0_DBL, "MOUSE_BTN0_DBL" },
{ MOUSE_BTN1_DBL, "MOUSE_BTN1_DBL" },
{ MOUSE_BTN2_DBL, "MOUSE_BTN2_DBL" },
{ MOUSE_BTN3_DBL, "MOUSE_BTN3_DBL" },
{ MOUSE_BTN4_DBL, "MOUSE_BTN4_DBL" },
{ MOUSE_BTN5_DBL, "MOUSE_BTN5_DBL" },
{ MOUSE_BTN6_DBL, "MOUSE_BTN6_DBL" },
{ MOUSE_BTN7_DBL, "MOUSE_BTN7_DBL" },
{ MOUSE_BTN8_DBL, "MOUSE_BTN8_DBL" },
{ MOUSE_BTN9_DBL, "MOUSE_BTN9_DBL" },
{ MOUSE_BTN10_DBL, "MOUSE_BTN10_DBL" },
{ MOUSE_BTN11_DBL, "MOUSE_BTN11_DBL" },
{ MOUSE_BTN12_DBL, "MOUSE_BTN12_DBL" },
{ MOUSE_BTN13_DBL, "MOUSE_BTN13_DBL" },
{ MOUSE_BTN14_DBL, "MOUSE_BTN14_DBL" },
{ MOUSE_BTN15_DBL, "MOUSE_BTN15_DBL" },
{ MOUSE_BTN16_DBL, "MOUSE_BTN16_DBL" },
{ MOUSE_BTN17_DBL, "MOUSE_BTN17_DBL" },
{ MOUSE_BTN18_DBL, "MOUSE_BTN18_DBL" },
{ MOUSE_BTN19_DBL, "MOUSE_BTN19_DBL" },
{ JOY_AXIS1_MINUS, "JOY_UP" },
{ JOY_AXIS1_PLUS, "JOY_DOWN" },
{ JOY_AXIS0_MINUS, "JOY_LEFT" },
{ JOY_AXIS0_PLUS, "JOY_RIGHT" },
{ MP_KEY_ENTER, "ENTER" },
{ MP_KEY_TAB, "TAB" },
{ MP_KEY_BACKSPACE, "BS" },
{ MP_KEY_DELETE, "DEL" },
{ MP_KEY_INSERT, "INS" },
{ MP_KEY_HOME, "HOME" },
{ MP_KEY_END, "END" },
{ MP_KEY_PAGE_UP, "PGUP" },
{ MP_KEY_PAGE_DOWN, "PGDWN" },
{ MP_KEY_ESC, "ESC" },
{ MP_KEY_PRINT, "PRINT" },
{ MP_KEY_RIGHT, "RIGHT" },
{ MP_KEY_LEFT, "LEFT" },
{ MP_KEY_DOWN, "DOWN" },
{ MP_KEY_UP, "UP" },
{ MP_KEY_F+1, "F1" },
{ MP_KEY_F+2, "F2" },
{ MP_KEY_F+3, "F3" },
{ MP_KEY_F+4, "F4" },
{ MP_KEY_F+5, "F5" },
{ MP_KEY_F+6, "F6" },
{ MP_KEY_F+7, "F7" },
{ MP_KEY_F+8, "F8" },
{ MP_KEY_F+9, "F9" },
{ MP_KEY_F+10, "F10" },
{ MP_KEY_F+11, "F11" },
{ MP_KEY_F+12, "F12" },
{ MP_KEY_KP0, "KP0" },
{ MP_KEY_KP1, "KP1" },
{ MP_KEY_KP2, "KP2" },
{ MP_KEY_KP3, "KP3" },
{ MP_KEY_KP4, "KP4" },
{ MP_KEY_KP5, "KP5" },
{ MP_KEY_KP6, "KP6" },
{ MP_KEY_KP7, "KP7" },
{ MP_KEY_KP8, "KP8" },
{ MP_KEY_KP9, "KP9" },
{ MP_KEY_KPDEL, "KP_DEL" },
{ MP_KEY_KPDEC, "KP_DEC" },
{ MP_KEY_KPINS, "KP_INS" },
{ MP_KEY_KPENTER, "KP_ENTER" },
{ MP_MOUSE_BTN0, "MOUSE_BTN0" },
{ MP_MOUSE_BTN1, "MOUSE_BTN1" },
{ MP_MOUSE_BTN2, "MOUSE_BTN2" },
{ MP_MOUSE_BTN3, "MOUSE_BTN3" },
{ MP_MOUSE_BTN4, "MOUSE_BTN4" },
{ MP_MOUSE_BTN5, "MOUSE_BTN5" },
{ MP_MOUSE_BTN6, "MOUSE_BTN6" },
{ MP_MOUSE_BTN7, "MOUSE_BTN7" },
{ MP_MOUSE_BTN8, "MOUSE_BTN8" },
{ MP_MOUSE_BTN9, "MOUSE_BTN9" },
{ MP_MOUSE_BTN10, "MOUSE_BTN10" },
{ MP_MOUSE_BTN11, "MOUSE_BTN11" },
{ MP_MOUSE_BTN12, "MOUSE_BTN12" },
{ MP_MOUSE_BTN13, "MOUSE_BTN13" },
{ MP_MOUSE_BTN14, "MOUSE_BTN14" },
{ MP_MOUSE_BTN15, "MOUSE_BTN15" },
{ MP_MOUSE_BTN16, "MOUSE_BTN16" },
{ MP_MOUSE_BTN17, "MOUSE_BTN17" },
{ MP_MOUSE_BTN18, "MOUSE_BTN18" },
{ MP_MOUSE_BTN19, "MOUSE_BTN19" },
{ MP_MOUSE_BTN0_DBL, "MOUSE_BTN0_DBL" },
{ MP_MOUSE_BTN1_DBL, "MOUSE_BTN1_DBL" },
{ MP_MOUSE_BTN2_DBL, "MOUSE_BTN2_DBL" },
{ MP_MOUSE_BTN3_DBL, "MOUSE_BTN3_DBL" },
{ MP_MOUSE_BTN4_DBL, "MOUSE_BTN4_DBL" },
{ MP_MOUSE_BTN5_DBL, "MOUSE_BTN5_DBL" },
{ MP_MOUSE_BTN6_DBL, "MOUSE_BTN6_DBL" },
{ MP_MOUSE_BTN7_DBL, "MOUSE_BTN7_DBL" },
{ MP_MOUSE_BTN8_DBL, "MOUSE_BTN8_DBL" },
{ MP_MOUSE_BTN9_DBL, "MOUSE_BTN9_DBL" },
{ MP_MOUSE_BTN10_DBL, "MOUSE_BTN10_DBL" },
{ MP_MOUSE_BTN11_DBL, "MOUSE_BTN11_DBL" },
{ MP_MOUSE_BTN12_DBL, "MOUSE_BTN12_DBL" },
{ MP_MOUSE_BTN13_DBL, "MOUSE_BTN13_DBL" },
{ MP_MOUSE_BTN14_DBL, "MOUSE_BTN14_DBL" },
{ MP_MOUSE_BTN15_DBL, "MOUSE_BTN15_DBL" },
{ MP_MOUSE_BTN16_DBL, "MOUSE_BTN16_DBL" },
{ MP_MOUSE_BTN17_DBL, "MOUSE_BTN17_DBL" },
{ MP_MOUSE_BTN18_DBL, "MOUSE_BTN18_DBL" },
{ MP_MOUSE_BTN19_DBL, "MOUSE_BTN19_DBL" },
{ MP_JOY_AXIS1_MINUS, "JOY_UP" },
{ MP_JOY_AXIS1_PLUS, "JOY_DOWN" },
{ MP_JOY_AXIS0_MINUS, "JOY_LEFT" },
{ MP_JOY_AXIS0_PLUS, "JOY_RIGHT" },
{ JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
{ JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
{ JOY_AXIS1_PLUS, "JOY_AXIS1_PLUS" },
{ JOY_AXIS1_MINUS, "JOY_AXIS1_MINUS" },
{ JOY_AXIS2_PLUS, "JOY_AXIS2_PLUS" },
{ JOY_AXIS2_MINUS, "JOY_AXIS2_MINUS" },
{ JOY_AXIS3_PLUS, "JOY_AXIS3_PLUS" },
{ JOY_AXIS3_MINUS, "JOY_AXIS3_MINUS" },
{ JOY_AXIS4_PLUS, "JOY_AXIS4_PLUS" },
{ JOY_AXIS4_MINUS, "JOY_AXIS4_MINUS" },
{ JOY_AXIS5_PLUS, "JOY_AXIS5_PLUS" },
{ JOY_AXIS5_MINUS, "JOY_AXIS5_MINUS" },
{ JOY_AXIS6_PLUS, "JOY_AXIS6_PLUS" },
{ JOY_AXIS6_MINUS, "JOY_AXIS6_MINUS" },
{ JOY_AXIS7_PLUS, "JOY_AXIS7_PLUS" },
{ JOY_AXIS7_MINUS, "JOY_AXIS7_MINUS" },
{ JOY_AXIS8_PLUS, "JOY_AXIS8_PLUS" },
{ JOY_AXIS8_MINUS, "JOY_AXIS8_MINUS" },
{ JOY_AXIS9_PLUS, "JOY_AXIS9_PLUS" },
{ JOY_AXIS9_MINUS, "JOY_AXIS9_MINUS" },
{ MP_JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
{ MP_JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
{ MP_JOY_AXIS1_PLUS, "JOY_AXIS1_PLUS" },
{ MP_JOY_AXIS1_MINUS, "JOY_AXIS1_MINUS" },
{ MP_JOY_AXIS2_PLUS, "JOY_AXIS2_PLUS" },
{ MP_JOY_AXIS2_MINUS, "JOY_AXIS2_MINUS" },
{ MP_JOY_AXIS3_PLUS, "JOY_AXIS3_PLUS" },
{ MP_JOY_AXIS3_MINUS, "JOY_AXIS3_MINUS" },
{ MP_JOY_AXIS4_PLUS, "JOY_AXIS4_PLUS" },
{ MP_JOY_AXIS4_MINUS, "JOY_AXIS4_MINUS" },
{ MP_JOY_AXIS5_PLUS, "JOY_AXIS5_PLUS" },
{ MP_JOY_AXIS5_MINUS, "JOY_AXIS5_MINUS" },
{ MP_JOY_AXIS6_PLUS, "JOY_AXIS6_PLUS" },
{ MP_JOY_AXIS6_MINUS, "JOY_AXIS6_MINUS" },
{ MP_JOY_AXIS7_PLUS, "JOY_AXIS7_PLUS" },
{ MP_JOY_AXIS7_MINUS, "JOY_AXIS7_MINUS" },
{ MP_JOY_AXIS8_PLUS, "JOY_AXIS8_PLUS" },
{ MP_JOY_AXIS8_MINUS, "JOY_AXIS8_MINUS" },
{ MP_JOY_AXIS9_PLUS, "JOY_AXIS9_PLUS" },
{ MP_JOY_AXIS9_MINUS, "JOY_AXIS9_MINUS" },
{ JOY_BTN0, "JOY_BTN0" },
{ JOY_BTN1, "JOY_BTN1" },
{ JOY_BTN2, "JOY_BTN2" },
{ JOY_BTN3, "JOY_BTN3" },
{ JOY_BTN4, "JOY_BTN4" },
{ JOY_BTN5, "JOY_BTN5" },
{ JOY_BTN6, "JOY_BTN6" },
{ JOY_BTN7, "JOY_BTN7" },
{ JOY_BTN8, "JOY_BTN8" },
{ JOY_BTN9, "JOY_BTN9" },
{ MP_JOY_BTN0, "JOY_BTN0" },
{ MP_JOY_BTN1, "JOY_BTN1" },
{ MP_JOY_BTN2, "JOY_BTN2" },
{ MP_JOY_BTN3, "JOY_BTN3" },
{ MP_JOY_BTN4, "JOY_BTN4" },
{ MP_JOY_BTN5, "JOY_BTN5" },
{ MP_JOY_BTN6, "JOY_BTN6" },
{ MP_JOY_BTN7, "JOY_BTN7" },
{ MP_JOY_BTN8, "JOY_BTN8" },
{ MP_JOY_BTN9, "JOY_BTN9" },
{ AR_PLAY, "AR_PLAY" },
{ AR_PLAY_HOLD, "AR_PLAY_HOLD" },
{ AR_NEXT, "AR_NEXT" },
{ AR_NEXT_HOLD, "AR_NEXT_HOLD" },
{ AR_PREV, "AR_PREV" },
{ AR_PREV_HOLD, "AR_PREV_HOLD" },
{ AR_MENU, "AR_MENU" },
{ AR_MENU_HOLD, "AR_MENU_HOLD" },
{ AR_VUP, "AR_VUP" },
{ AR_VDOWN, "AR_VDOWN" },
{ MP_AR_PLAY, "AR_PLAY" },
{ MP_AR_PLAY_HOLD, "AR_PLAY_HOLD" },
{ MP_AR_NEXT, "AR_NEXT" },
{ MP_AR_NEXT_HOLD, "AR_NEXT_HOLD" },
{ MP_AR_PREV, "AR_PREV" },
{ MP_AR_PREV_HOLD, "AR_PREV_HOLD" },
{ MP_AR_MENU, "AR_MENU" },
{ MP_AR_MENU_HOLD, "AR_MENU_HOLD" },
{ MP_AR_VUP, "AR_VUP" },
{ MP_AR_VDOWN, "AR_VDOWN" },
{ KEY_POWER, "POWER" },
{ KEY_MENU, "MENU" },
{ KEY_PLAY, "PLAY" },
{ KEY_PAUSE, "PAUSE" },
{ KEY_PLAYPAUSE, "PLAYPAUSE" },
{ KEY_STOP, "STOP" },
{ KEY_FORWARD, "FORWARD" },
{ KEY_REWIND, "REWIND" },
{ KEY_NEXT, "NEXT" },
{ KEY_PREV, "PREV" },
{ KEY_VOLUME_UP, "VOLUME_UP" },
{ KEY_VOLUME_DOWN, "VOLUME_DOWN" },
{ KEY_MUTE, "MUTE" },
{ MP_KEY_POWER, "POWER" },
{ MP_KEY_MENU, "MENU" },
{ MP_KEY_PLAY, "PLAY" },
{ MP_KEY_PAUSE, "PAUSE" },
{ MP_KEY_PLAYPAUSE, "PLAYPAUSE" },
{ MP_KEY_STOP, "STOP" },
{ MP_KEY_FORWARD, "FORWARD" },
{ MP_KEY_REWIND, "REWIND" },
{ MP_KEY_NEXT, "NEXT" },
{ MP_KEY_PREV, "PREV" },
{ MP_KEY_VOLUME_UP, "VOLUME_UP" },
{ MP_KEY_VOLUME_DOWN, "VOLUME_DOWN" },
{ MP_KEY_MUTE, "MUTE" },
// These are kept for backward compatibility
{ KEY_PAUSE, "XF86_PAUSE" },
{ KEY_STOP, "XF86_STOP" },
{ KEY_PREV, "XF86_PREV" },
{ KEY_NEXT, "XF86_NEXT" },
{ MP_KEY_PAUSE, "XF86_PAUSE" },
{ MP_KEY_STOP, "XF86_STOP" },
{ MP_KEY_PREV, "XF86_PREV" },
{ MP_KEY_NEXT, "XF86_NEXT" },
{ KEY_CLOSE_WIN, "CLOSE_WIN" },
{ MP_KEY_CLOSE_WIN, "CLOSE_WIN" },
{ 0, NULL }
};
struct key_name modifier_names[] = {
{ KEY_MODIFIER_SHIFT, "Shift" },
{ KEY_MODIFIER_CTRL, "Ctrl" },
{ KEY_MODIFIER_ALT, "Alt" },
{ KEY_MODIFIER_META, "Meta" },
{ MP_KEY_MODIFIER_SHIFT, "Shift" },
{ MP_KEY_MODIFIER_CTRL, "Ctrl" },
{ MP_KEY_MODIFIER_ALT, "Alt" },
{ MP_KEY_MODIFIER_META, "Meta" },
{ 0 }
};
#define KEY_MODIFIER_MASK (KEY_MODIFIER_SHIFT | KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_META)
#ifndef MP_MAX_KEY_FD
#define MP_MAX_KEY_FD 10
#endif
@ -1252,17 +1250,17 @@ static mp_cmd_t *interpret_key(struct input_ctx *ictx, int code)
* we want to have "a" and "A" instead of "a" and "Shift+A"; but a separate
* shift modifier is still kept for special keys like arrow keys.
*/
int unmod = code & ~KEY_MODIFIER_MASK;
int unmod = code & ~MP_KEY_MODIFIER_MASK;
if (unmod >= 32 && unmod < MP_KEY_BASE)
code &= ~KEY_MODIFIER_SHIFT;
code &= ~MP_KEY_MODIFIER_SHIFT;
if (code & MP_KEY_DOWN) {
if (code & MP_KEY_STATE_DOWN) {
if (ictx->num_key_down >= MP_MAX_KEY_DOWN) {
mp_tmsg(MSGT_INPUT, MSGL_ERR, "Too many key down events "
"at the same time\n");
return NULL;
}
code &= ~MP_KEY_DOWN;
code &= ~MP_KEY_STATE_DOWN;
// Check if we don't already have this key as pushed
for (j = 0; j < ictx->num_key_down; j++) {
if (ictx->key_down[j] == code)
@ -1281,9 +1279,9 @@ static mp_cmd_t *interpret_key(struct input_ctx *ictx, int code)
if (ictx->key_down[j] == code)
break;
}
bool doubleclick = code >= MOUSE_BTN0_DBL && code < MOUSE_BTN_DBL_END;
bool doubleclick = code >= MP_MOUSE_BTN0_DBL && code < MP_MOUSE_BTN_DBL_END;
if (doubleclick) {
int btn = code - MOUSE_BTN0_DBL + MOUSE_BTN0;
int btn = code - MP_MOUSE_BTN0_DBL + MP_MOUSE_BTN0;
if (!ictx->num_key_down
|| ictx->key_down[ictx->num_key_down - 1] != btn)
return NULL;
@ -1305,7 +1303,7 @@ static mp_cmd_t *interpret_key(struct input_ctx *ictx, int code)
get_cmd_from_keys(ictx, ictx->num_key_down, ictx->key_down)
: NULL;
if (doubleclick) {
ictx->key_down[j] = code - MOUSE_BTN0_DBL + MOUSE_BTN0;
ictx->key_down[j] = code - MP_MOUSE_BTN0_DBL + MP_MOUSE_BTN0;
return ret;
}
// Remove the key

10
core/input/joystick.c
View File

@ -137,18 +137,18 @@ int mp_input_joystick_read(void *ctx, int fd) {
btns &= ~(1 << ev.number);
btns |= (ev.value << ev.number);
if(ev.value == 1)
return (JOY_BTN0 + ev.number) | MP_KEY_DOWN;
return (MP_JOY_BTN0 + ev.number) | MP_KEY_STATE_DOWN;
else
return JOY_BTN0 + ev.number;
return MP_JOY_BTN0 + ev.number;
} else if(ev.type & JS_EVENT_AXIS) {
if(ev.value < -JOY_AXIS_DELTA && axis[ev.number] != -1) {
axis[ev.number] = -1;
return (JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_DOWN;
return (MP_JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_STATE_DOWN;
} else if(ev.value > JOY_AXIS_DELTA && axis[ev.number] != 1) {
axis[ev.number] = 1;
return (JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_DOWN;
return (MP_JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_STATE_DOWN;
} else if(ev.value <= JOY_AXIS_DELTA && ev.value >= -JOY_AXIS_DELTA && axis[ev.number] != 0) {
int r = axis[ev.number] == 1 ? JOY_AXIS0_PLUS+(2*ev.number) : JOY_AXIS0_MINUS+(2*ev.number);
int r = axis[ev.number] == 1 ? MP_JOY_AXIS0_PLUS+(2*ev.number) : MP_JOY_AXIS0_MINUS+(2*ev.number);
axis[ev.number] = 0;
return r;
} else

304
core/input/keycodes.h
View File

@ -23,192 +23,184 @@
#define MP_KEY_BASE (1<<21)
// For appleir.c which includes another header with KEY_ENTER etc defines
#ifndef AR_DEFINES_ONLY
#define KEY_ENTER 13
#define KEY_TAB 9
#define MP_KEY_ENTER 13
#define MP_KEY_TAB 9
/* Control keys */
#define KEY_BACKSPACE (MP_KEY_BASE+0)
#define KEY_DELETE (MP_KEY_BASE+1)
#define KEY_INSERT (MP_KEY_BASE+2)
#define KEY_HOME (MP_KEY_BASE+3)
#define KEY_END (MP_KEY_BASE+4)
#define KEY_PAGE_UP (MP_KEY_BASE+5)
#define KEY_PAGE_DOWN (MP_KEY_BASE+6)
#define KEY_ESC (MP_KEY_BASE+7)
#define KEY_PRINT (MP_KEY_BASE+8)
#define MP_KEY_BACKSPACE (MP_KEY_BASE+0)
#define MP_KEY_DELETE (MP_KEY_BASE+1)
#define MP_KEY_INSERT (MP_KEY_BASE+2)
#define MP_KEY_HOME (MP_KEY_BASE+3)
#define MP_KEY_END (MP_KEY_BASE+4)
#define MP_KEY_PAGE_UP (MP_KEY_BASE+5)
#define MP_KEY_PAGE_DOWN (MP_KEY_BASE+6)
#define MP_KEY_ESC (MP_KEY_BASE+7)
#define MP_KEY_PRINT (MP_KEY_BASE+8)
/* Control keys short name */
#define KEY_BS KEY_BACKSPACE
#define KEY_DEL KEY_DELETE
#define KEY_INS KEY_INSERT
#define KEY_PGUP KEY_PAGE_UP
#define KEY_PGDOWN KEY_PAGE_DOWN
#define KEY_PGDWN KEY_PAGE_DOWN
#define MP_KEY_BS MP_KEY_BACKSPACE
#define MP_KEY_DEL MP_KEY_DELETE
#define MP_KEY_INS MP_KEY_INSERT
#define MP_KEY_PGUP MP_KEY_PAGE_UP
#define MP_KEY_PGDOWN MP_KEY_PAGE_DOWN
#define MP_KEY_PGDWN MP_KEY_PAGE_DOWN
/* Cursor movement */
#define KEY_CRSR (MP_KEY_BASE+0x10)
#define KEY_RIGHT (KEY_CRSR+0)
#define KEY_LEFT (KEY_CRSR+1)
#define KEY_DOWN (KEY_CRSR+2)
#define KEY_UP (KEY_CRSR+3)
#define MP_KEY_CRSR (MP_KEY_BASE+0x10)
#define MP_KEY_RIGHT (MP_KEY_CRSR+0)
#define MP_KEY_LEFT (MP_KEY_CRSR+1)
#define MP_KEY_DOWN (MP_KEY_CRSR+2)
#define MP_KEY_UP (MP_KEY_CRSR+3)
/* Multimedia keyboard/remote keys */
#define KEY_MM_BASE (MP_KEY_BASE+0x20)
#define KEY_POWER (KEY_MM_BASE+0)
#define KEY_MENU (KEY_MM_BASE+1)
#define KEY_PLAY (KEY_MM_BASE+2)
#define KEY_PAUSE (KEY_MM_BASE+3)
#define KEY_PLAYPAUSE (KEY_MM_BASE+4)
#define KEY_STOP (KEY_MM_BASE+5)
#define KEY_FORWARD (KEY_MM_BASE+6)
#define KEY_REWIND (KEY_MM_BASE+7)
#define KEY_NEXT (KEY_MM_BASE+8)
#define KEY_PREV (KEY_MM_BASE+9)
#define KEY_VOLUME_UP (KEY_MM_BASE+10)
#define KEY_VOLUME_DOWN (KEY_MM_BASE+11)
#define KEY_MUTE (KEY_MM_BASE+12)
#define MP_KEY_MM_BASE (MP_KEY_BASE+0x20)
#define MP_KEY_POWER (MP_KEY_MM_BASE+0)
#define MP_KEY_MENU (MP_KEY_MM_BASE+1)
#define MP_KEY_PLAY (MP_KEY_MM_BASE+2)
#define MP_KEY_PAUSE (MP_KEY_MM_BASE+3)
#define MP_KEY_PLAYPAUSE (MP_KEY_MM_BASE+4)
#define MP_KEY_STOP (MP_KEY_MM_BASE+5)
#define MP_KEY_FORWARD (MP_KEY_MM_BASE+6)
#define MP_KEY_REWIND (MP_KEY_MM_BASE+7)
#define MP_KEY_NEXT (MP_KEY_MM_BASE+8)
#define MP_KEY_PREV (MP_KEY_MM_BASE+9)
#define MP_KEY_VOLUME_UP (MP_KEY_MM_BASE+10)
#define MP_KEY_VOLUME_DOWN (MP_KEY_MM_BASE+11)
#define MP_KEY_MUTE (MP_KEY_MM_BASE+12)
/* Function keys */
#define KEY_F (MP_KEY_BASE+0x40)
#define MP_KEY_F (MP_KEY_BASE+0x40)
/* Keypad keys */
#define KEY_KEYPAD (MP_KEY_BASE+0x60)
#define KEY_KP0 (KEY_KEYPAD+0)
#define KEY_KP1 (KEY_KEYPAD+1)
#define KEY_KP2 (KEY_KEYPAD+2)
#define KEY_KP3 (KEY_KEYPAD+3)
#define KEY_KP4 (KEY_KEYPAD+4)
#define KEY_KP5 (KEY_KEYPAD+5)
#define KEY_KP6 (KEY_KEYPAD+6)
#define KEY_KP7 (KEY_KEYPAD+7)
#define KEY_KP8 (KEY_KEYPAD+8)
#define KEY_KP9 (KEY_KEYPAD+9)
#define KEY_KPDEC (KEY_KEYPAD+10)
#define KEY_KPINS (KEY_KEYPAD+11)
#define KEY_KPDEL (KEY_KEYPAD+12)
#define KEY_KPENTER (KEY_KEYPAD+13)
#define MP_KEY_KEYPAD (MP_KEY_BASE+0x60)
#define MP_KEY_KP0 (MP_KEY_KEYPAD+0)
#define MP_KEY_KP1 (MP_KEY_KEYPAD+1)
#define MP_KEY_KP2 (MP_KEY_KEYPAD+2)
#define MP_KEY_KP3 (MP_KEY_KEYPAD+3)
#define MP_KEY_KP4 (MP_KEY_KEYPAD+4)
#define MP_KEY_KP5 (MP_KEY_KEYPAD+5)
#define MP_KEY_KP6 (MP_KEY_KEYPAD+6)
#define MP_KEY_KP7 (MP_KEY_KEYPAD+7)
#define MP_KEY_KP8 (MP_KEY_KEYPAD+8)
#define MP_KEY_KP9 (MP_KEY_KEYPAD+9)
#define MP_KEY_KPDEC (MP_KEY_KEYPAD+10)
#define MP_KEY_KPINS (MP_KEY_KEYPAD+11)
#define MP_KEY_KPDEL (MP_KEY_KEYPAD+12)
#define MP_KEY_KPENTER (MP_KEY_KEYPAD+13)
// Joystick input module
#define JOY_BASE (MP_KEY_BASE+0x70)
#define JOY_AXIS0_PLUS (JOY_BASE+0)
#define JOY_AXIS0_MINUS (JOY_BASE+1)
#define JOY_AXIS1_PLUS (JOY_BASE+2)
#define JOY_AXIS1_MINUS (JOY_BASE+3)
#define JOY_AXIS2_PLUS (JOY_BASE+4)
#define JOY_AXIS2_MINUS (JOY_BASE+5)
#define JOY_AXIS3_PLUS (JOY_BASE+6)
#define JOY_AXIS3_MINUS (JOY_BASE+7)
#define JOY_AXIS4_PLUS (JOY_BASE+8)
#define JOY_AXIS4_MINUS (JOY_BASE+9)
#define JOY_AXIS5_PLUS (JOY_BASE+10)
#define JOY_AXIS5_MINUS (JOY_BASE+11)
#define JOY_AXIS6_PLUS (JOY_BASE+12)
#define JOY_AXIS6_MINUS (JOY_BASE+13)
#define JOY_AXIS7_PLUS (JOY_BASE+14)
#define JOY_AXIS7_MINUS (JOY_BASE+15)
#define JOY_AXIS8_PLUS (JOY_BASE+16)
#define JOY_AXIS8_MINUS (JOY_BASE+17)
#define JOY_AXIS9_PLUS (JOY_BASE+18)
#define JOY_AXIS9_MINUS (JOY_BASE+19)
#define MP_JOY_BASE (MP_KEY_BASE+0x70)
#define MP_JOY_AXIS0_PLUS (MP_JOY_BASE+0)
#define MP_JOY_AXIS0_MINUS (MP_JOY_BASE+1)
#define MP_JOY_AXIS1_PLUS (MP_JOY_BASE+2)
#define MP_JOY_AXIS1_MINUS (MP_JOY_BASE+3)
#define MP_JOY_AXIS2_PLUS (MP_JOY_BASE+4)
#define MP_JOY_AXIS2_MINUS (MP_JOY_BASE+5)
#define MP_JOY_AXIS3_PLUS (MP_JOY_BASE+6)
#define MP_JOY_AXIS3_MINUS (MP_JOY_BASE+7)
#define MP_JOY_AXIS4_PLUS (MP_JOY_BASE+8)
#define MP_JOY_AXIS4_MINUS (MP_JOY_BASE+9)
#define MP_JOY_AXIS5_PLUS (MP_JOY_BASE+10)
#define MP_JOY_AXIS5_MINUS (MP_JOY_BASE+11)
#define MP_JOY_AXIS6_PLUS (MP_JOY_BASE+12)
#define MP_JOY_AXIS6_MINUS (MP_JOY_BASE+13)
#define MP_JOY_AXIS7_PLUS (MP_JOY_BASE+14)
#define MP_JOY_AXIS7_MINUS (MP_JOY_BASE+15)
#define MP_JOY_AXIS8_PLUS (MP_JOY_BASE+16)
#define MP_JOY_AXIS8_MINUS (MP_JOY_BASE+17)
#define MP_JOY_AXIS9_PLUS (MP_JOY_BASE+18)
#define MP_JOY_AXIS9_MINUS (MP_JOY_BASE+19)
#define JOY_BTN_BASE ((MP_KEY_BASE+0x90)|MP_NO_REPEAT_KEY)
#define JOY_BTN0 (JOY_BTN_BASE+0)
#define JOY_BTN1 (JOY_BTN_BASE+1)
#define JOY_BTN2 (JOY_BTN_BASE+2)
#define JOY_BTN3 (JOY_BTN_BASE+3)
#define JOY_BTN4 (JOY_BTN_BASE+4)
#define JOY_BTN5 (JOY_BTN_BASE+5)
#define JOY_BTN6 (JOY_BTN_BASE+6)
#define JOY_BTN7 (JOY_BTN_BASE+7)
#define JOY_BTN8 (JOY_BTN_BASE+8)
#define JOY_BTN9 (JOY_BTN_BASE+9)
#define MP_JOY_BTN_BASE ((MP_KEY_BASE+0x90)|MP_NO_REPEAT_KEY)
#define MP_JOY_BTN0 (MP_JOY_BTN_BASE+0)
#define MP_JOY_BTN1 (MP_JOY_BTN_BASE+1)
#define MP_JOY_BTN2 (MP_JOY_BTN_BASE+2)
#define MP_JOY_BTN3 (MP_JOY_BTN_BASE+3)
#define MP_JOY_BTN4 (MP_JOY_BTN_BASE+4)
#define MP_JOY_BTN5 (MP_JOY_BTN_BASE+5)
#define MP_JOY_BTN6 (MP_JOY_BTN_BASE+6)
#define MP_JOY_BTN7 (MP_JOY_BTN_BASE+7)
#define MP_JOY_BTN8 (MP_JOY_BTN_BASE+8)
#define MP_JOY_BTN9 (MP_JOY_BTN_BASE+9)
// Mouse events from VOs
#define MOUSE_BASE ((MP_KEY_BASE+0xA0)|MP_NO_REPEAT_KEY)
#define MOUSE_BTN0 (MOUSE_BASE+0)
#define MOUSE_BTN1 (MOUSE_BASE+1)
#define MOUSE_BTN2 (MOUSE_BASE+2)
#define MOUSE_BTN3 (MOUSE_BASE+3)
#define MOUSE_BTN4 (MOUSE_BASE+4)
#define MOUSE_BTN5 (MOUSE_BASE+5)
#define MOUSE_BTN6 (MOUSE_BASE+6)
#define MOUSE_BTN7 (MOUSE_BASE+7)
#define MOUSE_BTN8 (MOUSE_BASE+8)
#define MOUSE_BTN9 (MOUSE_BASE+9)
#define MOUSE_BTN10 (MOUSE_BASE+10)
#define MOUSE_BTN11 (MOUSE_BASE+11)
#define MOUSE_BTN12 (MOUSE_BASE+12)
#define MOUSE_BTN13 (MOUSE_BASE+13)
#define MOUSE_BTN14 (MOUSE_BASE+14)
#define MOUSE_BTN15 (MOUSE_BASE+15)
#define MOUSE_BTN16 (MOUSE_BASE+16)
#define MOUSE_BTN17 (MOUSE_BASE+17)
#define MOUSE_BTN18 (MOUSE_BASE+18)
#define MOUSE_BTN19 (MOUSE_BASE+19)
#define MOUSE_BTN_END (MOUSE_BASE+20)
#define MP_MOUSE_BASE ((MP_KEY_BASE+0xA0)|MP_NO_REPEAT_KEY)
#define MP_MOUSE_BTN0 (MP_MOUSE_BASE+0)
#define MP_MOUSE_BTN1 (MP_MOUSE_BASE+1)
#define MP_MOUSE_BTN2 (MP_MOUSE_BASE+2)
#define MP_MOUSE_BTN3 (MP_MOUSE_BASE+3)
#define MP_MOUSE_BTN4 (MP_MOUSE_BASE+4)
#define MP_MOUSE_BTN5 (MP_MOUSE_BASE+5)
#define MP_MOUSE_BTN6 (MP_MOUSE_BASE+6)
#define MP_MOUSE_BTN7 (MP_MOUSE_BASE+7)
#define MP_MOUSE_BTN8 (MP_MOUSE_BASE+8)
#define MP_MOUSE_BTN9 (MP_MOUSE_BASE+9)
#define MP_MOUSE_BTN10 (MP_MOUSE_BASE+10)
#define MP_MOUSE_BTN11 (MP_MOUSE_BASE+11)
#define MP_MOUSE_BTN12 (MP_MOUSE_BASE+12)
#define MP_MOUSE_BTN13 (MP_MOUSE_BASE+13)
#define MP_MOUSE_BTN14 (MP_MOUSE_BASE+14)
#define MP_MOUSE_BTN15 (MP_MOUSE_BASE+15)
#define MP_MOUSE_BTN16 (MP_MOUSE_BASE+16)
#define MP_MOUSE_BTN17 (MP_MOUSE_BASE+17)
#define MP_MOUSE_BTN18 (MP_MOUSE_BASE+18)
#define MP_MOUSE_BTN19 (MP_MOUSE_BASE+19)
#define MP_MOUSE_BTN_END (MP_MOUSE_BASE+20)
#define MOUSE_BASE_DBL ((MP_KEY_BASE+0xC0)|MP_NO_REPEAT_KEY)
#define MOUSE_BTN0_DBL (MOUSE_BASE_DBL+0)
#define MOUSE_BTN1_DBL (MOUSE_BASE_DBL+1)
#define MOUSE_BTN2_DBL (MOUSE_BASE_DBL+2)
#define MOUSE_BTN3_DBL (MOUSE_BASE_DBL+3)
#define MOUSE_BTN4_DBL (MOUSE_BASE_DBL+4)
#define MOUSE_BTN5_DBL (MOUSE_BASE_DBL+5)
#define MOUSE_BTN6_DBL (MOUSE_BASE_DBL+6)
#define MOUSE_BTN7_DBL (MOUSE_BASE_DBL+7)
#define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8)
#define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9)
#define MOUSE_BTN10_DBL (MOUSE_BASE_DBL+10)
#define MOUSE_BTN11_DBL (MOUSE_BASE_DBL+11)
#define MOUSE_BTN12_DBL (MOUSE_BASE_DBL+12)
#define MOUSE_BTN13_DBL (MOUSE_BASE_DBL+13)
#define MOUSE_BTN14_DBL (MOUSE_BASE_DBL+14)
#define MOUSE_BTN15_DBL (MOUSE_BASE_DBL+15)
#define MOUSE_BTN16_DBL (MOUSE_BASE_DBL+16)
#define MOUSE_BTN17_DBL (MOUSE_BASE_DBL+17)
#define MOUSE_BTN18_DBL (MOUSE_BASE_DBL+18)
#define MOUSE_BTN19_DBL (MOUSE_BASE_DBL+19)
#define MOUSE_BTN_DBL_END (MOUSE_BASE_DBL+20)
#endif // AR_DEFINES_ONLY
#define MP_MOUSE_BASE_DBL ((MP_KEY_BASE+0xC0)|MP_NO_REPEAT_KEY)
#define MP_MOUSE_BTN0_DBL (MP_MOUSE_BASE_DBL+0)
#define MP_MOUSE_BTN1_DBL (MP_MOUSE_BASE_DBL+1)
#define MP_MOUSE_BTN2_DBL (MP_MOUSE_BASE_DBL+2)
#define MP_MOUSE_BTN3_DBL (MP_MOUSE_BASE_DBL+3)
#define MP_MOUSE_BTN4_DBL (MP_MOUSE_BASE_DBL+4)
#define MP_MOUSE_BTN5_DBL (MP_MOUSE_BASE_DBL+5)
#define MP_MOUSE_BTN6_DBL (MP_MOUSE_BASE_DBL+6)
#define MP_MOUSE_BTN7_DBL (MP_MOUSE_BASE_DBL+7)
#define MP_MOUSE_BTN8_DBL (MP_MOUSE_BASE_DBL+8)
#define MP_MOUSE_BTN9_DBL (MP_MOUSE_BASE_DBL+9)
#define MP_MOUSE_BTN10_DBL (MP_MOUSE_BASE_DBL+10)
#define MP_MOUSE_BTN11_DBL (MP_MOUSE_BASE_DBL+11)
#define MP_MOUSE_BTN12_DBL (MP_MOUSE_BASE_DBL+12)
#define MP_MOUSE_BTN13_DBL (MP_MOUSE_BASE_DBL+13)
#define MP_MOUSE_BTN14_DBL (MP_MOUSE_BASE_DBL+14)
#define MP_MOUSE_BTN15_DBL (MP_MOUSE_BASE_DBL+15)
#define MP_MOUSE_BTN16_DBL (MP_MOUSE_BASE_DBL+16)
#define MP_MOUSE_BTN17_DBL (MP_MOUSE_BASE_DBL+17)
#define MP_MOUSE_BTN18_DBL (MP_MOUSE_BASE_DBL+18)
#define MP_MOUSE_BTN19_DBL (MP_MOUSE_BASE_DBL+19)
#define MP_MOUSE_BTN_DBL_END (MP_MOUSE_BASE_DBL+20)
// Apple Remote input module
#define AR_BASE (MP_KEY_BASE+0xE0)
#define AR_PLAY (AR_BASE + 0)
#define AR_PLAY_HOLD (AR_BASE + 1)
#define AR_NEXT (AR_BASE + 2)
#define AR_NEXT_HOLD (AR_BASE + 3)
#define AR_PREV (AR_BASE + 4)
#define AR_PREV_HOLD (AR_BASE + 5)
#define AR_MENU (AR_BASE + 6)
#define AR_MENU_HOLD (AR_BASE + 7)
#define AR_VUP (AR_BASE + 8)
#define AR_VDOWN (AR_BASE + 9)
#ifndef AR_DEFINES_ONLY
#define MP_AR_BASE (MP_KEY_BASE+0xE0)
#define MP_AR_PLAY (MP_AR_BASE + 0)
#define MP_AR_PLAY_HOLD (MP_AR_BASE + 1)
#define MP_AR_NEXT (MP_AR_BASE + 2)
#define MP_AR_NEXT_HOLD (MP_AR_BASE + 3)
#define MP_AR_PREV (MP_AR_BASE + 4)
#define MP_AR_PREV_HOLD (MP_AR_BASE + 5)
#define MP_AR_MENU (MP_AR_BASE + 6)
#define MP_AR_MENU_HOLD (MP_AR_BASE + 7)
#define MP_AR_VUP (MP_AR_BASE + 8)
#define MP_AR_VDOWN (MP_AR_BASE + 9)
/* Special keys */
#define KEY_INTERN (MP_KEY_BASE+0x1000)
#define KEY_CLOSE_WIN (KEY_INTERN+0)
#define MP_KEY_INTERN (MP_KEY_BASE+0x1000)
#define MP_KEY_CLOSE_WIN (MP_KEY_INTERN+0)
/* Modifiers added to individual keys */
#define KEY_MODIFIER_SHIFT (1<<22)
#define KEY_MODIFIER_CTRL (1<<23)
#define KEY_MODIFIER_ALT (1<<24)
#define KEY_MODIFIER_META (1<<25)
#define MP_KEY_MODIFIER_SHIFT (1<<22)
#define MP_KEY_MODIFIER_CTRL (1<<23)
#define MP_KEY_MODIFIER_ALT (1<<24)
#define MP_KEY_MODIFIER_META (1<<25)
#endif // AR_DEFINES_ONLY
#define MP_KEY_MODIFIER_MASK (MP_KEY_MODIFIER_SHIFT | MP_KEY_MODIFIER_CTRL | \
MP_KEY_MODIFIER_ALT | MP_KEY_MODIFIER_META)
// Use this when the key shouldn't be auto-repeated (like mouse buttons)
#define MP_NO_REPEAT_KEY (1<<28)
#define MP_KEY_DOWN (1<<29)
#define MP_KEY_STATE_DOWN (1<<29)
#endif /* MPLAYER_KEYCODES_H */

12
core/mp_fifo.c
View File

@ -44,8 +44,8 @@ struct mp_fifo *mp_fifo_create(struct input_ctx *input, struct MPOpts *opts)
static void put_double(struct mp_fifo *fifo, int code)
{
if (code >= MOUSE_BTN0 && code <= MOUSE_BTN2)
mp_input_feed_key(fifo->input, code - MOUSE_BTN0 + MOUSE_BTN0_DBL);
if (code >= MP_MOUSE_BTN0 && code <= MP_MOUSE_BTN2)
mp_input_feed_key(fifo->input, code - MP_MOUSE_BTN0 + MP_MOUSE_BTN0_DBL);
}
void mplayer_put_key(struct mp_fifo *fifo, int code)
@ -54,12 +54,12 @@ void mplayer_put_key(struct mp_fifo *fifo, int code)
int doubleclick_time = fifo->opts->doubleclick_time;
// ignore system-doubleclick if we generate these events ourselves
if (doubleclick_time
&& (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL
&& (code & ~MP_KEY_DOWN) < MOUSE_BTN_DBL_END)
&& (code & ~MP_KEY_STATE_DOWN) >= MP_MOUSE_BTN0_DBL
&& (code & ~MP_KEY_STATE_DOWN) < MP_MOUSE_BTN_DBL_END)
return;
mp_input_feed_key(fifo->input, code);
if (code & MP_KEY_DOWN) {
code &= ~MP_KEY_DOWN;
if (code & MP_KEY_STATE_DOWN) {
code &= ~MP_KEY_STATE_DOWN;
if (fifo->last_key_down == code
&& now - fifo->last_down_time < doubleclick_time)
put_double(fifo, code);

28
osdep/getch2-win.c
View File

@ -108,37 +108,37 @@ static int getch2_internal(void)
switch(eventbuffer[i].Event.KeyEvent.wVirtualKeyCode)
{
case VK_HOME:
return KEY_HOME;
return MP_KEY_HOME;
case VK_END:
return KEY_END;
return MP_KEY_END;
case VK_DELETE:
return KEY_DEL;
return MP_KEY_DEL;
case VK_INSERT:
return KEY_INS;
return MP_KEY_INS;
case VK_BACK:
return KEY_BS;
return MP_KEY_BS;
case VK_PRIOR:
return KEY_PGUP;
return MP_KEY_PGUP;
case VK_NEXT:
return KEY_PGDWN;
return MP_KEY_PGDWN;
case VK_RETURN:
return KEY_ENTER;
return MP_KEY_ENTER;
case VK_ESCAPE:
return KEY_ESC;
return MP_KEY_ESC;
case VK_LEFT:
return KEY_LEFT;
return MP_KEY_LEFT;
case VK_UP:
return KEY_UP;
return MP_KEY_UP;
case VK_RIGHT:
return KEY_RIGHT;
return MP_KEY_RIGHT;
case VK_DOWN:
return KEY_DOWN;
return MP_KEY_DOWN;
case VK_SHIFT:
continue;
}
/*check for function keys*/
if(0x87 >= eventbuffer[i].Event.KeyEvent.wVirtualKeyCode && eventbuffer[i].Event.KeyEvent.wVirtualKeyCode >= 0x70)
return KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70;
return MP_KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70;
/*only characters should be remaining*/
//printf("getch2: YOU PRESSED \"%c\" \n",eventbuffer[i].Event.KeyEvent.uChar.AsciiChar);

76
osdep/getch2.c
View File

@ -119,28 +119,28 @@ int load_termcap(char *termtype){
if(screen_height<1 || screen_height>255) screen_height=24;
erase_to_end_of_line= tgetstr("ce",&term_p);
termcap_add("kP",KEY_PGUP);
termcap_add("kN",KEY_PGDWN);
termcap_add("kh",KEY_HOME);
termcap_add("kH",KEY_END);
termcap_add("kI",KEY_INS);
termcap_add("kD",KEY_DEL);
termcap_add("kb",KEY_BS);
termcap_add("kl",KEY_LEFT);
termcap_add("kd",KEY_DOWN);
termcap_add("ku",KEY_UP);
termcap_add("kr",KEY_RIGHT);
termcap_add("k0",KEY_F+0);
termcap_add("k1",KEY_F+1);
termcap_add("k2",KEY_F+2);
termcap_add("k3",KEY_F+3);
termcap_add("k4",KEY_F+4);
termcap_add("k5",KEY_F+5);
termcap_add("k6",KEY_F+6);
termcap_add("k7",KEY_F+7);
termcap_add("k8",KEY_F+8);
termcap_add("k9",KEY_F+9);
termcap_add("k;",KEY_F+10);
termcap_add("kP",MP_KEY_PGUP);
termcap_add("kN",MP_KEY_PGDWN);
termcap_add("kh",MP_KEY_HOME);
termcap_add("kH",MP_KEY_END);
termcap_add("kI",MP_KEY_INS);
termcap_add("kD",MP_KEY_DEL);
termcap_add("kb",MP_KEY_BS);
termcap_add("kl",MP_KEY_LEFT);
termcap_add("kd",MP_KEY_DOWN);
termcap_add("ku",MP_KEY_UP);
termcap_add("kr",MP_KEY_RIGHT);
termcap_add("k0",MP_KEY_F+0);
termcap_add("k1",MP_KEY_F+1);
termcap_add("k2",MP_KEY_F+2);
termcap_add("k3",MP_KEY_F+3);
termcap_add("k4",MP_KEY_F+4);
termcap_add("k5",MP_KEY_F+5);
termcap_add("k6",MP_KEY_F+6);
termcap_add("k7",MP_KEY_F+7);
termcap_add("k8",MP_KEY_F+8);
termcap_add("k9",MP_KEY_F+9);
termcap_add("k;",MP_KEY_F+10);
return getch2_key_db;
}
@ -192,20 +192,20 @@ bool getch2(struct mp_fifo *fifo)
code = getch2_buf[0];
/* Check the well-known codes... */
if (code != 27) {
if (code == 'A'-64) code = KEY_HOME;
else if (code == 'E'-64) code = KEY_END;
else if (code == 'D'-64) code = KEY_DEL;
else if (code == 'H'-64) code = KEY_BS;
else if (code == 'U'-64) code = KEY_PGUP;
else if (code == 'V'-64) code = KEY_PGDWN;
else if (code == 8 || code==127) code = KEY_BS;
if (code == 'A'-64) code = MP_KEY_HOME;
else if (code == 'E'-64) code = MP_KEY_END;
else if (code == 'D'-64) code = MP_KEY_DEL;
else if (code == 'H'-64) code = MP_KEY_BS;
else if (code == 'U'-64) code = MP_KEY_PGUP;
else if (code == 'V'-64) code = MP_KEY_PGDWN;
else if (code == 8 || code==127) code = MP_KEY_BS;
else if (code == 10 || code==13) {
if (getch2_len > 1) {
int c = getch2_buf[1];
if ((c == 10 || c == 13) && (c != code))
len = 2;
}
code = KEY_ENTER;
code = MP_KEY_ENTER;
} else {
int utf8len = bstr_parse_utf8_code_length(code);
if (utf8len > 0 && utf8len <= getch2_len) {
@ -221,19 +221,19 @@ bool getch2(struct mp_fifo *fifo)
else if (getch2_len > 1) {
int c = getch2_buf[1];
if (c == 27) {
code = KEY_ESC;
code = MP_KEY_ESC;
len = 2;
goto found;
}
if (c >= '0' && c <= '9') {
code = c-'0'+KEY_F;
code = c-'0'+MP_KEY_F;
len = 2;
goto found;
}
if (getch2_len >= 4 && c == '[' && getch2_buf[2] == '[') {
int c = getch2_buf[3];
if (c >= 'A' && c < 'A'+12) {
code = KEY_F+1 + c-'A';
code = MP_KEY_F+1 + c-'A';
len = 4;
goto found;
}
@ -241,9 +241,9 @@ bool getch2(struct mp_fifo *fifo)
if ((c == '[' || c == 'O') && getch2_len >= 3) {
int c = getch2_buf[2];
const int ctable[] = {
KEY_UP, KEY_DOWN, KEY_RIGHT, KEY_LEFT, 0,
KEY_END, KEY_PGDWN, KEY_HOME, KEY_PGUP, 0, 0, KEY_INS, 0, 0, 0,
KEY_F+1, KEY_F+2, KEY_F+3, KEY_F+4};
MP_KEY_UP, MP_KEY_DOWN, MP_KEY_RIGHT, MP_KEY_LEFT, 0,
MP_KEY_END, MP_KEY_PGDWN, MP_KEY_HOME, MP_KEY_PGUP, 0, 0, MP_KEY_INS, 0, 0, 0,
MP_KEY_F+1, MP_KEY_F+2, MP_KEY_F+3, MP_KEY_F+4};
if (c >= 'A' && c <= 'S')
if (ctable[c - 'A']) {
code = ctable[c - 'A'];
@ -253,7 +253,7 @@ bool getch2(struct mp_fifo *fifo)
}
if (getch2_len >= 4 && c == '[' && getch2_buf[3] == '~') {
int c = getch2_buf[2];
const int ctable[8] = {KEY_HOME, KEY_INS, KEY_DEL, KEY_END, KEY_PGUP, KEY_PGDWN, KEY_HOME, KEY_END};
const int ctable[8] = {MP_KEY_HOME, MP_KEY_INS, MP_KEY_DEL, MP_KEY_END, MP_KEY_PGUP, MP_KEY_PGDWN, MP_KEY_HOME, MP_KEY_END};
if (c >= '1' && c <= '8') {
code = ctable[c - '1'];
len = 4;
@ -270,7 +270,7 @@ bool getch2(struct mp_fifo *fifo)
int a = i*10 + j;
for (i = 0; i < 20; i++)
if (ftable[i] == a) {
code = KEY_F+1 + i;
code = MP_KEY_F+1 + i;
len = 5;
goto found;
}

28
video/out/cocoa_common.m
View File

@ -656,10 +656,10 @@ void create_menu()
- (BOOL)resignFirstResponder { return YES; }
- (BOOL)windowShouldClose:(id)sender
{
mplayer_put_key(_vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(_vo->key_fifo, MP_KEY_CLOSE_WIN);
// We have to wait for MPlayer to handle this,
// otherwise we are in trouble if the
// KEY_CLOSE_WIN handler is disabled
// MP_KEY_CLOSE_WIN handler is disabled
return NO;
}
@ -673,7 +673,7 @@ void create_menu()
- (void)handleQuitEvent:(NSAppleEventDescriptor*)e
withReplyEvent:(NSAppleEventDescriptor*)r
{
mplayer_put_key(_vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(_vo->key_fifo, MP_KEY_CLOSE_WIN);
}
- (void)keyDown:(NSEvent *)theEvent
@ -689,14 +689,14 @@ void create_menu()
if (key > -1) {
if ([theEvent modifierFlags] & NSShiftKeyMask)
key |= KEY_MODIFIER_SHIFT;
key |= MP_KEY_MODIFIER_SHIFT;
if ([theEvent modifierFlags] & NSControlKeyMask)
key |= KEY_MODIFIER_CTRL;
key |= MP_KEY_MODIFIER_CTRL;
if (([theEvent modifierFlags] & NSLeftAlternateKeyMask) ==
NSLeftAlternateKeyMask)
key |= KEY_MODIFIER_ALT;
key |= MP_KEY_MODIFIER_ALT;
if ([theEvent modifierFlags] & NSCommandKeyMask)
key |= KEY_MODIFIER_META;
key |= MP_KEY_MODIFIER_META;
mplayer_put_key(_vo->key_fifo, key);
}
}
@ -760,17 +760,17 @@ void create_menu()
static const CGFloat threshold = 10;
while (s->accumulated_scroll >= threshold) {
s->accumulated_scroll -= threshold;
mplayer_put_key(_vo->key_fifo, MOUSE_BTN3);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN3);
}
while (s->accumulated_scroll <= -threshold) {
s->accumulated_scroll += threshold;
mplayer_put_key(_vo->key_fifo, MOUSE_BTN4);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN4);
}
} else {
if (delta > 0)
mplayer_put_key(_vo->key_fifo, MOUSE_BTN3);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN3);
else
mplayer_put_key(_vo->key_fifo, MOUSE_BTN4);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN4);
}
}
@ -786,17 +786,17 @@ void create_menu()
case NSRightMouseDown:
case NSOtherMouseDown:
mplayer_put_key(_vo->key_fifo,
(MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN);
(MP_MOUSE_BTN0 + buttonNumber) | MP_KEY_STATE_DOWN);
// Looks like Cocoa doesn't create MouseUp events when we are
// doing the second click in a double click. Put in the key_fifo
// the key that would be put from the MouseUp handling code.
if([theEvent clickCount] == 2)
mplayer_put_key(_vo->key_fifo, MOUSE_BTN0 + buttonNumber);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN0 + buttonNumber);
break;
case NSLeftMouseUp:
case NSRightMouseUp:
case NSOtherMouseUp:
mplayer_put_key(_vo->key_fifo, MOUSE_BTN0 + buttonNumber);
mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN0 + buttonNumber);
break;
}
}

30
video/out/osx_common.m
View File

@ -79,30 +79,30 @@
static const struct mp_keymap keymap[] = {
// special keys
{0x34, KEY_ENTER}, // Enter key on some iBooks?
{kVK_Return, KEY_ENTER},
{kVK_Escape, KEY_ESC},
{kVK_Delete, KEY_BACKSPACE}, {kVK_Option, KEY_BACKSPACE}, {kVK_Control, KEY_BACKSPACE}, {kVK_Shift, KEY_BACKSPACE},
{kVK_Tab, KEY_TAB},
{0x34, MP_KEY_ENTER}, // Enter key on some iBooks?
{kVK_Return, MP_KEY_ENTER},
{kVK_Escape, MP_KEY_ESC},
{kVK_Delete, MP_KEY_BACKSPACE}, {kVK_Option, MP_KEY_BACKSPACE}, {kVK_Control, MP_KEY_BACKSPACE}, {kVK_Shift, MP_KEY_BACKSPACE},
{kVK_Tab, MP_KEY_TAB},
// cursor keys
{kVK_UpArrow, KEY_UP}, {kVK_DownArrow, KEY_DOWN}, {kVK_LeftArrow, KEY_LEFT}, {kVK_RightArrow, KEY_RIGHT},
{kVK_UpArrow, MP_KEY_UP}, {kVK_DownArrow, MP_KEY_DOWN}, {kVK_LeftArrow, MP_KEY_LEFT}, {kVK_RightArrow, MP_KEY_RIGHT},
// navigation block
{kVK_Help, KEY_INSERT}, {kVK_ForwardDelete, KEY_DELETE}, {kVK_Home, KEY_HOME},
{kVK_End, KEY_END}, {kVK_PageUp, KEY_PAGE_UP}, {kVK_PageDown, KEY_PAGE_DOWN},
{kVK_Help, MP_KEY_INSERT}, {kVK_ForwardDelete, MP_KEY_DELETE}, {kVK_Home, MP_KEY_HOME},
{kVK_End, MP_KEY_END}, {kVK_PageUp, MP_KEY_PAGE_UP}, {kVK_PageDown, MP_KEY_PAGE_DOWN},
// F-keys
{kVK_F1, KEY_F + 1}, {kVK_F2, KEY_F + 2}, {kVK_F3, KEY_F + 3}, {kVK_F4, KEY_F + 4},
{kVK_F5, KEY_F + 5}, {kVK_F6, KEY_F + 6}, {kVK_F7, KEY_F + 7}, {kVK_F8, KEY_F + 8},
{kVK_F9, KEY_F + 9}, {kVK_F10, KEY_F + 10}, {kVK_F11, KEY_F + 11}, {kVK_F12, KEY_F + 12},
{kVK_F1, MP_KEY_F + 1}, {kVK_F2, MP_KEY_F + 2}, {kVK_F3, MP_KEY_F + 3}, {kVK_F4, MP_KEY_F + 4},
{kVK_F5, MP_KEY_F + 5}, {kVK_F6, MP_KEY_F + 6}, {kVK_F7, MP_KEY_F + 7}, {kVK_F8, MP_KEY_F + 8},
{kVK_F9, MP_KEY_F + 9}, {kVK_F10, MP_KEY_F + 10}, {kVK_F11, MP_KEY_F + 11}, {kVK_F12, MP_KEY_F + 12},
// numpad
{kVK_ANSI_KeypadPlus, '+'}, {kVK_ANSI_KeypadMinus, '-'}, {kVK_ANSI_KeypadMultiply, '*'},
{kVK_ANSI_KeypadDivide, '/'}, {kVK_ANSI_KeypadEnter, KEY_KPENTER}, {kVK_ANSI_KeypadDecimal, KEY_KPDEC},
{kVK_ANSI_Keypad0, KEY_KP0}, {kVK_ANSI_Keypad1, KEY_KP1}, {kVK_ANSI_Keypad2, KEY_KP2}, {kVK_ANSI_Keypad3, KEY_KP3},
{kVK_ANSI_Keypad4, KEY_KP4}, {kVK_ANSI_Keypad5, KEY_KP5}, {kVK_ANSI_Keypad6, KEY_KP6}, {kVK_ANSI_Keypad7, KEY_KP7},
{kVK_ANSI_Keypad8, KEY_KP8}, {kVK_ANSI_Keypad9, KEY_KP9},
{kVK_ANSI_KeypadDivide, '/'}, {kVK_ANSI_KeypadEnter, MP_KEY_KPENTER}, {kVK_ANSI_KeypadDecimal, MP_KEY_KPDEC},
{kVK_ANSI_Keypad0, MP_KEY_KP0}, {kVK_ANSI_Keypad1, MP_KEY_KP1}, {kVK_ANSI_Keypad2, MP_KEY_KP2}, {kVK_ANSI_Keypad3, MP_KEY_KP3},
{kVK_ANSI_Keypad4, MP_KEY_KP4}, {kVK_ANSI_Keypad5, MP_KEY_KP5}, {kVK_ANSI_Keypad6, MP_KEY_KP6}, {kVK_ANSI_Keypad7, MP_KEY_KP7},
{kVK_ANSI_Keypad8, MP_KEY_KP8}, {kVK_ANSI_Keypad9, MP_KEY_KP9},
{0, 0}
};

38
video/out/vo_caca.c
View File

@ -212,22 +212,22 @@ static void set_next_str(const char * const *list, const char **str,
}
static const struct mp_keymap keysym_map[] = {
{CACA_KEY_RETURN, KEY_ENTER}, {CACA_KEY_ESCAPE, KEY_ESC},
{CACA_KEY_UP, KEY_DOWN}, {CACA_KEY_DOWN, KEY_DOWN},
{CACA_KEY_LEFT, KEY_LEFT}, {CACA_KEY_RIGHT, KEY_RIGHT},
{CACA_KEY_PAGEUP, KEY_PAGE_UP}, {CACA_KEY_PAGEDOWN, KEY_PAGE_DOWN},
{CACA_KEY_HOME, KEY_HOME}, {CACA_KEY_END, KEY_END},
{CACA_KEY_INSERT, KEY_INSERT}, {CACA_KEY_DELETE, KEY_DELETE},
{CACA_KEY_BACKSPACE, KEY_BACKSPACE}, {CACA_KEY_TAB, KEY_TAB},
{CACA_KEY_PAUSE, KEY_PAUSE},
{CACA_KEY_F1, KEY_F+1}, {CACA_KEY_F2, KEY_F+2},
{CACA_KEY_F3, KEY_F+3}, {CACA_KEY_F4, KEY_F+4},
{CACA_KEY_F5, KEY_F+5}, {CACA_KEY_F6, KEY_F+6},
{CACA_KEY_F7, KEY_F+7}, {CACA_KEY_F8, KEY_F+8},
{CACA_KEY_F9, KEY_F+9}, {CACA_KEY_F10, KEY_F+10},
{CACA_KEY_F11, KEY_F+11}, {CACA_KEY_F12, KEY_F+12},
{CACA_KEY_F13, KEY_F+13}, {CACA_KEY_F14, KEY_F+14},
{CACA_KEY_F15, KEY_F+15},
{CACA_KEY_RETURN, MP_KEY_ENTER}, {CACA_KEY_ESCAPE, MP_KEY_ESC},
{CACA_KEY_UP, MP_KEY_UP}, {CACA_KEY_DOWN, MP_KEY_DOWN},
{CACA_KEY_LEFT, MP_KEY_LEFT}, {CACA_KEY_RIGHT, MP_KEY_RIGHT},
{CACA_KEY_PAGEUP, MP_KEY_PAGE_UP}, {CACA_KEY_PAGEDOWN, MP_KEY_PAGE_DOWN},
{CACA_KEY_HOME, MP_KEY_HOME}, {CACA_KEY_END, MP_KEY_END},
{CACA_KEY_INSERT, MP_KEY_INSERT}, {CACA_KEY_DELETE, MP_KEY_DELETE},
{CACA_KEY_BACKSPACE, MP_KEY_BACKSPACE}, {CACA_KEY_TAB, MP_KEY_TAB},
{CACA_KEY_PAUSE, MP_KEY_PAUSE},
{CACA_KEY_F1, MP_KEY_F+1}, {CACA_KEY_F2, MP_KEY_F+2},
{CACA_KEY_F3, MP_KEY_F+3}, {CACA_KEY_F4, MP_KEY_F+4},
{CACA_KEY_F5, MP_KEY_F+5}, {CACA_KEY_F6, MP_KEY_F+6},
{CACA_KEY_F7, MP_KEY_F+7}, {CACA_KEY_F8, MP_KEY_F+8},
{CACA_KEY_F9, MP_KEY_F+9}, {CACA_KEY_F10, MP_KEY_F+10},
{CACA_KEY_F11, MP_KEY_F+11}, {CACA_KEY_F12, MP_KEY_F+12},
{CACA_KEY_F13, MP_KEY_F+13}, {CACA_KEY_F14, MP_KEY_F+14},
{CACA_KEY_F15, MP_KEY_F+15},
{0, 0}
};
@ -242,7 +242,7 @@ static void check_events(struct vo *vo)
resize();
break;
case CACA_EVENT_QUIT:
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case CACA_EVENT_MOUSE_MOTION:
vo_mouse_movement(vo, cev.data.mouse.x, cev.data.mouse.y);
@ -250,12 +250,12 @@ static void check_events(struct vo *vo)
case CACA_EVENT_MOUSE_PRESS:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo,
(MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_DOWN);
(MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_DOWN);
break;
case CACA_EVENT_MOUSE_RELEASE:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo,
MOUSE_BTN0 + cev.data.mouse.button - 1);
MP_MOUSE_BTN0 + cev.data.mouse.button - 1);
break;
case CACA_EVENT_KEY_PRESS:
{

148
video/out/vo_sdl.c
View File

@ -98,70 +98,70 @@ struct keymap_entry {
int mpv;
};
const struct keymap_entry keys[] = {
{SDLK_RETURN, KEY_ENTER},
{SDLK_ESCAPE, KEY_ESC},
{SDLK_BACKSPACE, KEY_BACKSPACE},
{SDLK_TAB, KEY_TAB},
{SDLK_PRINTSCREEN, KEY_PRINT},
{SDLK_PAUSE, KEY_PAUSE},
{SDLK_INSERT, KEY_INSERT},
{SDLK_HOME, KEY_HOME},
{SDLK_PAGEUP, KEY_PAGE_UP},
{SDLK_DELETE, KEY_DELETE},
{SDLK_END, KEY_END},
{SDLK_PAGEDOWN, KEY_PAGE_DOWN},
{SDLK_RIGHT, KEY_RIGHT},
{SDLK_LEFT, KEY_LEFT},
{SDLK_DOWN, KEY_DOWN},
{SDLK_UP, KEY_UP},
{SDLK_KP_ENTER, KEY_KPENTER},
{SDLK_KP_1, KEY_KP1},
{SDLK_KP_2, KEY_KP2},
{SDLK_KP_3, KEY_KP3},
{SDLK_KP_4, KEY_KP4},
{SDLK_KP_5, KEY_KP5},
{SDLK_KP_6, KEY_KP6},
{SDLK_KP_7, KEY_KP7},
{SDLK_KP_8, KEY_KP8},
{SDLK_KP_9, KEY_KP9},
{SDLK_KP_0, KEY_KP0},
{SDLK_KP_PERIOD, KEY_KPDEC},
{SDLK_POWER, KEY_POWER},
{SDLK_MENU, KEY_MENU},
{SDLK_STOP, KEY_STOP},
{SDLK_MUTE, KEY_MUTE},
{SDLK_VOLUMEUP, KEY_VOLUME_UP},
{SDLK_VOLUMEDOWN, KEY_VOLUME_DOWN},
{SDLK_KP_COMMA, KEY_KPDEC},
{SDLK_AUDIONEXT, KEY_NEXT},
{SDLK_AUDIOPREV, KEY_PREV},
{SDLK_AUDIOSTOP, KEY_STOP},
{SDLK_AUDIOPLAY, KEY_PLAY},
{SDLK_AUDIOMUTE, KEY_MUTE},
{SDLK_F1, KEY_F + 1},
{SDLK_F2, KEY_F + 2},
{SDLK_F3, KEY_F + 3},
{SDLK_F4, KEY_F + 4},
{SDLK_F5, KEY_F + 5},
{SDLK_F6, KEY_F + 6},
{SDLK_F7, KEY_F + 7},
{SDLK_F8, KEY_F + 8},
{SDLK_F9, KEY_F + 9},
{SDLK_F10, KEY_F + 10},
{SDLK_F11, KEY_F + 11},
{SDLK_F12, KEY_F + 12},
{SDLK_F13, KEY_F + 13},
{SDLK_F14, KEY_F + 14},
{SDLK_F15, KEY_F + 15},
{SDLK_F16, KEY_F + 16},
{SDLK_F17, KEY_F + 17},
{SDLK_F18, KEY_F + 18},
{SDLK_F19, KEY_F + 19},
{SDLK_F20, KEY_F + 20},
{SDLK_F21, KEY_F + 21},
{SDLK_F22, KEY_F + 22},
{SDLK_F23, KEY_F + 23},
{SDLK_F24, KEY_F + 24}
{SDLK_RETURN, MP_KEY_ENTER},
{SDLK_ESCAPE, MP_KEY_ESC},
{SDLK_BACKSPACE, MP_KEY_BACKSPACE},
{SDLK_TAB, MP_KEY_TAB},
{SDLK_PRINTSCREEN, MP_KEY_PRINT},
{SDLK_PAUSE, MP_KEY_PAUSE},
{SDLK_INSERT, MP_KEY_INSERT},
{SDLK_HOME, MP_KEY_HOME},
{SDLK_PAGEUP, MP_KEY_PAGE_UP},
{SDLK_DELETE, MP_KEY_DELETE},
{SDLK_END, MP_KEY_END},
{SDLK_PAGEDOWN, MP_KEY_PAGE_DOWN},
{SDLK_RIGHT, MP_KEY_RIGHT},
{SDLK_LEFT, MP_KEY_LEFT},
{SDLK_DOWN, MP_KEY_DOWN},
{SDLK_UP, MP_KEY_UP},
{SDLK_KP_ENTER, MP_KEY_KPENTER},
{SDLK_KP_1, MP_KEY_KP1},
{SDLK_KP_2, MP_KEY_KP2},
{SDLK_KP_3, MP_KEY_KP3},
{SDLK_KP_4, MP_KEY_KP4},
{SDLK_KP_5, MP_KEY_KP5},
{SDLK_KP_6, MP_KEY_KP6},
{SDLK_KP_7, MP_KEY_KP7},
{SDLK_KP_8, MP_KEY_KP8},
{SDLK_KP_9, MP_KEY_KP9},
{SDLK_KP_0, MP_KEY_KP0},
{SDLK_KP_PERIOD, MP_KEY_KPDEC},
{SDLK_POWER, MP_KEY_POWER},
{SDLK_MENU, MP_KEY_MENU},
{SDLK_STOP, MP_KEY_STOP},
{SDLK_MUTE, MP_KEY_MUTE},
{SDLK_VOLUMEUP, MP_KEY_VOLUME_UP},
{SDLK_VOLUMEDOWN, MP_KEY_VOLUME_DOWN},
{SDLK_KP_COMMA, MP_KEY_KPDEC},
{SDLK_AUDIONEXT, MP_KEY_NEXT},
{SDLK_AUDIOPREV, MP_KEY_PREV},
{SDLK_AUDIOSTOP, MP_KEY_STOP},
{SDLK_AUDIOPLAY, MP_KEY_PLAY},
{SDLK_AUDIOMUTE, MP_KEY_MUTE},
{SDLK_F1, MP_KEY_F + 1},
{SDLK_F2, MP_KEY_F + 2},
{SDLK_F3, MP_KEY_F + 3},
{SDLK_F4, MP_KEY_F + 4},
{SDLK_F5, MP_KEY_F + 5},
{SDLK_F6, MP_KEY_F + 6},
{SDLK_F7, MP_KEY_F + 7},
{SDLK_F8, MP_KEY_F + 8},
{SDLK_F9, MP_KEY_F + 9},
{SDLK_F10, MP_KEY_F + 10},
{SDLK_F11, MP_KEY_F + 11},
{SDLK_F12, MP_KEY_F + 12},
{SDLK_F13, MP_KEY_F + 13},
{SDLK_F14, MP_KEY_F + 14},
{SDLK_F15, MP_KEY_F + 15},
{SDLK_F16, MP_KEY_F + 16},
{SDLK_F17, MP_KEY_F + 17},
{SDLK_F18, MP_KEY_F + 18},
{SDLK_F19, MP_KEY_F + 19},
{SDLK_F20, MP_KEY_F + 20},
{SDLK_F21, MP_KEY_F + 21},
{SDLK_F22, MP_KEY_F + 22},
{SDLK_F23, MP_KEY_F + 23},
{SDLK_F24, MP_KEY_F + 24}
};
struct priv {
@ -505,7 +505,7 @@ static void check_events(struct vo *vo)
}
break;
case SDL_QUIT:
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case SDL_TEXTINPUT: {
int sdl_mod = SDL_GetModState();
@ -513,11 +513,11 @@ static void check_events(struct vo *vo)
// we ignore KMOD_LSHIFT, KMOD_RSHIFT and KMOD_RALT because
// these are already factored into ev.text.text
if (sdl_mod & (KMOD_LCTRL | KMOD_RCTRL))
mpv_mod |= KEY_MODIFIER_CTRL;
mpv_mod |= MP_KEY_MODIFIER_CTRL;
if (sdl_mod & KMOD_LALT)
mpv_mod |= KEY_MODIFIER_ALT;
mpv_mod |= MP_KEY_MODIFIER_ALT;
if (sdl_mod & (KMOD_LGUI | KMOD_RGUI))
mpv_mod |= KEY_MODIFIER_META;
mpv_mod |= MP_KEY_MODIFIER_META;
struct bstr t = {
ev.text.text, strlen(ev.text.text)
};
@ -542,13 +542,13 @@ static void check_events(struct vo *vo)
}
if (keycode) {
if (ev.key.keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT))
keycode |= KEY_MODIFIER_SHIFT;
keycode |= MP_KEY_MODIFIER_SHIFT;
if (ev.key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL))
keycode |= KEY_MODIFIER_CTRL;
keycode |= MP_KEY_MODIFIER_CTRL;
if (ev.key.keysym.mod & (KMOD_LALT | KMOD_RALT))
keycode |= KEY_MODIFIER_ALT;
keycode |= MP_KEY_MODIFIER_ALT;
if (ev.key.keysym.mod & (KMOD_LGUI | KMOD_RGUI))
keycode |= KEY_MODIFIER_META;
keycode |= MP_KEY_MODIFIER_META;
mplayer_put_key(vo->key_fifo, keycode);
}
break;
@ -568,7 +568,7 @@ static void check_events(struct vo *vo)
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
(MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_DOWN);
(MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_DOWN);
break;
case SDL_MOUSEBUTTONUP:
if (opts->cursor_autohide_delay >= 0) {
@ -577,7 +577,7 @@ static void check_events(struct vo *vo)
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
(MOUSE_BTN0 + ev.button.button - 1));
(MP_MOUSE_BTN0 + ev.button.button - 1));
break;
case SDL_MOUSEWHEEL:
break;

54
video/out/w32_common.c
View File

@ -39,25 +39,25 @@ static const wchar_t classname[] = L"mpv";
static const struct mp_keymap vk_map[] = {
// special keys
{VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB},
{VK_RETURN, KEY_ENTER}, {VK_PAUSE, KEY_PAUSE}, {VK_SNAPSHOT, KEY_PRINT},
{VK_ESCAPE, MP_KEY_ESC}, {VK_BACK, MP_KEY_BS}, {VK_TAB, MP_KEY_TAB},
{VK_RETURN, MP_KEY_ENTER}, {VK_PAUSE, MP_KEY_PAUSE}, {VK_SNAPSHOT, MP_KEY_PRINT},
// cursor keys
{VK_LEFT, KEY_LEFT}, {VK_UP, KEY_UP}, {VK_RIGHT, KEY_RIGHT}, {VK_DOWN, KEY_DOWN},
{VK_LEFT, MP_KEY_LEFT}, {VK_UP, MP_KEY_UP}, {VK_RIGHT, MP_KEY_RIGHT}, {VK_DOWN, MP_KEY_DOWN},
// navigation block
{VK_INSERT, KEY_INSERT}, {VK_DELETE, KEY_DELETE}, {VK_HOME, KEY_HOME}, {VK_END, KEY_END},
{VK_PRIOR, KEY_PAGE_UP}, {VK_NEXT, KEY_PAGE_DOWN},
{VK_INSERT, MP_KEY_INSERT}, {VK_DELETE, MP_KEY_DELETE}, {VK_HOME, MP_KEY_HOME}, {VK_END, MP_KEY_END},
{VK_PRIOR, MP_KEY_PAGE_UP}, {VK_NEXT, MP_KEY_PAGE_DOWN},
// F-keys
{VK_F1, KEY_F+1}, {VK_F2, KEY_F+2}, {VK_F3, KEY_F+3}, {VK_F4, KEY_F+4},
{VK_F5, KEY_F+5}, {VK_F6, KEY_F+6}, {VK_F7, KEY_F+7}, {VK_F8, KEY_F+8},
{VK_F9, KEY_F+9}, {VK_F10, KEY_F+10}, {VK_F11, KEY_F+11}, {VK_F12, KEY_F+12},
{VK_F1, MP_KEY_F+1}, {VK_F2, MP_KEY_F+2}, {VK_F3, MP_KEY_F+3}, {VK_F4, MP_KEY_F+4},
{VK_F5, MP_KEY_F+5}, {VK_F6, MP_KEY_F+6}, {VK_F7, MP_KEY_F+7}, {VK_F8, MP_KEY_F+8},
{VK_F9, MP_KEY_F+9}, {VK_F10, MP_KEY_F+10}, {VK_F11, MP_KEY_F+11}, {VK_F12, MP_KEY_F+12},
// numpad
{VK_NUMPAD0, KEY_KP0}, {VK_NUMPAD1, KEY_KP1}, {VK_NUMPAD2, KEY_KP2},
{VK_NUMPAD3, KEY_KP3}, {VK_NUMPAD4, KEY_KP4}, {VK_NUMPAD5, KEY_KP5},
{VK_NUMPAD6, KEY_KP6}, {VK_NUMPAD7, KEY_KP7}, {VK_NUMPAD8, KEY_KP8},
{VK_NUMPAD9, KEY_KP9}, {VK_DECIMAL, KEY_KPDEC},
{VK_NUMPAD0, MP_KEY_KP0}, {VK_NUMPAD1, MP_KEY_KP1}, {VK_NUMPAD2, MP_KEY_KP2},
{VK_NUMPAD3, MP_KEY_KP3}, {VK_NUMPAD4, MP_KEY_KP4}, {VK_NUMPAD5, MP_KEY_KP5},
{VK_NUMPAD6, MP_KEY_KP6}, {VK_NUMPAD7, MP_KEY_KP7}, {VK_NUMPAD8, MP_KEY_KP8},
{VK_NUMPAD9, MP_KEY_KP9}, {VK_DECIMAL, MP_KEY_KPDEC},
{0, 0}
};
@ -103,11 +103,11 @@ static int mod_state(struct vo *vo)
{
int res = 0;
if (key_state(vo, VK_CONTROL))
res |= KEY_MODIFIER_CTRL;
res |= MP_KEY_MODIFIER_CTRL;
if (key_state(vo, VK_SHIFT))
res |= KEY_MODIFIER_SHIFT;
res |= MP_KEY_MODIFIER_SHIFT;
if (key_state(vo, VK_MENU))
res |= KEY_MODIFIER_ALT;
res |= MP_KEY_MODIFIER_ALT;
return res;
}
@ -171,7 +171,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
break;
case WM_CLOSE:
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case WM_SYSCOMMAND:
switch (wParam) {
@ -198,15 +198,15 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
// E.g. AltGr+9 on a German keyboard would yield Ctrl+Alt+[
// Warning: wine handles this differently. Don't test this on wine!
if (key_state(vo, VK_RMENU))
mods &= ~(KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT);
mods &= ~(MP_KEY_MODIFIER_CTRL | MP_KEY_MODIFIER_ALT);
// Apparently Ctrl+A to Ctrl+Z is special cased, and produces
// character codes from 1-26. Work it around.
// Also, enter/return (including the keypad variant) and CTRL+J both
// map to wParam==10. As a workaround, check VK_RETURN to
// distinguish these two key combinations.
if ((mods & KEY_MODIFIER_CTRL) && code >= 1 && code <= 26
if ((mods & MP_KEY_MODIFIER_CTRL) && code >= 1 && code <= 26
&& !key_state(vo, VK_RETURN))
code = code - 1 + (mods & KEY_MODIFIER_SHIFT ? 'A' : 'a');
code = code - 1 + (mods & MP_KEY_MODIFIER_SHIFT ? 'A' : 'a');
if (code >= 32 && code < (1<<21)) {
mplayer_put_key(vo->key_fifo, code | mods);
// At least with Alt+char, not calling DefWindowProcW stops
@ -217,7 +217,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
case WM_LBUTTONDOWN:
if (!vo_nomouse_input && (vo_fs || (wParam & MK_CONTROL))) {
mplayer_put_key(vo->key_fifo, MOUSE_BTN0 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN0 | mod_state(vo));
break;
}
if (!vo_fs) {
@ -228,11 +228,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
break;
case WM_MBUTTONDOWN:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo, MOUSE_BTN1 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN1 | mod_state(vo));
break;
case WM_RBUTTONDOWN:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo, MOUSE_BTN2 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN2 | mod_state(vo));
break;
case WM_MOUSEMOVE:
vo_mouse_movement(vo, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
@ -241,18 +241,18 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
if (!vo_nomouse_input) {
int x = GET_WHEEL_DELTA_WPARAM(wParam);
if (x > 0)
mplayer_put_key(vo->key_fifo, MOUSE_BTN3 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN3 | mod_state(vo));
else
mplayer_put_key(vo->key_fifo, MOUSE_BTN4 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN4 | mod_state(vo));
}
break;
case WM_XBUTTONDOWN:
if (!vo_nomouse_input) {
int x = HIWORD(wParam);
if (x == 1)
mplayer_put_key(vo->key_fifo, MOUSE_BTN5 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN5 | mod_state(vo));
else // if (x == 2)
mplayer_put_key(vo->key_fifo, MOUSE_BTN6 | mod_state(vo));
mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN6 | mod_state(vo));
}
break;
}
@ -302,7 +302,7 @@ int vo_w32_check_events(struct vo *vo)
MoveWindow(w32->window, 0, 0, r.right, r.bottom, FALSE);
if (!IsWindow(WIN_ID_TO_HWND(WinID)))
// Window has probably been closed, e.g. due to program crash
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
}
return w32->event_flags;

72
video/out/x11_common.c
View File

@ -501,44 +501,50 @@ int vo_x11_init(struct vo *vo)
static const struct mp_keymap keymap[] = {
// special keys
{XK_Pause, KEY_PAUSE}, {XK_Escape, KEY_ESC}, {XK_BackSpace, KEY_BS},
{XK_Tab, KEY_TAB}, {XK_Return, KEY_ENTER},
{XK_Menu, KEY_MENU}, {XK_Print, KEY_PRINT},
{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},
// cursor keys
{XK_Left, KEY_LEFT}, {XK_Right, KEY_RIGHT}, {XK_Up, KEY_UP}, {XK_Down, KEY_DOWN},
{XK_Left, MP_KEY_LEFT}, {XK_Right, MP_KEY_RIGHT}, {XK_Up, MP_KEY_UP},
{XK_Down, MP_KEY_DOWN},
// navigation block
{XK_Insert, KEY_INSERT}, {XK_Delete, KEY_DELETE}, {XK_Home, KEY_HOME}, {XK_End, KEY_END},
{XK_Page_Up, KEY_PAGE_UP}, {XK_Page_Down, KEY_PAGE_DOWN},
{XK_Insert, MP_KEY_INSERT}, {XK_Delete, MP_KEY_DELETE},
{XK_Home, MP_KEY_HOME}, {XK_End, MP_KEY_END}, {XK_Page_Up, MP_KEY_PAGE_UP},
{XK_Page_Down, MP_KEY_PAGE_DOWN},
// F-keys
{XK_F1, KEY_F+1}, {XK_F2, KEY_F+2}, {XK_F3, KEY_F+3}, {XK_F4, KEY_F+4},
{XK_F5, KEY_F+5}, {XK_F6, KEY_F+6}, {XK_F7, KEY_F+7}, {XK_F8, KEY_F+8},
{XK_F9, KEY_F+9}, {XK_F10, KEY_F+10}, {XK_F11, KEY_F+11}, {XK_F12, KEY_F+12},
{XK_F1, MP_KEY_F+1}, {XK_F2, MP_KEY_F+2}, {XK_F3, MP_KEY_F+3},
{XK_F4, MP_KEY_F+4}, {XK_F5, MP_KEY_F+5}, {XK_F6, MP_KEY_F+6},
{XK_F7, MP_KEY_F+7}, {XK_F8, MP_KEY_F+8}, {XK_F9, MP_KEY_F+9},
{XK_F10, MP_KEY_F+10}, {XK_F11, MP_KEY_F+11}, {XK_F12, MP_KEY_F+12},
// numpad independent of numlock
{XK_KP_Subtract, '-'}, {XK_KP_Add, '+'}, {XK_KP_Multiply, '*'}, {XK_KP_Divide, '/'},
{XK_KP_Enter, KEY_KPENTER},
{XK_KP_Subtract, '-'}, {XK_KP_Add, '+'}, {XK_KP_Multiply, '*'},
{XK_KP_Divide, '/'}, {XK_KP_Enter, MP_KEY_KPENTER},
// numpad with numlock
{XK_KP_0, KEY_KP0}, {XK_KP_1, KEY_KP1}, {XK_KP_2, KEY_KP2},
{XK_KP_3, KEY_KP3}, {XK_KP_4, KEY_KP4}, {XK_KP_5, KEY_KP5},
{XK_KP_6, KEY_KP6}, {XK_KP_7, KEY_KP7}, {XK_KP_8, KEY_KP8},
{XK_KP_9, KEY_KP9}, {XK_KP_Decimal, KEY_KPDEC},
{XK_KP_Separator, KEY_KPDEC},
{XK_KP_0, MP_KEY_KP0}, {XK_KP_1, MP_KEY_KP1}, {XK_KP_2, MP_KEY_KP2},
{XK_KP_3, MP_KEY_KP3}, {XK_KP_4, MP_KEY_KP4}, {XK_KP_5, MP_KEY_KP5},
{XK_KP_6, MP_KEY_KP6}, {XK_KP_7, MP_KEY_KP7}, {XK_KP_8, MP_KEY_KP8},
{XK_KP_9, MP_KEY_KP9}, {XK_KP_Decimal, MP_KEY_KPDEC},
{XK_KP_Separator, MP_KEY_KPDEC},
// numpad without numlock
{XK_KP_Insert, KEY_KPINS}, {XK_KP_End, KEY_KP1}, {XK_KP_Down, KEY_KP2},
{XK_KP_Page_Down, KEY_KP3}, {XK_KP_Left, KEY_KP4}, {XK_KP_Begin, KEY_KP5},
{XK_KP_Right, KEY_KP6}, {XK_KP_Home, KEY_KP7}, {XK_KP_Up, KEY_KP8},
{XK_KP_Page_Up, KEY_KP9}, {XK_KP_Delete, KEY_KPDEL},
{XK_KP_Insert, MP_KEY_KPINS}, {XK_KP_End, MP_KEY_KP1},
{XK_KP_Down, MP_KEY_KP2}, {XK_KP_Page_Down, MP_KEY_KP3},
{XK_KP_Left, MP_KEY_KP4}, {XK_KP_Begin, MP_KEY_KP5},
{XK_KP_Right, MP_KEY_KP6}, {XK_KP_Home, MP_KEY_KP7}, {XK_KP_Up, MP_KEY_KP8},
{XK_KP_Page_Up, MP_KEY_KP9}, {XK_KP_Delete, MP_KEY_KPDEL},
#ifdef XF86XK_AudioPause
{XF86XK_MenuKB, KEY_MENU},
{XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP},
{XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT},
{XF86XK_AudioMute, KEY_MUTE}, {XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN}, {XF86XK_AudioRaiseVolume, KEY_VOLUME_UP},
{XF86XK_MenuKB, MP_KEY_MENU},
{XF86XK_AudioPlay, MP_KEY_PLAY}, {XF86XK_AudioPause, MP_KEY_PAUSE},
{XF86XK_AudioStop, MP_KEY_STOP}, {XF86XK_AudioPrev, MP_KEY_PREV},
{XF86XK_AudioNext, MP_KEY_NEXT}, {XF86XK_AudioMute, MP_KEY_MUTE},
{XF86XK_AudioLowerVolume, MP_KEY_VOLUME_DOWN},
{XF86XK_AudioRaiseVolume, MP_KEY_VOLUME_UP},
#endif
{0, 0}
@ -729,13 +735,13 @@ int vo_x11_check_events(struct vo *vo)
KeySym keySym = 0;
int modifiers = 0;
if (Event.xkey.state & ShiftMask)
modifiers |= KEY_MODIFIER_SHIFT;
modifiers |= MP_KEY_MODIFIER_SHIFT;
if (Event.xkey.state & ControlMask)
modifiers |= KEY_MODIFIER_CTRL;
modifiers |= MP_KEY_MODIFIER_CTRL;
if (Event.xkey.state & Mod1Mask)
modifiers |= KEY_MODIFIER_ALT;
modifiers |= MP_KEY_MODIFIER_ALT;
if (Event.xkey.state & Mod4Mask)
modifiers |= KEY_MODIFIER_META;
modifiers |= MP_KEY_MODIFIER_META;
if (x11->xic) {
Status status;
int len = Xutf8LookupString(x11->xic, &Event.xkey, buf,
@ -776,8 +782,8 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
(MOUSE_BTN0 + Event.xbutton.button - 1)
| MP_KEY_DOWN);
(MP_MOUSE_BTN0 + Event.xbutton.button - 1)
| MP_KEY_STATE_DOWN);
break;
case ButtonRelease:
if (opts->cursor_autohide_delay > -2) {
@ -786,7 +792,7 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
MOUSE_BTN0 + Event.xbutton.button - 1);
MP_MOUSE_BTN0 + Event.xbutton.button - 1);
break;
case PropertyNotify:
{
@ -808,12 +814,12 @@ int vo_x11_check_events(struct vo *vo)
break;
case DestroyNotify:
mp_msg(MSGT_VO, MSGL_WARN, "Our window was destroyed, exiting\n");
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case ClientMessage:
if (Event.xclient.message_type == x11->XAWM_PROTOCOLS &&
Event.xclient.data.l[0] == x11->XAWM_DELETE_WINDOW)
mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
default:
if (Event.type == x11->ShmCompletionEvent)