From 424de613af4c0a8121213bbee8c4fdd8364612e5 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 5 Oct 2012 22:46:21 +0200 Subject: Keep real and virtual mods in the same table in the keymap We change the keymap->vmods array into keymap->mods, and change it's member type from struct xkb_vmod to struct xkb_mod. This table now includes the real modifiers in the first 8 places. To distinguish between them, we add an enum mod_type to struct xkb_mod. Besides being a more reasonable approach, this enables us to share some code later, remove XKB_NUM_CORE_MODS (though the 0xff mask still appears in a few places), and prepares us to flat out remove the distinction in the future. This commit just does the conversion. Signed-off-by: Ran Benita --- src/text.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/text.h') diff --git a/src/text.h b/src/text.h index 3058aa9..5c257d1 100644 --- a/src/text.h +++ b/src/text.h @@ -48,19 +48,19 @@ extern const LookupEntry actionTypeNames[]; extern const LookupEntry symInterpretMatchMaskNames[]; const char * -VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask); +VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t mask); xkb_mod_index_t -ModNameToIndex(const char *name); +ModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name); -const char * -ModIndexToName(xkb_mod_index_t ndx); +xkb_atom_t +ModIndexToName(struct xkb_keymap *keymap, xkb_mod_index_t ndx); const char * -ModIndexText(xkb_mod_index_t ndx); +ModIndexText(struct xkb_keymap *keymap, xkb_mod_index_t ndx); const char * -ModMaskText(xkb_mod_mask_t mask); +ModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t mask); const char * ActionTypeText(enum xkb_action_type type); -- cgit v1.2.3