From db79db8444d5daa2870a3228057b3000892ba074 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 6 Sep 2013 00:28:31 +0200 Subject: [PATCH] input: don't print warning if certain internal keys are not bound This affects MOUSE_MOVE and MOUSE_LEAVE. Both are needed internally (such as for the OSC), but not really useful for input.conf. Since the warning has the purpose of notifying the user that a key is unmapped and what key name to use for setting up a binding in input.conf, the warning is rather useless in this case. It's also annoying in combination with the --no-input-default-bindings option, since that removes the default bindings to "ignore" for these keys. --- etc/input.conf | 4 ---- mpvcore/input/input.c | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/etc/input.conf b/etc/input.conf index 04e9df1378..78da3730bb 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -185,10 +185,6 @@ #JOY_BTN2 add volume 1 #JOY_BTN3 add volume -1 -# Mostly for internal purposes -#MOUSE_MOVE ignore -#MOUSE_LEAVE ignore - # # Not assigned by default # (not an exhaustive list of unbound commands) diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index 366c380ce4..f935b17bbf 100644 --- a/mpvcore/input/input.c +++ b/mpvcore/input/input.c @@ -1363,9 +1363,12 @@ static mp_cmd_t *get_cmd_from_keys(struct input_ctx *ictx, char *force_section, } if (cmd == NULL) { + int msgl = MSGL_WARN; + if (n == 1 && (keys[0] == MP_KEY_MOUSE_MOVE || + keys[0] == MP_KEY_MOUSE_LEAVE)) + msgl = MSGL_DBG2; char *key_buf = get_key_combo_name(keys, n); - mp_tmsg(MSGT_INPUT, MSGL_WARN, - "No bind found for key '%s'.\n", key_buf); + mp_tmsg(MSGT_INPUT, msgl, "No bind found for key '%s'.\n", key_buf); talloc_free(key_buf); return NULL; }