FreeActionInfo(info->act);
info->act = NULL;
info->keymap = NULL;
- ClearVModInfo(&info->vmods, keymap);
+ ClearVModInfo(&info->vmods);
}
static SymInterpInfo *
********************************************************/
#include "xkbcomp-priv.h"
-#include "text.h"
#include "expr.h"
#include "vmod.h"
void
InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
{
- ClearVModInfo(info, keymap);
+ xkb_group_index_t i;
+
+ info->defined = info->available = 0;
+
+ for (i = 0; i < XkbNumVirtualMods; i++)
+ if (keymap->vmod_names[i])
+ info->defined |= (1 << i);
}
void
-ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
+ClearVModInfo(VModInfo *info)
{
- xkb_mod_index_t i;
- xkb_mod_mask_t bit;
-
info->defined = info->available = 0;
-
- for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
- if (keymap->vmod_names[i])
- info->defined |= bit;
}
/***====================================================================***/
InitVModInfo(VModInfo *info, struct xkb_keymap *keymap);
void
-ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
+ClearVModInfo(VModInfo *info);
bool
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,