diff options
author | wm4 <wm4@nowhere> | 2013-07-02 14:00:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-02 14:00:24 +0200 |
commit | 70a8079c8e0109eb89db3f3278be2a75a710c95e (patch) | |
tree | b96d12490af3ca5e0ed95c1952ea89d0df5ac5e7 /core/mp_fifo.c | |
parent | 451f6788cea2f7a90badcf2fb7e1e3679fa513cb (diff) | |
download | mpv-70a8079c8e0109eb89db3f3278be2a75a710c95e.tar.bz2 mpv-70a8079c8e0109eb89db3f3278be2a75a710c95e.tar.xz |
core: remove mp_fifo indirection
For some reason mp_fifo specifically handled double clicks, and other
than that was a pointless wrapper around input.c functionality.
Move the double click handling into input.c, and get rid of mp_fifo. Add
some compatibility wrappers, because so much VO code uses these
functions. Where struct mp_fifo is still used it's just a casted
struct input_ctx.
Diffstat (limited to 'core/mp_fifo.c')
-rw-r--r-- | core/mp_fifo.c | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/core/mp_fifo.c b/core/mp_fifo.c deleted file mode 100644 index 1c83e99dcd..0000000000 --- a/core/mp_fifo.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdlib.h> -#include <assert.h> -#include <stdbool.h> -#include "osdep/timer.h" -#include "input/input.h" -#include "input/keycodes.h" -#include "mp_fifo.h" -#include "talloc.h" -#include "core/options.h" - - -struct mp_fifo { - struct MPOpts *opts; - struct input_ctx *input; - int last_key_down; - double last_down_time; -}; - -struct mp_fifo *mp_fifo_create(struct input_ctx *input, struct MPOpts *opts) -{ - struct mp_fifo *fifo = talloc_zero(NULL, struct mp_fifo); - fifo->input = input; - fifo->opts = opts; - return fifo; -} - -static void put_double(struct mp_fifo *fifo, int code) -{ - 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) -{ - double now = mp_time_sec(); - int doubleclick_time = fifo->opts->doubleclick_time; - // ignore system-doubleclick if we generate these events ourselves - int unmod = code & ~MP_KEY_MODIFIER_MASK; - if (doubleclick_time && MP_KEY_IS_MOUSE_BTN_DBL(unmod)) - return; - mp_input_feed_key(fifo->input, code); - if (code & MP_KEY_STATE_DOWN) { - code &= ~MP_KEY_STATE_DOWN; - if (fifo->last_key_down == code - && now - fifo->last_down_time < doubleclick_time / 1000.0) - put_double(fifo, code); - fifo->last_key_down = code; - fifo->last_down_time = now; - } -} - -void mplayer_put_key_utf8(struct mp_fifo *fifo, int mods, struct bstr t) -{ - while (t.len) { - int code = bstr_decode_utf8(t, &t); - if (code < 0) - break; - mplayer_put_key(fifo, code | mods); - } -} |