parent
bce90d5b2c
commit
300f3fb1e0
|
@ -75,6 +75,12 @@ isempty(const char *s)
|
||||||
return s == NULL || s[0] == '\0';
|
return s == NULL || s[0] == '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline const char *
|
||||||
|
strnull(const char *s)
|
||||||
|
{
|
||||||
|
return s ? s : "(null)";
|
||||||
|
}
|
||||||
|
|
||||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||||
|
|
||||||
|
|
|
@ -75,16 +75,18 @@ xkb_map_new_from_names(struct xkb_context *ctx,
|
||||||
log_dbg(ctx,
|
log_dbg(ctx,
|
||||||
"Compiling from RMLVO: rules '%s', model '%s', layout '%s', "
|
"Compiling from RMLVO: rules '%s', model '%s', layout '%s', "
|
||||||
"variant '%s', options '%s'\n",
|
"variant '%s', options '%s'\n",
|
||||||
rmlvo.rules, rmlvo.model, rmlvo.layout, rmlvo.variant,
|
strnull(rmlvo.rules), strnull(rmlvo.model),
|
||||||
rmlvo.options);
|
strnull(rmlvo.layout), strnull(rmlvo.variant),
|
||||||
|
strnull(rmlvo.options));
|
||||||
|
|
||||||
ok = xkb_components_from_rules(ctx, &rmlvo, &kccgst);
|
ok = xkb_components_from_rules(ctx, &rmlvo, &kccgst);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
log_err(ctx,
|
log_err(ctx,
|
||||||
"Couldn't look up rules '%s', model '%s', layout '%s', "
|
"Couldn't look up rules '%s', model '%s', layout '%s', "
|
||||||
"variant '%s', options '%s'\n",
|
"variant '%s', options '%s'\n",
|
||||||
rmlvo.rules, rmlvo.model, rmlvo.layout, rmlvo.variant,
|
strnull(rmlvo.rules), strnull(rmlvo.model),
|
||||||
rmlvo.options);
|
strnull(rmlvo.layout), strnull(rmlvo.variant),
|
||||||
|
strnull(rmlvo.options));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,8 @@ test_rmlvo(struct xkb_context *context, const char *rules,
|
||||||
options);
|
options);
|
||||||
if (keymap) {
|
if (keymap) {
|
||||||
fprintf(stderr, "Compiled '%s' '%s' '%s' '%s' '%s'\n",
|
fprintf(stderr, "Compiled '%s' '%s' '%s' '%s' '%s'\n",
|
||||||
rules, model, layout, variant, options);
|
strnull(rules), strnull(model), strnull(layout),
|
||||||
|
strnull(variant), strnull(options));
|
||||||
xkb_map_unref(keymap);
|
xkb_map_unref(keymap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue