diff options
| author | wm4 <wm4@nowhere> | 2013-02-12 01:34:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-12 10:27:00 +0100 |
| commit | 75e6584ab3b06a02be37b447c397271c0d120b01 (patch) | |
| tree | bf912a16b719397df464fde4d46e6b84144a4029 /core/mp_fifo.c | |
| parent | 3ded26ccba9831ef4b4a2b22f2989fd9d5e72964 (diff) | |
| download | mpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.bz2 mpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.xz | |
Prefix keycode defines with MP_
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)
Diffstat (limited to 'core/mp_fifo.c')
| -rw-r--r-- | core/mp_fifo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/mp_fifo.c b/core/mp_fifo.c index f8410516d8..386eda5e80 100644 --- a/core/mp_fifo.c +++ b/core/mp_fifo.c @@ -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); |