*
********************************************************/
+#include "config.h"
+
#include "keymap.h"
#include "text.h"
{ "AnyOf", MATCH_ANY },
{ "AllOf", MATCH_ALL },
{ "Exactly", MATCH_EXACTLY },
+ { NULL, 0 },
};
const char *
if (ndx == XKB_MOD_INVALID)
return "none";
- if (ndx >= darray_size(mods->mods))
+ if (ndx >= mods->num_mods)
return NULL;
- return xkb_atom_text(ctx, darray_item(mods->mods, ndx).name);
+ return xkb_atom_text(ctx, mods->mods[ndx].name);
}
const char *
ModMaskText(struct xkb_context *ctx, const struct xkb_mod_set *mods,
xkb_mod_mask_t mask)
{
- char buf[1024];
+ char buf[1024] = {0};
size_t pos = 0;
xkb_mod_index_t i;
const struct xkb_mod *mod;
if (mask == MOD_REAL_MASK_ALL)
return "all";
- darray_enumerate(i, mod, mods->mods) {
+ xkb_mods_enumerate(i, mod, mods) {
int ret;
if (!(mask & (1u << i)))