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

compat: remove dead NoAutomatic code 

The xkblib spec, table 7.1 (indicators), says:
XkbIM_NoAutomatic: Xkb does not automatically change the value of the
                   indicator based upon a change in the keyboard state,
                   regardless of the values for the other fields of the
                   indicator map.

xkbcomp (the real one) never actually implemented a way for an indicator
statement to set this flag, so it's just dead unused code. We definitely
don't want to implement it ourselves, so remove any mention of it.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-08-27 11:38:44 +03:00
parent 16f2de8bf0
commit 65c4a71731
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xkbcomp/compat.c
View File

@ -157,8 +157,7 @@ enum led_field {
LED_FIELD_GROUPS = (1 << 2), LED_FIELD_GROUPS = (1 << 2),
LED_FIELD_CTRLS = (1 << 3), LED_FIELD_CTRLS = (1 << 3),
LED_FIELD_EXPLICIT = (1 << 4), LED_FIELD_EXPLICIT = (1 << 4),
LED_FIELD_AUTOMATIC = (1 << 5), LED_FIELD_DRIVES_KBD = (1 << 5),
LED_FIELD_DRIVES_KBD = (1 << 6),
}; };
typedef struct _LEDInfo { typedef struct _LEDInfo {
@ -580,12 +579,6 @@ AddIndicatorMap(CompatInfo *info, LEDInfo *new)
old->flags |= (new->flags & XkbIM_NoExplicit); old->flags |= (new->flags & XkbIM_NoExplicit);
old->defined |= LED_FIELD_EXPLICIT; old->defined |= LED_FIELD_EXPLICIT;
} }
if (UseNewLEDField(LED_FIELD_AUTOMATIC, old, new, verbosity,
&collide)) {
old->flags &= ~XkbIM_NoAutomatic;
old->flags |= (new->flags & XkbIM_NoAutomatic);
old->defined |= LED_FIELD_AUTOMATIC;
}
if (UseNewLEDField(LED_FIELD_DRIVES_KBD, old, new, verbosity, if (UseNewLEDField(LED_FIELD_DRIVES_KBD, old, new, verbosity,
&collide)) { &collide)) {
old->flags &= ~XkbIM_LEDDrivesKB; old->flags &= ~XkbIM_LEDDrivesKB;