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/editors/screen/screen_user_menu.c | 351 ++++++++++++----------- 1 file changed, 177 insertions(+), 174 deletions(-) (limited to 'source/blender/editors/screen/screen_user_menu.c') diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index 4b8f210f1d9..0ec989db12b 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -57,29 +57,33 @@ bUserMenu **ED_screen_user_menus_find(const bContext *C, uint *r_len) { - SpaceLink *sl = CTX_wm_space_data(C); - const char *context = CTX_data_mode_string(C); - - if (sl == NULL) { - *r_len = 0; - return NULL; - } - - uint array_len = 3; - bUserMenu **um_array = MEM_calloc_arrayN(array_len, sizeof(*um_array), __func__); - um_array[0] = BKE_blender_user_menu_find(&U.user_menus, sl->spacetype, context); - um_array[1] = (sl->spacetype != SPACE_TOPBAR) ? BKE_blender_user_menu_find(&U.user_menus, SPACE_TOPBAR, context) : NULL; - um_array[2] = (sl->spacetype == SPACE_VIEW3D) ? BKE_blender_user_menu_find(&U.user_menus, SPACE_PROPERTIES, context) : NULL; - - *r_len = array_len; - return um_array; + SpaceLink *sl = CTX_wm_space_data(C); + const char *context = CTX_data_mode_string(C); + + if (sl == NULL) { + *r_len = 0; + return NULL; + } + + uint array_len = 3; + bUserMenu **um_array = MEM_calloc_arrayN(array_len, sizeof(*um_array), __func__); + um_array[0] = BKE_blender_user_menu_find(&U.user_menus, sl->spacetype, context); + um_array[1] = (sl->spacetype != SPACE_TOPBAR) ? + BKE_blender_user_menu_find(&U.user_menus, SPACE_TOPBAR, context) : + NULL; + um_array[2] = (sl->spacetype == SPACE_VIEW3D) ? + BKE_blender_user_menu_find(&U.user_menus, SPACE_PROPERTIES, context) : + NULL; + + *r_len = array_len; + return um_array; } bUserMenu *ED_screen_user_menu_ensure(bContext *C) { - SpaceLink *sl = CTX_wm_space_data(C); - const char *context = CTX_data_mode_string(C); - return BKE_blender_user_menu_ensure(&U.user_menus, sl->spacetype, context); + SpaceLink *sl = CTX_wm_space_data(C); + const char *context = CTX_data_mode_string(C); + return BKE_blender_user_menu_ensure(&U.user_menus, sl->spacetype, context); } /** \} */ @@ -88,96 +92,98 @@ bUserMenu *ED_screen_user_menu_ensure(bContext *C) /** \name Menu Item * \{ */ -bUserMenuItem_Op *ED_screen_user_menu_item_find_operator( - ListBase *lb, - const wmOperatorType *ot, IDProperty *prop, short opcontext) +bUserMenuItem_Op *ED_screen_user_menu_item_find_operator(ListBase *lb, + const wmOperatorType *ot, + IDProperty *prop, + short opcontext) { - for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { - if (umi->type == USER_MENU_TYPE_OPERATOR) { - bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi; - if (STREQ(ot->idname, umi_op->op_idname) && - (opcontext == umi_op->opcontext) && - (IDP_EqualsProperties(prop, umi_op->prop))) - { - return umi_op; - } - } - } - return NULL; + for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { + if (umi->type == USER_MENU_TYPE_OPERATOR) { + bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi; + if (STREQ(ot->idname, umi_op->op_idname) && (opcontext == umi_op->opcontext) && + (IDP_EqualsProperties(prop, umi_op->prop))) { + return umi_op; + } + } + } + return NULL; } -struct bUserMenuItem_Menu *ED_screen_user_menu_item_find_menu( - struct ListBase *lb, - const struct MenuType *mt) +struct bUserMenuItem_Menu *ED_screen_user_menu_item_find_menu(struct ListBase *lb, + const struct MenuType *mt) { - for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { - if (umi->type == USER_MENU_TYPE_MENU) { - bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi; - if (STREQ(mt->idname, umi_mt->mt_idname)) { - return umi_mt; - } - } - } - return NULL; + for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { + if (umi->type == USER_MENU_TYPE_MENU) { + bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi; + if (STREQ(mt->idname, umi_mt->mt_idname)) { + return umi_mt; + } + } + } + return NULL; } -struct bUserMenuItem_Prop *ED_screen_user_menu_item_find_prop( - struct ListBase *lb, - const char *context_data_path, const char *prop_id, int prop_index) +struct bUserMenuItem_Prop *ED_screen_user_menu_item_find_prop(struct ListBase *lb, + const char *context_data_path, + const char *prop_id, + int prop_index) { - for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { - if (umi->type == USER_MENU_TYPE_PROP) { - bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)umi; - if (STREQ(context_data_path, umi_pr->context_data_path) && - STREQ(prop_id, umi_pr->prop_id) && - (prop_index == umi_pr->prop_index)) - { - return umi_pr; - } - } - } - return NULL; + for (bUserMenuItem *umi = lb->first; umi; umi = umi->next) { + if (umi->type == USER_MENU_TYPE_PROP) { + bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)umi; + if (STREQ(context_data_path, umi_pr->context_data_path) && STREQ(prop_id, umi_pr->prop_id) && + (prop_index == umi_pr->prop_index)) { + return umi_pr; + } + } + } + return NULL; } -void ED_screen_user_menu_item_add_operator( - ListBase *lb, const char *ui_name, - const wmOperatorType *ot, const IDProperty *prop, short opcontext) +void ED_screen_user_menu_item_add_operator(ListBase *lb, + const char *ui_name, + const wmOperatorType *ot, + const IDProperty *prop, + short opcontext) { - bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)BKE_blender_user_menu_item_add(lb, USER_MENU_TYPE_OPERATOR); - umi_op->opcontext = opcontext; - if (!STREQ(ui_name, ot->name)) { - STRNCPY(umi_op->item.ui_name, ui_name); - } - STRNCPY(umi_op->op_idname, ot->idname); - umi_op->prop = prop ? IDP_CopyProperty(prop) : NULL; + bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)BKE_blender_user_menu_item_add( + lb, USER_MENU_TYPE_OPERATOR); + umi_op->opcontext = opcontext; + if (!STREQ(ui_name, ot->name)) { + STRNCPY(umi_op->item.ui_name, ui_name); + } + STRNCPY(umi_op->op_idname, ot->idname); + umi_op->prop = prop ? IDP_CopyProperty(prop) : NULL; } -void ED_screen_user_menu_item_add_menu( - ListBase *lb, const char *ui_name, - const MenuType *mt) +void ED_screen_user_menu_item_add_menu(ListBase *lb, const char *ui_name, const MenuType *mt) { - bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)BKE_blender_user_menu_item_add(lb, USER_MENU_TYPE_MENU); - if (!STREQ(ui_name, mt->label)) { - STRNCPY(umi_mt->item.ui_name, ui_name); - } - STRNCPY(umi_mt->mt_idname, mt->idname); + bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)BKE_blender_user_menu_item_add( + lb, USER_MENU_TYPE_MENU); + if (!STREQ(ui_name, mt->label)) { + STRNCPY(umi_mt->item.ui_name, ui_name); + } + STRNCPY(umi_mt->mt_idname, mt->idname); } -void ED_screen_user_menu_item_add_prop( - ListBase *lb, const char *ui_name, - const char *context_data_path, const char *prop_id, int prop_index) +void ED_screen_user_menu_item_add_prop(ListBase *lb, + const char *ui_name, + const char *context_data_path, + const char *prop_id, + int prop_index) { - bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)BKE_blender_user_menu_item_add(lb, USER_MENU_TYPE_PROP); - STRNCPY(umi_pr->item.ui_name, ui_name); - STRNCPY(umi_pr->context_data_path, context_data_path); - STRNCPY(umi_pr->prop_id, prop_id); - umi_pr->prop_index = prop_index; + bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)BKE_blender_user_menu_item_add( + lb, USER_MENU_TYPE_PROP); + STRNCPY(umi_pr->item.ui_name, ui_name); + STRNCPY(umi_pr->context_data_path, context_data_path); + STRNCPY(umi_pr->prop_id, prop_id); + umi_pr->prop_index = prop_index; } void ED_screen_user_menu_item_remove(ListBase *lb, bUserMenuItem *umi) { - BLI_remlink(lb, umi); - BKE_blender_user_menu_item_free(umi); + BLI_remlink(lb, umi); + BKE_blender_user_menu_item_free(umi); } /** \} */ @@ -188,95 +194,92 @@ void ED_screen_user_menu_item_remove(ListBase *lb, bUserMenuItem *umi) static void screen_user_menu_draw(const bContext *C, Menu *menu) { - uint um_array_len; - bUserMenu **um_array = ED_screen_user_menus_find(C, &um_array_len); - bool is_empty = true; - for (int um_index = 0; um_index < um_array_len; um_index++) { - bUserMenu *um = um_array[um_index]; - if (um == NULL) { - continue; - } - for (bUserMenuItem *umi = um->items.first; umi; umi = umi->next) { - const char *ui_name = umi->ui_name[0] ? umi->ui_name : NULL; - if (umi->type == USER_MENU_TYPE_OPERATOR) { - bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi; - IDProperty *prop = umi_op->prop ? IDP_CopyProperty(umi_op->prop) : NULL; - uiItemFullO( - menu->layout, umi_op->op_idname, ui_name, - ICON_NONE, prop, umi_op->opcontext, 0, NULL); - is_empty = false; - } - else if (umi->type == USER_MENU_TYPE_MENU) { - bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi; - uiItemM(menu->layout, umi_mt->mt_idname, ui_name, - ICON_NONE); - is_empty = false; - } - else if (umi->type == USER_MENU_TYPE_PROP) { - bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)umi; - - char *data_path = strchr(umi_pr->context_data_path, '.'); - if (data_path) { - *data_path = '\0'; - } - PointerRNA ptr = CTX_data_pointer_get(C, umi_pr->context_data_path); - if (ptr.type == NULL) { - PointerRNA ctx_ptr; - RNA_pointer_create(NULL, &RNA_Context, (void *)C, &ctx_ptr); - if (!RNA_path_resolve_full(&ctx_ptr, umi_pr->context_data_path, &ptr, NULL, NULL)) { - ptr.type = NULL; - } - } - if (data_path) { - *data_path = '.'; - data_path += 1; - } - - bool ok = false; - if (ptr.type != NULL) { - PropertyRNA *prop = NULL; - PointerRNA prop_ptr = ptr; - if ((data_path == NULL) || RNA_path_resolve_full(&ptr, data_path, &prop_ptr, NULL, NULL)) { - prop = RNA_struct_find_property(&prop_ptr, umi_pr->prop_id); - if (prop) { - ok = true; - uiItemFullR( - menu->layout, - &prop_ptr, prop, umi_pr->prop_index, - 0, 0, ui_name, ICON_NONE); - is_empty = false; - } - } - } - if (!ok) { - char label[512]; - SNPRINTF(label, "Missing: %s.%s", umi_pr->context_data_path, umi_pr->prop_id); - uiItemL(menu->layout, label, ICON_NONE); - } - } - else if (umi->type == USER_MENU_TYPE_SEP) { - uiItemS(menu->layout); - } - } - } - if (um_array) { - MEM_freeN(um_array); - } - - if (is_empty) { - uiItemL(menu->layout, IFACE_("No menu items found"), ICON_NONE); - uiItemL(menu->layout, IFACE_("Right click on buttons to add them to this menu"), ICON_NONE); - } + uint um_array_len; + bUserMenu **um_array = ED_screen_user_menus_find(C, &um_array_len); + bool is_empty = true; + for (int um_index = 0; um_index < um_array_len; um_index++) { + bUserMenu *um = um_array[um_index]; + if (um == NULL) { + continue; + } + for (bUserMenuItem *umi = um->items.first; umi; umi = umi->next) { + const char *ui_name = umi->ui_name[0] ? umi->ui_name : NULL; + if (umi->type == USER_MENU_TYPE_OPERATOR) { + bUserMenuItem_Op *umi_op = (bUserMenuItem_Op *)umi; + IDProperty *prop = umi_op->prop ? IDP_CopyProperty(umi_op->prop) : NULL; + uiItemFullO( + menu->layout, umi_op->op_idname, ui_name, ICON_NONE, prop, umi_op->opcontext, 0, NULL); + is_empty = false; + } + else if (umi->type == USER_MENU_TYPE_MENU) { + bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi; + uiItemM(menu->layout, umi_mt->mt_idname, ui_name, ICON_NONE); + is_empty = false; + } + else if (umi->type == USER_MENU_TYPE_PROP) { + bUserMenuItem_Prop *umi_pr = (bUserMenuItem_Prop *)umi; + + char *data_path = strchr(umi_pr->context_data_path, '.'); + if (data_path) { + *data_path = '\0'; + } + PointerRNA ptr = CTX_data_pointer_get(C, umi_pr->context_data_path); + if (ptr.type == NULL) { + PointerRNA ctx_ptr; + RNA_pointer_create(NULL, &RNA_Context, (void *)C, &ctx_ptr); + if (!RNA_path_resolve_full(&ctx_ptr, umi_pr->context_data_path, &ptr, NULL, NULL)) { + ptr.type = NULL; + } + } + if (data_path) { + *data_path = '.'; + data_path += 1; + } + + bool ok = false; + if (ptr.type != NULL) { + PropertyRNA *prop = NULL; + PointerRNA prop_ptr = ptr; + if ((data_path == NULL) || + RNA_path_resolve_full(&ptr, data_path, &prop_ptr, NULL, NULL)) { + prop = RNA_struct_find_property(&prop_ptr, umi_pr->prop_id); + if (prop) { + ok = true; + uiItemFullR( + menu->layout, &prop_ptr, prop, umi_pr->prop_index, 0, 0, ui_name, ICON_NONE); + is_empty = false; + } + } + } + if (!ok) { + char label[512]; + SNPRINTF(label, "Missing: %s.%s", umi_pr->context_data_path, umi_pr->prop_id); + uiItemL(menu->layout, label, ICON_NONE); + } + } + else if (umi->type == USER_MENU_TYPE_SEP) { + uiItemS(menu->layout); + } + } + } + if (um_array) { + MEM_freeN(um_array); + } + + if (is_empty) { + uiItemL(menu->layout, IFACE_("No menu items found"), ICON_NONE); + uiItemL(menu->layout, IFACE_("Right click on buttons to add them to this menu"), ICON_NONE); + } } void ED_screen_user_menu_register(void) { - MenuType *mt = MEM_callocN(sizeof(MenuType), __func__); - strcpy(mt->idname, "SCREEN_MT_user_menu"); - strcpy(mt->label, "Quick Favorites"); - strcpy(mt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); - mt->draw = screen_user_menu_draw; - WM_menutype_add(mt); + MenuType *mt = MEM_callocN(sizeof(MenuType), __func__); + strcpy(mt->idname, "SCREEN_MT_user_menu"); + strcpy(mt->label, "Quick Favorites"); + strcpy(mt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + mt->draw = screen_user_menu_draw; + WM_menutype_add(mt); } /** \} */ -- cgit v1.2.3