diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2013-03-01 23:47:59 -0800 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2013-03-19 10:54:23 +0000 |
| commit | 40c46ecd5b3fdb1d92c7b1745b374184509311cd (patch) | |
| tree | 89fbaaba5d91402d58cc3ce2c4ece88fee13b90f | |
| parent | 22ba1fa1a63ba230a8435c50571e7b759d7426ed (diff) | |
Allow NULL rmlvo for xkb_keymap_new_from_names
Previously we allowed you to pass a names struct with five NULL members,
but not just pass NULL for the struct itself. This was pretty dumb. :(
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | test/common.c | 16 | ||||
| -rw-r--r-- | xkbcommon/xkbcommon.h | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/test/common.c b/test/common.c index 2ed23cf..2ea2e5b 100644 --- a/test/common.c +++ b/test/common.c @@ -259,14 +259,18 @@ test_compile_rules(struct xkb_context *context, const char *rules, { struct xkb_keymap *keymap; struct xkb_rule_names rmlvo = { - .rules = rules, - .model = model, - .layout = layout, - .variant = variant, - .options = options + .rules = isempty(rules) ? NULL : rules, + .model = isempty(model) ? NULL : model, + .layout = isempty(layout) ? NULL : layout, + .variant = isempty(variant) ? NULL : variant, + .options = isempty(options) ? NULL : options }; - keymap = xkb_keymap_new_from_names(context, &rmlvo, 0); + if (!rules && !model && !layout && !variant && !options) + keymap = xkb_keymap_new_from_names(context, NULL, 0); + else + keymap = xkb_keymap_new_from_names(context, &rmlvo, 0); + if (!keymap) { fprintf(stderr, "Failed to compile RMLVO: '%s', '%s', '%s', '%s', '%s'\n", diff --git a/xkbcommon/xkbcommon.h b/xkbcommon/xkbcommon.h index cdc021b..ad758b8 100644 --- a/xkbcommon/xkbcommon.h +++ b/xkbcommon/xkbcommon.h @@ -681,7 +681,9 @@ enum xkb_keymap_compile_flags { * keymaps. * * @param context The context in which to create the keymap. - * @param names The RMLVO names to use. + * @param names The RMLVO names to use. In xkbcommon versions prior + * to 0.2.1, this field must be non-NULL. In later + * versions, passing NULL will use the default keymap. * @param flags Optional flags for the keymap, or 0. * * @returns A keymap compiled according to the RMLVO names, or NULL if |