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

compat: remove "flags" field from xkb_indicator_map 

We don't set this field any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-09-02 18:51:26 +03:00
parent 6e676cb7d8
commit 8c6694fd58
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/keymap-dump.c
View File

@ -579,9 +579,9 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
for (i = 0; i < XkbNumIndicators; i++) { for (i = 0; i < XkbNumIndicators; i++) {
struct xkb_indicator_map *map = &keymap->indicators[i]; struct xkb_indicator_map *map = &keymap->indicators[i];
if (map->flags == 0 && map->which_groups == 0 && if (map->which_groups == 0 && map->groups == 0 &&
map->groups == 0 && map->which_mods == 0 && map->which_mods == 0 && map->mods.mods == 0 &&
map->mods.mods == 0 && map->ctrls == 0) map->ctrls == 0)
continue; continue;
write_indicator_map(keymap, buf, i); write_indicator_map(keymap, buf, i);
} }

1
src/xkb-priv.h
View File

@ -282,7 +282,6 @@ struct xkb_sym_interpret {
}; };
struct xkb_indicator_map { struct xkb_indicator_map {
unsigned char flags;
unsigned char which_groups; unsigned char which_groups;
uint32_t groups; uint32_t groups;
unsigned char which_mods; unsigned char which_mods;

3
src/xkbcomp/compat.c
View File

@ -163,7 +163,6 @@ typedef struct _LEDInfo {
enum merge_mode merge; enum merge_mode merge;
xkb_atom_t name; xkb_atom_t name;
unsigned char flags;
unsigned char which_mods; unsigned char which_mods;
xkb_mod_mask_t mods; xkb_mod_mask_t mods;
unsigned char which_groups; unsigned char which_groups;
@ -236,7 +235,6 @@ static void
ClearIndicatorMapInfo(struct xkb_context *ctx, LEDInfo *info) ClearIndicatorMapInfo(struct xkb_context *ctx, LEDInfo *info)
{ {
info->name = xkb_atom_intern(ctx, "default"); info->name = xkb_atom_intern(ctx, "default");
info->flags = 0;
info->which_mods = 0; info->which_mods = 0;
info->mods = 0; info->mods = 0;
info->which_groups = info->groups = 0; info->which_groups = info->groups = 0;
@ -1081,7 +1079,6 @@ CopyIndicatorMapDefs(CompatInfo *info)
} }
} }
im->flags = led->flags;
if (led->groups != 0 && led->which_groups == 0) if (led->groups != 0 && led->which_groups == 0)
im->which_groups = XkbIM_UseEffective; im->which_groups = XkbIM_UseEffective;
else else