diff options
| author | Campbell Barton <campbell@blender.org> | 2022-02-24 14:48:34 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-02-25 09:58:22 +0300 |
| commit | ad0b3abf539bbb358f799d3f36649b5d46f222c8 (patch) | |
| tree | d7aff552c5541880ca1ce2648595455418cafc56 /source/blender/windowmanager/wm_event_types.h | |
| parent | e7cae5187773f41e62830be597c6f598bff0653f (diff) | |
Cleanup: use flags for wmEvent modifier keys
Using flags makes checking multiple modifiers at once more convenient
and avoids macros/functions such as IS_EVENT_MOD & WM_event_modifier_flag
which have been removed. It also simplifies checking if modifier keys
have changed.
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 0ff181db9b1..c5764ad7a5e 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -408,15 +408,6 @@ enum { ((ISKEYBOARD(event_type) || ISMOUSE(event_type) || ISNDOF(event_type)) && \ (ISKEYMODIFIER(event_type) == false)) -/* Internal helpers. */ -#define _VA_IS_EVENT_MOD2(v, a) (CHECK_TYPE_INLINE(v, wmEvent *), ((v)->a)) -#define _VA_IS_EVENT_MOD3(v, a, b) (_VA_IS_EVENT_MOD2(v, a) || ((v)->b)) -#define _VA_IS_EVENT_MOD4(v, a, b, c) (_VA_IS_EVENT_MOD3(v, a, b) || ((v)->c)) -#define _VA_IS_EVENT_MOD5(v, a, b, c, d) (_VA_IS_EVENT_MOD4(v, a, b, c) || ((v)->d)) - -/** Reusable `IS_EVENT_MOD(event, shift, ctrl, alt, oskey)` macro. */ -#define IS_EVENT_MOD(...) VA_NARGS_CALL_OVERLOAD(_VA_IS_EVENT_MOD, __VA_ARGS__) - enum eEventType_Mask { /** #ISKEYMODIFIER */ EVT_TYPE_MASK_KEYBOARD_MODIFIER = (1 << 0), |