From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/windowmanager/intern/wm.c | 517 +++++++++++++++---------------- 1 file changed, 256 insertions(+), 261 deletions(-) (limited to 'source/blender/windowmanager/intern/wm.c') diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index a05dce9d59a..7647e9f558f 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -57,59 +57,59 @@ #include "BKE_undo_system.h" #ifdef WITH_PYTHON -#include "BPY_extern.h" +# include "BPY_extern.h" #endif /* ****************************************************** */ -#define MAX_OP_REGISTERED 32 +#define MAX_OP_REGISTERED 32 void WM_operator_free(wmOperator *op) { #ifdef WITH_PYTHON - if (op->py_instance) { - /* do this first in case there are any __del__ functions or - * similar that use properties */ - BPY_DECREF_RNA_INVALIDATE(op->py_instance); - } + if (op->py_instance) { + /* do this first in case there are any __del__ functions or + * similar that use properties */ + BPY_DECREF_RNA_INVALIDATE(op->py_instance); + } #endif - if (op->ptr) { - op->properties = op->ptr->data; - MEM_freeN(op->ptr); - } - - if (op->properties) { - IDP_FreeProperty(op->properties); - MEM_freeN(op->properties); - } - - if (op->reports && (op->reports->flag & RPT_FREE)) { - BKE_reports_clear(op->reports); - MEM_freeN(op->reports); - } - - if (op->macro.first) { - wmOperator *opm, *opmnext; - for (opm = op->macro.first; opm; opm = opmnext) { - opmnext = opm->next; - WM_operator_free(opm); - } - } - - MEM_freeN(op); + if (op->ptr) { + op->properties = op->ptr->data; + MEM_freeN(op->ptr); + } + + if (op->properties) { + IDP_FreeProperty(op->properties); + MEM_freeN(op->properties); + } + + if (op->reports && (op->reports->flag & RPT_FREE)) { + BKE_reports_clear(op->reports); + MEM_freeN(op->reports); + } + + if (op->macro.first) { + wmOperator *opm, *opmnext; + for (opm = op->macro.first; opm; opm = opmnext) { + opmnext = opm->next; + WM_operator_free(opm); + } + } + + MEM_freeN(op); } void WM_operator_free_all_after(wmWindowManager *wm, struct wmOperator *op) { - op = op->next; - while (op != NULL) { - wmOperator *op_next = op->next; - BLI_remlink(&wm->operators, op); - WM_operator_free(op); - op = op_next; - } + op = op->next; + while (op != NULL) { + wmOperator *op_next = op->next; + BLI_remlink(&wm->operators, op); + WM_operator_free(op); + op = op_next; + } } /** @@ -121,71 +121,70 @@ void WM_operator_free_all_after(wmWindowManager *wm, struct wmOperator *op) */ void WM_operator_type_set(wmOperator *op, wmOperatorType *ot) { - /* not supported for Python */ - BLI_assert(op->py_instance == NULL); + /* not supported for Python */ + BLI_assert(op->py_instance == NULL); - op->type = ot; - op->ptr->type = ot->srna; + op->type = ot; + op->ptr->type = ot->srna; - /* ensure compatible properties */ - if (op->properties) { - PointerRNA ptr; + /* ensure compatible properties */ + if (op->properties) { + PointerRNA ptr; - WM_operator_properties_create_ptr(&ptr, ot); + WM_operator_properties_create_ptr(&ptr, ot); - WM_operator_properties_default(&ptr, false); + WM_operator_properties_default(&ptr, false); - if (ptr.data) { - IDP_SyncGroupTypes(op->properties, ptr.data, true); - } + if (ptr.data) { + IDP_SyncGroupTypes(op->properties, ptr.data, true); + } - WM_operator_properties_free(&ptr); - } + WM_operator_properties_free(&ptr); + } } static void wm_reports_free(wmWindowManager *wm) { - BKE_reports_clear(&wm->reports); - WM_event_remove_timer(wm, NULL, wm->reports.reporttimer); + BKE_reports_clear(&wm->reports); + WM_event_remove_timer(wm, NULL, wm->reports.reporttimer); } /* all operations get registered in the windowmanager here */ /* called on event handling by event_system.c */ void wm_operator_register(bContext *C, wmOperator *op) { - wmWindowManager *wm = CTX_wm_manager(C); - int tot = 0; - - BLI_addtail(&wm->operators, op); - - /* only count registered operators */ - while (op) { - wmOperator *op_prev = op->prev; - if (op->type->flag & OPTYPE_REGISTER) { - tot += 1; - } - if (tot > MAX_OP_REGISTERED) { - BLI_remlink(&wm->operators, op); - WM_operator_free(op); - } - op = op_prev; - } - - /* so the console is redrawn */ - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO_REPORT, NULL); - WM_event_add_notifier(C, NC_WM | ND_HISTORY, NULL); + wmWindowManager *wm = CTX_wm_manager(C); + int tot = 0; + + BLI_addtail(&wm->operators, op); + + /* only count registered operators */ + while (op) { + wmOperator *op_prev = op->prev; + if (op->type->flag & OPTYPE_REGISTER) { + tot += 1; + } + if (tot > MAX_OP_REGISTERED) { + BLI_remlink(&wm->operators, op); + WM_operator_free(op); + } + op = op_prev; + } + + /* so the console is redrawn */ + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO_REPORT, NULL); + WM_event_add_notifier(C, NC_WM | ND_HISTORY, NULL); } - void WM_operator_stack_clear(wmWindowManager *wm) { - wmOperator *op; + wmOperator *op; - while ((op = BLI_pophead(&wm->operators))) { - WM_operator_free(op); - } + while ((op = BLI_pophead(&wm->operators))) { + WM_operator_free(op); + } - WM_main_add_notifier(NC_WM | ND_HISTORY, NULL); + WM_main_add_notifier(NC_WM | ND_HISTORY, NULL); } /** @@ -194,238 +193,234 @@ void WM_operator_stack_clear(wmWindowManager *wm) */ void WM_operator_handlers_clear(wmWindowManager *wm, wmOperatorType *ot) { - wmWindow *win; - for (win = wm->windows.first; win; win = win->next) { - ListBase *lb[2] = {&win->handlers, &win->modalhandlers}; - for (int i = 0; i < ARRAY_SIZE(lb); i++) { - LISTBASE_FOREACH (wmEventHandler *, handler_base, lb[i]) { - if (handler_base->type == WM_HANDLER_TYPE_OP) { - wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base; - if (handler->op && handler->op->type == ot) { - /* don't run op->cancel because it needs the context, - * assume whoever unregisters the operator will cleanup */ - handler->head.flag |= WM_HANDLER_DO_FREE; - WM_operator_free(handler->op); - handler->op = NULL; - } - } - } - } - } + wmWindow *win; + for (win = wm->windows.first; win; win = win->next) { + ListBase *lb[2] = {&win->handlers, &win->modalhandlers}; + for (int i = 0; i < ARRAY_SIZE(lb); i++) { + LISTBASE_FOREACH (wmEventHandler *, handler_base, lb[i]) { + if (handler_base->type == WM_HANDLER_TYPE_OP) { + wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base; + if (handler->op && handler->op->type == ot) { + /* don't run op->cancel because it needs the context, + * assume whoever unregisters the operator will cleanup */ + handler->head.flag |= WM_HANDLER_DO_FREE; + WM_operator_free(handler->op); + handler->op = NULL; + } + } + } + } + } } /* ****************************************** */ void WM_keyconfig_reload(bContext *C) { - if (CTX_py_init_get(C) && !G.background) { + if (CTX_py_init_get(C) && !G.background) { #ifdef WITH_PYTHON - BPY_execute_string( - C, (const char *[]){"bpy", NULL}, - "bpy.utils.keyconfig_init()"); + BPY_execute_string(C, (const char *[]){"bpy", NULL}, "bpy.utils.keyconfig_init()"); #endif - } + } } void WM_keyconfig_init(bContext *C) { - wmWindowManager *wm = CTX_wm_manager(C); - - /* create standard key configs */ - if (wm->defaultconf == NULL) { - /* Keep lowercase to match the preset filename. */ - wm->defaultconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT, false); - } - if (wm->addonconf == NULL) { - wm->addonconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " addon", false); - } - if (wm->userconf == NULL) { - wm->userconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " user", false); - } - - /* initialize only after python init is done, for keymaps that - * use python operators */ - if (CTX_py_init_get(C) && (wm->initialized & WM_KEYCONFIG_IS_INITIALIZED) == 0) { - /* create default key config, only initialize once, - * it's persistent across sessions */ - if (!(wm->defaultconf->flag & KEYCONF_INIT_DEFAULT)) { - wm_window_keymap(wm->defaultconf); - ED_spacetypes_keymap(wm->defaultconf); - - WM_keyconfig_reload(C); - - wm->defaultconf->flag |= KEYCONF_INIT_DEFAULT; - } - - WM_keyconfig_update_tag(NULL, NULL); - WM_keyconfig_update(wm); - - wm->initialized |= WM_KEYCONFIG_IS_INITIALIZED; - } + wmWindowManager *wm = CTX_wm_manager(C); + + /* create standard key configs */ + if (wm->defaultconf == NULL) { + /* Keep lowercase to match the preset filename. */ + wm->defaultconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT, false); + } + if (wm->addonconf == NULL) { + wm->addonconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " addon", false); + } + if (wm->userconf == NULL) { + wm->userconf = WM_keyconfig_new(wm, WM_KEYCONFIG_STR_DEFAULT " user", false); + } + + /* initialize only after python init is done, for keymaps that + * use python operators */ + if (CTX_py_init_get(C) && (wm->initialized & WM_KEYCONFIG_IS_INITIALIZED) == 0) { + /* create default key config, only initialize once, + * it's persistent across sessions */ + if (!(wm->defaultconf->flag & KEYCONF_INIT_DEFAULT)) { + wm_window_keymap(wm->defaultconf); + ED_spacetypes_keymap(wm->defaultconf); + + WM_keyconfig_reload(C); + + wm->defaultconf->flag |= KEYCONF_INIT_DEFAULT; + } + + WM_keyconfig_update_tag(NULL, NULL); + WM_keyconfig_update(wm); + + wm->initialized |= WM_KEYCONFIG_IS_INITIALIZED; + } } void WM_check(bContext *C) { - Main *bmain = CTX_data_main(C); - wmWindowManager *wm = CTX_wm_manager(C); - - /* wm context */ - if (wm == NULL) { - wm = CTX_data_main(C)->wm.first; - CTX_wm_manager_set(C, wm); - } - - if (wm == NULL || BLI_listbase_is_empty(&wm->windows)) { - return; - } - - if (!G.background) { - /* case: fileread */ - if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { - WM_keyconfig_init(C); - WM_autosave_init(wm); - } - - /* case: no open windows at all, for old file reads */ - wm_window_ghostwindows_ensure(wm); - } - - if (wm->message_bus == NULL) { - wm->message_bus = WM_msgbus_create(); - } - - /* case: fileread */ - /* note: this runs in bg mode to set the screen context cb */ - if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { - ED_screens_initialize(bmain, wm); - wm->initialized |= WM_WINDOW_IS_INITIALIZED; - } + Main *bmain = CTX_data_main(C); + wmWindowManager *wm = CTX_wm_manager(C); + + /* wm context */ + if (wm == NULL) { + wm = CTX_data_main(C)->wm.first; + CTX_wm_manager_set(C, wm); + } + + if (wm == NULL || BLI_listbase_is_empty(&wm->windows)) { + return; + } + + if (!G.background) { + /* case: fileread */ + if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { + WM_keyconfig_init(C); + WM_autosave_init(wm); + } + + /* case: no open windows at all, for old file reads */ + wm_window_ghostwindows_ensure(wm); + } + + if (wm->message_bus == NULL) { + wm->message_bus = WM_msgbus_create(); + } + + /* case: fileread */ + /* note: this runs in bg mode to set the screen context cb */ + if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) { + ED_screens_initialize(bmain, wm); + wm->initialized |= WM_WINDOW_IS_INITIALIZED; + } } void wm_clear_default_size(bContext *C) { - wmWindowManager *wm = CTX_wm_manager(C); - wmWindow *win; - - /* wm context */ - if (wm == NULL) { - wm = CTX_data_main(C)->wm.first; - CTX_wm_manager_set(C, wm); - } - - if (wm == NULL || BLI_listbase_is_empty(&wm->windows)) { - return; - } - - for (win = wm->windows.first; win; win = win->next) { - win->sizex = 0; - win->sizey = 0; - win->posx = 0; - win->posy = 0; - } - + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win; + + /* wm context */ + if (wm == NULL) { + wm = CTX_data_main(C)->wm.first; + CTX_wm_manager_set(C, wm); + } + + if (wm == NULL || BLI_listbase_is_empty(&wm->windows)) { + return; + } + + for (win = wm->windows.first; win; win = win->next) { + win->sizex = 0; + win->sizey = 0; + win->posx = 0; + win->posy = 0; + } } /* on startup, it adds all data, for matching */ void wm_add_default(Main *bmain, bContext *C) { - wmWindowManager *wm = BKE_libblock_alloc(bmain, ID_WM, "WinMan", 0); - wmWindow *win; - bScreen *screen = CTX_wm_screen(C); /* XXX from file read hrmf */ - WorkSpace *workspace; - WorkSpaceLayout *layout = BKE_workspace_layout_find_global(bmain, screen, &workspace); - - CTX_wm_manager_set(C, wm); - win = wm_window_new(C, NULL); - win->scene = CTX_data_scene(C); - STRNCPY(win->view_layer_name, CTX_data_view_layer(C)->name); - BKE_workspace_active_set(win->workspace_hook, workspace); - BKE_workspace_hook_layout_for_workspace_set(win->workspace_hook, workspace, layout); - screen->winid = win->winid; - - wm->winactive = win; - wm->file_saved = 1; - wm_window_make_drawable(wm, win); + wmWindowManager *wm = BKE_libblock_alloc(bmain, ID_WM, "WinMan", 0); + wmWindow *win; + bScreen *screen = CTX_wm_screen(C); /* XXX from file read hrmf */ + WorkSpace *workspace; + WorkSpaceLayout *layout = BKE_workspace_layout_find_global(bmain, screen, &workspace); + + CTX_wm_manager_set(C, wm); + win = wm_window_new(C, NULL); + win->scene = CTX_data_scene(C); + STRNCPY(win->view_layer_name, CTX_data_view_layer(C)->name); + BKE_workspace_active_set(win->workspace_hook, workspace); + BKE_workspace_hook_layout_for_workspace_set(win->workspace_hook, workspace, layout); + screen->winid = win->winid; + + wm->winactive = win; + wm->file_saved = 1; + wm_window_make_drawable(wm, win); } - /* context is allowed to be NULL, do not free wm itself (library.c) */ void wm_close_and_free(bContext *C, wmWindowManager *wm) { - wmWindow *win; - wmOperator *op; - wmKeyConfig *keyconf; + wmWindow *win; + wmOperator *op; + wmKeyConfig *keyconf; - if (wm->autosavetimer) { - wm_autosave_timer_ended(wm); - } + if (wm->autosavetimer) { + wm_autosave_timer_ended(wm); + } - while ((win = BLI_pophead(&wm->windows))) { - /* prevent draw clear to use screen */ - BKE_workspace_active_set(win->workspace_hook, NULL); - wm_window_free(C, wm, win); - } + while ((win = BLI_pophead(&wm->windows))) { + /* prevent draw clear to use screen */ + BKE_workspace_active_set(win->workspace_hook, NULL); + wm_window_free(C, wm, win); + } - while ((op = BLI_pophead(&wm->operators))) { - WM_operator_free(op); - } + while ((op = BLI_pophead(&wm->operators))) { + WM_operator_free(op); + } - while ((keyconf = BLI_pophead(&wm->keyconfigs))) { - WM_keyconfig_free(keyconf); - } + while ((keyconf = BLI_pophead(&wm->keyconfigs))) { + WM_keyconfig_free(keyconf); + } - BLI_freelistN(&wm->queue); + BLI_freelistN(&wm->queue); - if (wm->message_bus != NULL) { - WM_msgbus_destroy(wm->message_bus); - } + if (wm->message_bus != NULL) { + WM_msgbus_destroy(wm->message_bus); + } - BLI_freelistN(&wm->paintcursors); + BLI_freelistN(&wm->paintcursors); - WM_drag_free_list(&wm->drags); + WM_drag_free_list(&wm->drags); - wm_reports_free(wm); + wm_reports_free(wm); - if (wm->undo_stack) { - BKE_undosys_stack_destroy(wm->undo_stack); - wm->undo_stack = NULL; - } + if (wm->undo_stack) { + BKE_undosys_stack_destroy(wm->undo_stack); + wm->undo_stack = NULL; + } - if (C && CTX_wm_manager(C) == wm) { - CTX_wm_manager_set(C, NULL); - } + if (C && CTX_wm_manager(C) == wm) { + CTX_wm_manager_set(C, NULL); + } } void wm_close_and_free_all(bContext *C, ListBase *wmlist) { - wmWindowManager *wm; - - while ((wm = wmlist->first)) { - wm_close_and_free(C, wm); - BLI_remlink(wmlist, wm); - BKE_libblock_free_data(&wm->id, true); - MEM_freeN(wm); - } + wmWindowManager *wm; + + while ((wm = wmlist->first)) { + wm_close_and_free(C, wm); + BLI_remlink(wmlist, wm); + BKE_libblock_free_data(&wm->id, true); + MEM_freeN(wm); + } } void WM_main(bContext *C) { - /* Single refresh before handling events. - * This ensures we don't run operators before the depsgraph has been evaluated. */ - wm_event_do_refresh_wm_and_depsgraph(C); + /* Single refresh before handling events. + * This ensures we don't run operators before the depsgraph has been evaluated. */ + wm_event_do_refresh_wm_and_depsgraph(C); - while (1) { + while (1) { - /* get events from ghost, handle window events, add to window queues */ - wm_window_process_events(C); + /* get events from ghost, handle window events, add to window queues */ + wm_window_process_events(C); - /* per window, all events to the window, screen, area and region handlers */ - wm_event_do_handlers(C); + /* per window, all events to the window, screen, area and region handlers */ + wm_event_do_handlers(C); - /* events have left notes about changes, we handle and cache it */ - wm_event_do_notifiers(C); + /* events have left notes about changes, we handle and cache it */ + wm_event_do_notifiers(C); - /* execute cached changes draw */ - wm_draw_update(C); - } + /* execute cached changes draw */ + wm_draw_update(C); + } } -- cgit v1.2.3