StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmod: remove unused fields 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-08-01 21:31:36 +03:00
parent 6eb5929d48
commit 09dac54b97
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xkbcomp/vmod.c
View File

@ -30,7 +30,6 @@ void
InitVModInfo(VModInfo *info, struct xkb_keymap *keymap) InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
{ {
ClearVModInfo(info, keymap); ClearVModInfo(info, keymap);
info->errorCount = 0;
} }
void void
@ -39,7 +38,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
xkb_mod_index_t i; xkb_mod_index_t i;
xkb_mod_mask_t bit; xkb_mod_mask_t bit;
info->newlyDefined = info->defined = info->available = 0; info->defined = info->available = 0;
for (i = 0; i < XkbNumVirtualMods; i++) for (i = 0; i < XkbNumVirtualMods; i++)
keymap->vmods[i] = XkbNoModifierMask; keymap->vmods[i] = XkbNoModifierMask;
@ -126,7 +125,6 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
} }
info->defined |= (1 << nextFree); info->defined |= (1 << nextFree);
info->newlyDefined |= (1 << nextFree);
info->available |= (1 << nextFree); info->available |= (1 << nextFree);
keymap->vmod_names[nextFree] = xkb_atom_text(keymap->ctx, stmt->name); keymap->vmod_names[nextFree] = xkb_atom_text(keymap->ctx, stmt->name);

8
src/xkbcomp/vmod.h
View File

@ -33,8 +33,6 @@
typedef struct _VModInfo { typedef struct _VModInfo {
xkb_mod_mask_t defined; xkb_mod_mask_t defined;
xkb_mod_mask_t available; xkb_mod_mask_t available;
xkb_mod_mask_t newlyDefined;
int errorCount;
} VModInfo; } VModInfo;
extern void extern void
@ -45,11 +43,7 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
extern bool extern bool
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap, HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
enum merge_mode mergeMode, enum merge_mode mergeMode, VModInfo *info);
VModInfo *info);
extern bool
ApplyVModDefs(VModInfo *info, struct xkb_keymap *keymap);
xkb_mod_index_t xkb_mod_index_t
FindKeypadVMod(struct xkb_keymap *keymap); FindKeypadVMod(struct xkb_keymap *keymap);