GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

input: slightly simplify mouse dispatching

Browse Source 
I admit I don't really understand anymore why this was needed. Delete it
anyway. It was added with commit 42fa7cbbf.
This commit is contained in:
wm4
2014-04-18 17:00:24 +02:00
parent b87191d176
commit cca13efb19
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
input/input.c
+1 -13
View File
@@ -415,15 +415,6 @@ static struct cmd_bind *find_bind_for_key_section(struct input_ctx *ictx,
return NULL; return NULL;
} }
static bool any_mouse_buttons_down(int num_keys, int *keys)
{
for (int n = 0; n < num_keys; n++) {
if (MP_KEY_IS_MOUSE_BTN_SINGLE(keys[n]))
return true;
}
return false;
}
static struct cmd_bind *find_any_bind_for_key(struct input_ctx *ictx, static struct cmd_bind *find_any_bind_for_key(struct input_ctx *ictx,
char *force_section, int code) char *force_section, int code)
{ {
@@ -431,13 +422,10 @@ static struct cmd_bind *find_any_bind_for_key(struct input_ctx *ictx,
return find_bind_for_key_section(ictx, force_section, code); return find_bind_for_key_section(ictx, force_section, code);
bool use_mouse = MP_KEY_DEPENDS_ON_MOUSE_POS(code); bool use_mouse = MP_KEY_DEPENDS_ON_MOUSE_POS(code);
// Check global state, because MOUSE_MOVE in particular does not include
// the global state in n/keys.
bool mouse_down = any_mouse_buttons_down(ictx->num_key_down, ictx->key_down);
// First look whether a mouse section is capturing all mouse input // First look whether a mouse section is capturing all mouse input
// exclusively (regardless of the active section stack order). // exclusively (regardless of the active section stack order).
if (use_mouse && mouse_down) { if (use_mouse) {
struct cmd_bind *bind = struct cmd_bind *bind =
find_bind_for_key_section(ictx, ictx->mouse_section, code); find_bind_for_key_section(ictx, ictx->mouse_section, code);
if (bind) if (bind)