parent
6eb5929d48
commit
09dac54b97
|
@ -30,7 +30,6 @@ void
|
|||
InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
|
||||
{
|
||||
ClearVModInfo(info, keymap);
|
||||
info->errorCount = 0;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -39,7 +38,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
|
|||
xkb_mod_index_t i;
|
||||
xkb_mod_mask_t bit;
|
||||
|
||||
info->newlyDefined = info->defined = info->available = 0;
|
||||
info->defined = info->available = 0;
|
||||
|
||||
for (i = 0; i < XkbNumVirtualMods; i++)
|
||||
keymap->vmods[i] = XkbNoModifierMask;
|
||||
|
@ -126,7 +125,6 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
|
|||
}
|
||||
|
||||
info->defined |= (1 << nextFree);
|
||||
info->newlyDefined |= (1 << nextFree);
|
||||
info->available |= (1 << nextFree);
|
||||
|
||||
keymap->vmod_names[nextFree] = xkb_atom_text(keymap->ctx, stmt->name);
|
||||
|
|
|
@ -33,8 +33,6 @@
|
|||
typedef struct _VModInfo {
|
||||
xkb_mod_mask_t defined;
|
||||
xkb_mod_mask_t available;
|
||||
xkb_mod_mask_t newlyDefined;
|
||||
int errorCount;
|
||||
} VModInfo;
|
||||
|
||||
extern void
|
||||
|
@ -45,11 +43,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
|
|||
|
||||
extern bool
|
||||
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
|
||||
enum merge_mode mergeMode,
|
||||
VModInfo *info);
|
||||
|
||||
extern bool
|
||||
ApplyVModDefs(VModInfo *info, struct xkb_keymap *keymap);
|
||||
enum merge_mode mergeMode, VModInfo *info);
|
||||
|
||||
xkb_mod_index_t
|
||||
FindKeypadVMod(struct xkb_keymap *keymap);
|
||||
|
|
Loading…
Reference in New Issue