diff options
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/keymap.h b/src/keymap.h index f72599e..1684979 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -171,15 +171,11 @@ enum xkb_action_controls { }; enum xkb_match_operation { - MATCH_NONE = 0, - MATCH_ANY_OR_NONE = 1, - MATCH_ANY = 2, - MATCH_ALL = 3, - MATCH_EXACTLY = 4, - MATCH_OP_MASK = \ - (MATCH_NONE | MATCH_ANY_OR_NONE | MATCH_ANY | MATCH_ALL | \ - MATCH_EXACTLY), - MATCH_LEVEL_ONE_ONLY = (1 << 7), + MATCH_NONE, + MATCH_ANY_OR_NONE, + MATCH_ANY, + MATCH_ALL, + MATCH_EXACTLY, }; struct xkb_mods { @@ -277,11 +273,12 @@ struct xkb_key_type { struct xkb_sym_interpret { xkb_keysym_t sym; - bool repeat; enum xkb_match_operation match; + bool level_one_only; xkb_mod_mask_t mods; xkb_mod_index_t virtual_mod; - union xkb_action act; + union xkb_action action; + bool repeat; }; struct xkb_indicator_map { |