From ade131307c7fda83707d615216831a056f9d1c98 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 27 Dec 2019 12:22:37 +0200 Subject: [PATCH] xkbcomp: downgrade "Symbol added to modifier map for multiple modifiers" log to a warning This condition happens in xkeyboard-config keymaps and seems hard to fix. Currently it incessantly spams people's logs who have no idea what to do about it. So downgrade to "warning" level, so it doesn't show up by default. When working on keymaps, set `XKB_LOG_LEVEL=debug XKB_LOG_VERBOSITY=10` to see all possible messages. Refs https://github.com/xkbcommon/libxkbcommon/issues/111 Fixes https://github.com/xkbcommon/libxkbcommon/issues/128 Signed-off-by: Ran Benita --- src/xkbcomp/symbols.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index ffef6a4..9efd90c 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -461,19 +461,19 @@ AddModMapEntry(SymbolsInfo *info, ModMapEntry *new) ignore = (clobber ? old->modifier : new->modifier); if (new->haveSymbol) - log_err(info->ctx, - "Symbol \"%s\" added to modifier map for multiple modifiers; " - "Using %s, ignoring %s\n", - KeysymText(info->ctx, new->u.keySym), - ModIndexText(info->ctx, &info->mods, use), - ModIndexText(info->ctx, &info->mods, ignore)); + log_warn(info->ctx, + "Symbol \"%s\" added to modifier map for multiple modifiers; " + "Using %s, ignoring %s\n", + KeysymText(info->ctx, new->u.keySym), + ModIndexText(info->ctx, &info->mods, use), + ModIndexText(info->ctx, &info->mods, ignore)); else - log_err(info->ctx, - "Key \"%s\" added to modifier map for multiple modifiers; " - "Using %s, ignoring %s\n", - KeyNameText(info->ctx, new->u.keyName), - ModIndexText(info->ctx, &info->mods, use), - ModIndexText(info->ctx, &info->mods, ignore)); + log_warn(info->ctx, + "Key \"%s\" added to modifier map for multiple modifiers; " + "Using %s, ignoring %s\n", + KeyNameText(info->ctx, new->u.keyName), + ModIndexText(info->ctx, &info->mods, use), + ModIndexText(info->ctx, &info->mods, ignore)); old->modifier = use; return true; -- 2.7.4