summaryrefslogtreecommitdiff
path: root/src/keymap.h
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2013-02-17 22:18:57 +0200
committerDaniel Stone <daniel@fooishbar.org>2013-03-18 22:20:02 +0000
commit8cee7490003381b7e1399e171a8c860edb3d634c (patch)
tree5cb829b303322446fa72bf250ba037ab9200b75f /src/keymap.h
parent10c351f5163ff8ce3be232207bf9c0f68fbbb47d (diff)
downloadlibxkbcommon-8cee7490003381b7e1399e171a8c860edb3d634c.tar.gz
libxkbcommon-8cee7490003381b7e1399e171a8c860edb3d634c.tar.bz2
libxkbcommon-8cee7490003381b7e1399e171a8c860edb3d634c.zip
Change 'indicator' to 'led' everywhere possible
The code currently uses the two names interchangeably. Settle on 'led', because it is shorter, more recognizable, and what we use in our API (though of course the parser still uses 'indicator'). In camel case we make it 'Led'. We change 'xkb_indicator_map' to just 'xkb_led' and the variables of this type are 'led'. This mimics 'xkb_key' and 'key'. IndicatorNameInfo and LEDInfo are changed to 'LedNameInfo' and 'LedInfo', and the variables are 'ledi' (like 'keyi' etc.). This is instead of 'ii' and 'im'. This might make a few places a bit confusing, but less than before I think. It's also shorter. Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/keymap.h')
-rw-r--r--src/keymap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.h b/src/keymap.h
index cb035b0..1744b41 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -281,7 +281,7 @@ struct xkb_sym_interpret {
bool repeat;
};
-struct xkb_indicator_map {
+struct xkb_led {
xkb_atom_t name;
enum xkb_state_component which_groups;
xkb_layout_mask_t groups;
@@ -395,7 +395,7 @@ struct xkb_keymap {
xkb_layout_index_t num_group_names;
xkb_atom_t *group_names;
- darray(struct xkb_indicator_map) indicators;
+ darray(struct xkb_led) leds;
char *keycodes_section_name;
char *symbols_section_name;