diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-03 02:58:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-03 03:30:08 +0400 |
commit | bf640a6a7faff2246d6be117fa758dd69154f27f (patch) | |
tree | 13dea778bd0dbf4e21f2939423a3ec776f90a09c /source/blender/windowmanager/intern | |
parent | 9016d6d7a0cb41cb266c5fc1de05ee2c674db0d4 (diff) |
Code cleanup: use typedefs for ui handler functions
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index c9855ccaa3b..64289e04d7a 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2547,12 +2547,14 @@ void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap *keymap) } } -wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers, - wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata) +wmEventHandler *WM_event_add_ui_handler( + const bContext *C, ListBase *handlers, + wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove, + void *userdata) { wmEventHandler *handler = MEM_callocN(sizeof(wmEventHandler), "event ui handler"); - handler->ui_handle = func; - handler->ui_remove = remove; + handler->ui_handle = ui_handle; + handler->ui_remove = ui_remove; handler->ui_userdata = userdata; if (C) { handler->ui_area = CTX_wm_area(C); @@ -2572,13 +2574,18 @@ wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers, } /* set "postpone" for win->modalhandlers, this is in a running for () loop in wm_handlers_do() */ -void WM_event_remove_ui_handler(ListBase *handlers, - wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata, const bool postpone) +void WM_event_remove_ui_handler( + ListBase *handlers, + wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove, + void *userdata, const bool postpone) { wmEventHandler *handler; for (handler = handlers->first; handler; handler = handler->next) { - if (handler->ui_handle == func && handler->ui_remove == remove && handler->ui_userdata == userdata) { + if ((handler->ui_handle == ui_handle) && + (handler->ui_remove == ui_remove) && + (handler->ui_userdata == userdata)) + { /* handlers will be freed in wm_handlers_do() */ if (postpone) { handler->flag |= WM_HANDLER_DO_FREE; @@ -2592,15 +2599,18 @@ void WM_event_remove_ui_handler(ListBase *handlers, } } -void WM_event_free_ui_handler_all(bContext *C, ListBase *handlers, - wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove) +void WM_event_free_ui_handler_all( + bContext *C, ListBase *handlers, + wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove) { wmEventHandler *handler, *handler_next; for (handler = handlers->first; handler; handler = handler_next) { handler_next = handler->next; - if (handler->ui_handle == func && handler->ui_remove == remove) { - remove(C, handler->ui_userdata); + if ((handler->ui_handle == ui_handle) && + (handler->ui_remove == ui_remove)) + { + ui_remove(C, handler->ui_userdata); BLI_remlink(handlers, handler); wm_event_free_handler(handler); } |