diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-20 07:42:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-20 07:43:35 +0300 |
commit | 7ee9fe499126a611c57cef907b6cdff0a90f6f8d (patch) | |
tree | 1ed2eb09c4682b6b2ed93294ae01ff18dbfc6651 /source/blender/windowmanager/wm_event_system.h | |
parent | effe750ec103d56ff96f12ce64ac977a8ae51909 (diff) |
Cleanup: rename keymap handler callbacks for clarity
Now there are two callbacks, the name 'keymap_callback' is too vague.
Diffstat (limited to 'source/blender/windowmanager/wm_event_system.h')
-rw-r--r-- | source/blender/windowmanager/wm_event_system.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index cd7a5102809..92ae4e0e2cf 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -35,11 +35,6 @@ struct ScrArea; /* wmKeyMap is in DNA_windowmanager.h, it's saveable */ -struct wmEventHandler_KeymapFn { - void (*handle_post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data); - void *user_data; -}; - /** Custom types for handlers, for signaling, freeing */ enum eWM_EventHandlerType { WM_HANDLER_TYPE_GIZMO = 1, @@ -59,20 +54,27 @@ typedef struct wmEventHandler { const rcti *bblocal, *bbwin; } wmEventHandler; +/** Run after the keymap item runs. */ +struct wmEventHandler_KeymapPost { + void (*post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data); + void *user_data; +}; + +/** Support for a getter function that looks up the keymap each access. */ +struct wmEventHandler_KeymapDynamic { + wmEventHandler_KeymapDynamicFn *keymap_fn; + void *user_data; +}; + /** #WM_HANDLER_TYPE_KEYMAP */ typedef struct wmEventHandler_Keymap { wmEventHandler head; /** Pointer to builtin/custom keymaps (never NULL). */ wmKeyMap *keymap; - /** Run after the keymap item runs. */ - struct wmEventHandler_KeymapFn keymap_callback; - /** Support for a getter function that looks up the keymap each access. */ - struct { - wmEventHandler_KeymapDynamicFn *keymap_fn; - void *user_data; - } dynamic; + struct wmEventHandler_KeymapPost post; + struct wmEventHandler_KeymapDynamic dynamic; struct bToolRef *keymap_tool; } wmEventHandler_Keymap; |