From 9ebd2f67f45ef3d650bb96030eac26b1b32ae699 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 6 Oct 2012 14:34:17 +0200 Subject: text: explicitly take mod_type in mod functions This essentially "tags" each invocation of the functions with the modifier type of the argument, which allows for easy grepping for them (with the aim being, to remove anything but MOD_BOTH). Signed-off-by: Ran Benita --- src/text.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/text.h') diff --git a/src/text.h b/src/text.h index ee6acf0..a3c1f29 100644 --- a/src/text.h +++ b/src/text.h @@ -48,19 +48,16 @@ extern const LookupEntry actionTypeNames[]; extern const LookupEntry symInterpretMatchMaskNames[]; const char * -VModMaskText(const struct xkb_keymap *keymap, xkb_mod_mask_t mask); - -xkb_mod_index_t -ModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name); - -xkb_atom_t -ModIndexToName(const struct xkb_keymap *keymap, xkb_mod_index_t ndx); +ModMaskText(const struct xkb_keymap *keymap, xkb_mod_mask_t mask, + enum mod_type type); const char * -ModIndexText(const struct xkb_keymap *keymap, xkb_mod_index_t ndx); +ModIndexText(const struct xkb_keymap *keymap, xkb_mod_index_t ndx, + enum mod_type type); -const char * -ModMaskText(const struct xkb_keymap *keymap, xkb_mod_mask_t mask); +xkb_mod_index_t +ModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name, + enum mod_type type); const char * ActionTypeText(enum xkb_action_type type); -- cgit v1.2.1