diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-19 08:09:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-19 08:18:23 +0300 |
| commit | bb6692be8a90f7d86d620557a893c6bb48bdd236 (patch) | |
| tree | 7f79d2d0682b6b59a477e2ad370ae4cd023bafd3 /source/blender/windowmanager/wm_event_system.h | |
| parent | d718338828c19f6fa1bbaa0530dcc0fbc72e46c4 (diff) | |
WM: move keymap handler to it's own type
Illuminate dead code, using wmEventHandler_KeymapFn from gizmo handler
type where it was never set.
Diffstat (limited to 'source/blender/windowmanager/wm_event_system.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_system.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index 9448bba9f3b..5508e5359e8 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -47,6 +47,7 @@ enum eWM_EventHandlerType { WM_HANDLER_TYPE_UI, WM_HANDLER_TYPE_OP, WM_HANDLER_TYPE_DROPBOX, + WM_HANDLER_TYPE_KEYMAP, }; typedef struct wmEventHandler { @@ -55,14 +56,21 @@ typedef struct wmEventHandler { enum eWM_EventHandlerType type; char flag; /* WM_HANDLER_BLOCKING, ... */ - /* keymap handler */ - wmKeyMap *keymap; /* pointer to builtin/custom keymaps */ - const rcti *bblocal, *bbwin; /* optional local and windowspace bb */ - /* Run after the keymap item runs. */ + /** Optional local and windowspace bb. */ + const rcti *bblocal, *bbwin; +} wmEventHandler; + +/** #WM_HANDLER_TYPE_KEYMAP */ +typedef struct wmEventHandler_Keymap { + wmEventHandler base; + + /** Pointer to builtin/custom keymaps (never NULL). */ + wmKeyMap *keymap; + /** Run after the keymap item runs. */ struct wmEventHandler_KeymapFn keymap_callback; struct bToolRef *keymap_tool; -} wmEventHandler; +} wmEventHandler_Keymap; /** #WM_HANDLER_TYPE_GIZMO */ typedef struct wmEventHandler_Gizmo { |