From 2396e62c0be8be2bb39cd2a85021a5f391a0fe54 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 30 Jun 2013 19:32:47 +0200 Subject: input: don't ignore press-only mouse button events Before this commit, only mouse events with both down and up events were processed. This caused a regression with ignoring mouse wheel events in cocoa, because these don't distinguish between up and down. Regression caused by 5b38a52. --- core/input/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/input/input.c') diff --git a/core/input/input.c b/core/input/input.c index 9771dd0420..e843a88380 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -1346,7 +1346,8 @@ static mp_cmd_t *interpret_key(struct input_ctx *ictx, int code) } // This is a key up event, but the key up command is added by // release_down_cmd(), not by this code. - emit_key &= !(code & MP_KEY_EMIT_ON_UP); + if ((code & MP_KEY_EMIT_ON_UP) && ictx->current_down_cmd) + emit_key = false; // Interpret only maximal point of multibutton event ret = NULL; if (emit_key) -- cgit v1.2.3