From: Daniel Stone Date: Tue, 27 Mar 2012 11:20:42 +0000 (+0100) Subject: Remove hardcoded legacy modifier masks X-Git-Tag: xkbcommon-0.2.0~705 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3dcd7ae02ccfd47b2a9a552daa225255803e66cf;p=platform%2Fupstream%2Flibxkbcommon.git Remove hardcoded legacy modifier masks Use the xkb_state_mod_* and xkb_map_mod_* API instead. Signed-off-by: Daniel Stone --- diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h index 09fec54..b865535 100644 --- a/include/xkbcommon/xkbcommon.h +++ b/include/xkbcommon/xkbcommon.h @@ -81,17 +81,6 @@ typedef uint32_t xkb_led_index_t; xkb_keycode_is_legal_ext(xkb->min_key_code) && \ xkb_keycode_is_legal_ext(xkb->max_key_code)) -/* Duplicate the modifier mask defines so libxkcommon can be used - * without X.h */ -#define XKB_COMMON_SHIFT_MASK (1 << 0) -#define XKB_COMMON_LOCK_MASK (1 << 1) -#define XKB_COMMON_CONTROL_MASK (1 << 2) -#define XKB_COMMON_MOD1_MASK (1 << 3) -#define XKB_COMMON_MOD2_MASK (1 << 4) -#define XKB_COMMON_MOD3_MASK (1 << 5) -#define XKB_COMMON_MOD4_MASK (1 << 6) -#define XKB_COMMON_MOD5_MASK (1 << 7) - struct xkb_rule_names { const char * rules;