diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-06-29 11:39:06 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-29 11:39:06 +0300 |
| commit | a77e5f07ed513233314c18f3e45490fdfa11f6ba (patch) | |
| tree | a369f5e54f1b91729712272f1f73ad3f0e7d7d66 /input | |
| parent | 9caae9b385a6de3f4dae98bebb1be64a997c1472 (diff) | |
| parent | 27b88a09c5319deb62221b8cd0ecc14cd1136e4a (diff) | |
| download | mpv-a77e5f07ed513233314c18f3e45490fdfa11f6ba.tar.bz2 mpv-a77e5f07ed513233314c18f3e45490fdfa11f6ba.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 20 | ||||
| -rw-r--r-- | input/keycodes.h | 24 |
2 files changed, 42 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c index b9c51f14e9..94c15f42bb 100644 --- a/input/input.c +++ b/input/input.c @@ -277,6 +277,16 @@ static const mp_key_name_t key_names[] = { { 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" }, @@ -287,6 +297,16 @@ static const mp_key_name_t key_names[] = { { 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" }, diff --git a/input/keycodes.h b/input/keycodes.h index 31a9161826..45e7ec7d4b 100644 --- a/input/keycodes.h +++ b/input/keycodes.h @@ -140,7 +140,17 @@ #define MOUSE_BTN7 (MOUSE_BASE+7) #define MOUSE_BTN8 (MOUSE_BASE+8) #define MOUSE_BTN9 (MOUSE_BASE+9) -#define MOUSE_BTN_END (MOUSE_BASE+10) +#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 MOUSE_BASE_DBL (0x300|MP_NO_REPEAT_KEY) #define MOUSE_BTN0_DBL (MOUSE_BASE_DBL+0) @@ -153,7 +163,17 @@ #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_BTN_DBL_END (MOUSE_BASE_DBL+10) +#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 |