Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-20 07:42:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-20 07:43:35 +0300
commit7ee9fe499126a611c57cef907b6cdff0a90f6f8d (patch)
tree1ed2eb09c4682b6b2ed93294ae01ff18dbfc6651 /source/blender/windowmanager/intern/wm_event_system.c
parenteffe750ec103d56ff96f12ce64ac977a8ae51909 (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/intern/wm_event_system.c')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index ecc4d369afe..28ba20eba9e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2392,7 +2392,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
for (wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
if (wm_eventmatch(event, kmi)) {
- struct wmEventHandler_KeymapFn keymap_callback = handler->keymap_callback;
+ struct wmEventHandler_KeymapPost keymap_post = handler->post;
PRINT("%s: item matched '%s'\n", __func__, kmi->idname);
@@ -2404,8 +2404,8 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
if (action & WM_HANDLER_BREAK) {
/* not always_pass here, it denotes removed handler_base */
CLOG_INFO(WM_LOG_HANDLERS, 2, "handled! '%s'", kmi->idname);
- if (keymap_callback.handle_post_fn != NULL) {
- keymap_callback.handle_post_fn(keymap, kmi, keymap_callback.user_data);
+ if (keymap_post.post_fn != NULL) {
+ keymap_post.post_fn(keymap, kmi, keymap_post.user_data);
}
break;
}
@@ -3427,13 +3427,13 @@ void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap *keymap)
}
}
-void WM_event_set_keymap_handler_callback(
+void WM_event_set_keymap_handler_post_callback(
wmEventHandler_Keymap *handler,
void (keymap_tag)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data),
void *user_data)
{
- handler->keymap_callback.handle_post_fn = keymap_tag;
- handler->keymap_callback.user_data = user_data;
+ handler->post.post_fn = keymap_tag;
+ handler->post.user_data = user_data;
}
wmEventHandler_UI *WM_event_add_ui_handler(