From f89b0a80ba65193979fdb5d98ece642055d06470 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 27 Mar 2012 12:18:50 +0100 Subject: [PATCH] Remove unused members of xkb_state Signed-off-by: Daniel Stone --- include/xkbcommon/xkbcommon.h | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h index 7ce7d9e..4f83867 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/include/xkbcommon/xkbcommon.h @@ -476,30 +476,15 @@ struct xkb_component_name { }; struct xkb_state { - unsigned char group; /* base + latched + locked */ - /* FIXME: Why are base + latched short and not char?? */ - unsigned short base_group; /* physically ... down? */ - unsigned short latched_group; - unsigned char locked_group; - - unsigned char mods; /* base + latched + locked */ - unsigned char base_mods; /* physically down */ - unsigned char latched_mods; - unsigned char locked_mods; - - unsigned char compat_state; /* mods + group for core state */ - - /* grab mods = all depressed and latched mods, _not_ locked mods */ - unsigned char grab_mods; /* grab mods minus internal mods */ - unsigned char compat_grab_mods; /* grab mods + group for core state, - but not locked groups if - IgnoreGroupLocks set */ - - /* effective mods = all mods (depressed, latched, locked) */ - unsigned char lookup_mods; /* effective mods minus internal mods */ - unsigned char compat_lookup_mods; /* effective mods + group */ - - unsigned short ptr_buttons; /* core pointer buttons */ + xkb_group_index_t base_group; /**< depressed */ + xkb_group_index_t latched_group; + xkb_group_index_t locked_group; + xkb_group_index_t group; /**< effective */ + + xkb_mod_mask_t base_mods; /**< depressed */ + xkb_mod_mask_t latched_mods; + xkb_mod_mask_t locked_mods; + xkb_mod_mask_t mods; /**< effective */ uint32_t leds; -- 2.7.4