mirror of
https://github.com/mpv-player/mpv
synced 2024-12-27 17:42:17 +00:00
82b8f89bae
Rework much of the logic related to reading from event sources and queuing commands. The two biggest architecture changes are: - The code buffering keycodes in mp_fifo.c is gone. Instead key input is now immediately fed to input.c and interpreted as commands, and then the commands are buffered instead. - mp_input_get_cmd() now always tries to read every available event from every event source and convert them to (buffered) commands. Before it would only process new events until one new command became available. Some relevant behavior changes: - Before commands could be lost when stream code called mp_input_check_interrupt() which read commands (to see if they were of types that triggered aborts during slow IO tasks) and then threw them away. This was especially an issue if cache was enabled and slow to read. Fixed - now it's possible to check whether there are queued commands which will abort playback of the current file without throwing other commands away. - mp_input_check_interrupt() now prints a message if it returns true. This is especially useful because the failures caused by aborted stream reads can trigger error messages from other code that was doing the read; the new message makes it more obvious what the cause of the subsequent error messages is. - It's now possible to again avoid making stdin non-blocking (which caused some issues) without reintroducing extra latency. The change will be done in a subsequent commit. - Event sources that do not support select() should now have somewhat lower latency in certain situations as they will be checked both before and after select()/sleep in input reading; before the sleep always happened first even if such sources already had queued input. Before the key fifo was also handled in this manner (first key triggered select, but if multiple were read then rest could be delayed; however in most cases this didn't add latency in practice as after central code started doing command handling it queried for further commands with a max sleep time of 0). - Key fifo limiting is more accurate now: it now counts actual commands intead of keycodes, and all queued keys are read immediately from input devices so they can be counted correctly. - Since keypresses are now interpreted immediately, commands which change keybindings will no longer affect following keypresses that have already been read before the command is executed. This should not be an issue in practice with current keybinding behavior.
70 lines
2.1 KiB
C
70 lines
2.1 KiB
C
/*
|
|
* 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 "options.h"
|
|
|
|
|
|
struct mp_fifo {
|
|
struct MPOpts *opts;
|
|
struct input_ctx *input;
|
|
int last_key_down;
|
|
unsigned 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 >= MOUSE_BTN0 && code < MOUSE_BTN_END)
|
|
mp_input_feed_key(fifo->input, code - MOUSE_BTN0 + MOUSE_BTN0_DBL);
|
|
}
|
|
|
|
void mplayer_put_key(struct mp_fifo *fifo, int code)
|
|
{
|
|
unsigned now = GetTimerMS();
|
|
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)
|
|
return;
|
|
mp_input_feed_key(fifo->input, code);
|
|
if (code & MP_KEY_DOWN) {
|
|
code &= ~MP_KEY_DOWN;
|
|
if (fifo->last_key_down == code
|
|
&& now - fifo->last_down_time < doubleclick_time)
|
|
put_double(fifo, code);
|
|
fifo->last_key_down = code;
|
|
fifo->last_down_time = now;
|
|
}
|
|
}
|