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/space_info/space_info.c | 358 ++++++++++++------------- 1 file changed, 179 insertions(+), 179 deletions(-) (limited to 'source/blender/editors/space_info/space_info.c') diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 997a40839ac..6ed9d80d145 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -21,7 +21,6 @@ * \ingroup spinfo */ - #include #include @@ -48,7 +47,7 @@ #include "UI_interface.h" #include "UI_view2d.h" -#include "info_intern.h" /* own include */ +#include "info_intern.h" /* own include */ #include "BLO_readfile.h" #include "GPU_framebuffer.h" @@ -56,270 +55,271 @@ static SpaceLink *info_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { - ARegion *ar; - SpaceInfo *sinfo; + ARegion *ar; + SpaceInfo *sinfo; - sinfo = MEM_callocN(sizeof(SpaceInfo), "initinfo"); - sinfo->spacetype = SPACE_INFO; + sinfo = MEM_callocN(sizeof(SpaceInfo), "initinfo"); + sinfo->spacetype = SPACE_INFO; - sinfo->rpt_mask = INFO_RPT_OP; + sinfo->rpt_mask = INFO_RPT_OP; - /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for info"); + /* header */ + ar = MEM_callocN(sizeof(ARegion), "header for info"); - BLI_addtail(&sinfo->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + BLI_addtail(&sinfo->regionbase, ar); + ar->regiontype = RGN_TYPE_HEADER; + ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; - /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for info"); + /* main region */ + ar = MEM_callocN(sizeof(ARegion), "main region for info"); - BLI_addtail(&sinfo->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&sinfo->regionbase, ar); + ar->regiontype = RGN_TYPE_WINDOW; - /* keep in sync with console */ - ar->v2d.scroll |= (V2D_SCROLL_RIGHT); - ar->v2d.align |= V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_NEG_Y; /* align bottom left */ - ar->v2d.keepofs |= V2D_LOCKOFS_X; - ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT); - ar->v2d.keeptot = V2D_KEEPTOT_BOUNDS; - ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f; + /* keep in sync with console */ + ar->v2d.scroll |= (V2D_SCROLL_RIGHT); + ar->v2d.align |= V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_NEG_Y; /* align bottom left */ + ar->v2d.keepofs |= V2D_LOCKOFS_X; + ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT); + ar->v2d.keeptot = V2D_KEEPTOT_BOUNDS; + ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f; - /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */ - //ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM); + /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */ + //ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM); - return (SpaceLink *)sinfo; + return (SpaceLink *)sinfo; } /* not spacelink itself */ static void info_free(SpaceLink *UNUSED(sl)) { -// SpaceInfo *sinfo = (SpaceInfo *) sl; - + // SpaceInfo *sinfo = (SpaceInfo *) sl; } - /* spacetype; init callback */ static void info_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa)) { - } static SpaceLink *info_duplicate(SpaceLink *sl) { - SpaceInfo *sinfon = MEM_dupallocN(sl); + SpaceInfo *sinfon = MEM_dupallocN(sl); - /* clear or remove stuff from old */ + /* clear or remove stuff from old */ - return (SpaceLink *)sinfon; + return (SpaceLink *)sinfon; } - - /* add handlers, stuff you only do once or on area/region changes */ static void info_main_region_init(wmWindowManager *wm, ARegion *ar) { - wmKeyMap *keymap; + wmKeyMap *keymap; - /* force it on init, for old files, until it becomes config */ - ar->v2d.scroll = (V2D_SCROLL_RIGHT); + /* force it on init, for old files, until it becomes config */ + ar->v2d.scroll = (V2D_SCROLL_RIGHT); - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); + UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); - /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Info", SPACE_INFO, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + /* own keymap */ + keymap = WM_keymap_ensure(wm->defaultconf, "Info", SPACE_INFO, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); } static void info_textview_update_rect(const bContext *C, ARegion *ar) { - SpaceInfo *sinfo = CTX_wm_space_info(C); - View2D *v2d = &ar->v2d; + SpaceInfo *sinfo = CTX_wm_space_info(C); + View2D *v2d = &ar->v2d; - UI_view2d_totRect_set(v2d, ar->winx - 1, info_textview_height(sinfo, ar, CTX_wm_reports(C))); + UI_view2d_totRect_set(v2d, ar->winx - 1, info_textview_height(sinfo, ar, CTX_wm_reports(C))); } static void info_main_region_draw(const bContext *C, ARegion *ar) { - /* draw entirely, view changes should be handled here */ - SpaceInfo *sinfo = CTX_wm_space_info(C); - View2D *v2d = &ar->v2d; - View2DScrollers *scrollers; + /* draw entirely, view changes should be handled here */ + SpaceInfo *sinfo = CTX_wm_space_info(C); + View2D *v2d = &ar->v2d; + View2DScrollers *scrollers; - /* clear and setup matrix */ - UI_ThemeClearColor(TH_BACK); - GPU_clear(GPU_COLOR_BIT); + /* clear and setup matrix */ + UI_ThemeClearColor(TH_BACK); + GPU_clear(GPU_COLOR_BIT); - /* quick way to avoid drawing if not bug enough */ - if (ar->winy < 16) { - return; - } + /* quick way to avoid drawing if not bug enough */ + if (ar->winy < 16) { + return; + } - info_textview_update_rect(C, ar); + info_textview_update_rect(C, ar); - /* worlks best with no view2d matrix set */ - UI_view2d_view_ortho(v2d); + /* worlks best with no view2d matrix set */ + UI_view2d_view_ortho(v2d); - info_textview_main(sinfo, ar, CTX_wm_reports(C)); + info_textview_main(sinfo, ar, CTX_wm_reports(C)); - /* reset view matrix */ - UI_view2d_view_restore(C); + /* reset view matrix */ + UI_view2d_view_restore(C); - /* scrollers */ - scrollers = UI_view2d_scrollers_calc(C, v2d, NULL, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_GRID_CLAMP); - UI_view2d_scrollers_draw(C, v2d, scrollers); - UI_view2d_scrollers_free(scrollers); + /* scrollers */ + scrollers = UI_view2d_scrollers_calc( + C, v2d, NULL, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_GRID_CLAMP); + UI_view2d_scrollers_draw(C, v2d, scrollers); + UI_view2d_scrollers_free(scrollers); } static void info_operatortypes(void) { - WM_operatortype_append(FILE_OT_autopack_toggle); - WM_operatortype_append(FILE_OT_pack_all); - WM_operatortype_append(FILE_OT_pack_libraries); - WM_operatortype_append(FILE_OT_unpack_all); - WM_operatortype_append(FILE_OT_unpack_item); - WM_operatortype_append(FILE_OT_unpack_libraries); - - WM_operatortype_append(FILE_OT_make_paths_relative); - WM_operatortype_append(FILE_OT_make_paths_absolute); - WM_operatortype_append(FILE_OT_report_missing_files); - WM_operatortype_append(FILE_OT_find_missing_files); - WM_operatortype_append(INFO_OT_reports_display_update); - - /* info_report.c */ - WM_operatortype_append(INFO_OT_select_pick); - WM_operatortype_append(INFO_OT_select_all); - WM_operatortype_append(INFO_OT_select_box); - - WM_operatortype_append(INFO_OT_report_replay); - WM_operatortype_append(INFO_OT_report_delete); - WM_operatortype_append(INFO_OT_report_copy); + WM_operatortype_append(FILE_OT_autopack_toggle); + WM_operatortype_append(FILE_OT_pack_all); + WM_operatortype_append(FILE_OT_pack_libraries); + WM_operatortype_append(FILE_OT_unpack_all); + WM_operatortype_append(FILE_OT_unpack_item); + WM_operatortype_append(FILE_OT_unpack_libraries); + + WM_operatortype_append(FILE_OT_make_paths_relative); + WM_operatortype_append(FILE_OT_make_paths_absolute); + WM_operatortype_append(FILE_OT_report_missing_files); + WM_operatortype_append(FILE_OT_find_missing_files); + WM_operatortype_append(INFO_OT_reports_display_update); + + /* info_report.c */ + WM_operatortype_append(INFO_OT_select_pick); + WM_operatortype_append(INFO_OT_select_all); + WM_operatortype_append(INFO_OT_select_box); + + WM_operatortype_append(INFO_OT_report_replay); + WM_operatortype_append(INFO_OT_report_delete); + WM_operatortype_append(INFO_OT_report_copy); } static void info_keymap(struct wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Window", 0, 0); - WM_keymap_ensure(keyconf, "Info", SPACE_INFO, 0); + WM_keymap_ensure(keyconf, "Window", 0, 0); + WM_keymap_ensure(keyconf, "Info", SPACE_INFO, 0); } /* add handlers, stuff you only do once or on area/region changes */ static void info_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { - ED_region_header_init(ar); + ED_region_header_init(ar); } static void info_header_region_draw(const bContext *C, ARegion *ar) { - ED_region_header(C, ar); + ED_region_header(C, ar); } -static void info_main_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void info_main_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *ar, + wmNotifier *wmn, + const Scene *UNUSED(scene)) { - // SpaceInfo *sinfo = sa->spacedata.first; - - /* context changes */ - switch (wmn->category) { - case NC_SPACE: - if (wmn->data == ND_SPACE_INFO_REPORT) { - /* redraw also but only for report view, could do less redraws by checking the type */ - ED_region_tag_redraw(ar); - } - break; - } + // SpaceInfo *sinfo = sa->spacedata.first; + + /* context changes */ + switch (wmn->category) { + case NC_SPACE: + if (wmn->data == ND_SPACE_INFO_REPORT) { + /* redraw also but only for report view, could do less redraws by checking the type */ + ED_region_tag_redraw(ar); + } + break; + } } -static void info_header_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void info_header_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *ar, + wmNotifier *wmn, + const Scene *UNUSED(scene)) { - /* context changes */ - switch (wmn->category) { - case NC_SCREEN: - if (ELEM(wmn->data, ND_LAYER, ND_ANIMPLAY)) { - ED_region_tag_redraw(ar); - } - break; - case NC_WM: - if (wmn->data == ND_JOB) { - ED_region_tag_redraw(ar); - } - break; - case NC_SCENE: - if (wmn->data == ND_RENDER_RESULT) { - ED_region_tag_redraw(ar); - } - break; - case NC_SPACE: - if (wmn->data == ND_SPACE_INFO) { - ED_region_tag_redraw(ar); - } - break; - case NC_ID: - if (wmn->action == NA_RENAME) { - ED_region_tag_redraw(ar); - } - break; - } - + /* context changes */ + switch (wmn->category) { + case NC_SCREEN: + if (ELEM(wmn->data, ND_LAYER, ND_ANIMPLAY)) { + ED_region_tag_redraw(ar); + } + break; + case NC_WM: + if (wmn->data == ND_JOB) { + ED_region_tag_redraw(ar); + } + break; + case NC_SCENE: + if (wmn->data == ND_RENDER_RESULT) { + ED_region_tag_redraw(ar); + } + break; + case NC_SPACE: + if (wmn->data == ND_SPACE_INFO) { + ED_region_tag_redraw(ar); + } + break; + case NC_ID: + if (wmn->action == NA_RENAME) { + ED_region_tag_redraw(ar); + } + break; + } } -static void info_header_region_message_subscribe( - const bContext *UNUSED(C), - WorkSpace *UNUSED(workspace), Scene *UNUSED(scene), - bScreen *UNUSED(screen), ScrArea *UNUSED(sa), ARegion *ar, - struct wmMsgBus *mbus) +static void info_header_region_message_subscribe(const bContext *UNUSED(C), + WorkSpace *UNUSED(workspace), + Scene *UNUSED(scene), + bScreen *UNUSED(screen), + ScrArea *UNUSED(sa), + ARegion *ar, + struct wmMsgBus *mbus) { - wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { - .owner = ar, - .user_data = ar, - .notify = ED_region_do_msg_notify_tag_redraw, - }; - - WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw); - WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw); + wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { + .owner = ar, + .user_data = ar, + .notify = ED_region_do_msg_notify_tag_redraw, + }; + + WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw); + WM_msg_subscribe_rna_anon_prop(mbus, ViewLayer, name, &msg_sub_value_region_tag_redraw); } /* only called once, from space/spacetypes.c */ void ED_spacetype_info(void) { - SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype info"); - ARegionType *art; + SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype info"); + ARegionType *art; - st->spaceid = SPACE_INFO; - strncpy(st->name, "Info", BKE_ST_MAXNAME); + st->spaceid = SPACE_INFO; + strncpy(st->name, "Info", BKE_ST_MAXNAME); - st->new = info_new; - st->free = info_free; - st->init = info_init; - st->duplicate = info_duplicate; - st->operatortypes = info_operatortypes; - st->keymap = info_keymap; + st->new = info_new; + st->free = info_free; + st->init = info_init; + st->duplicate = info_duplicate; + st->operatortypes = info_operatortypes; + st->keymap = info_keymap; - /* regions: main window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype info region"); - art->regionid = RGN_TYPE_WINDOW; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES; + /* regions: main window */ + art = MEM_callocN(sizeof(ARegionType), "spacetype info region"); + art->regionid = RGN_TYPE_WINDOW; + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES; - art->init = info_main_region_init; - art->draw = info_main_region_draw; - art->listener = info_main_region_listener; + art->init = info_main_region_init; + art->draw = info_main_region_draw; + art->listener = info_main_region_listener; - BLI_addhead(&st->regiontypes, art); + BLI_addhead(&st->regiontypes, art); - /* regions: header */ - art = MEM_callocN(sizeof(ARegionType), "spacetype info region"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = HEADERY; + /* regions: header */ + art = MEM_callocN(sizeof(ARegionType), "spacetype info region"); + art->regionid = RGN_TYPE_HEADER; + art->prefsizey = HEADERY; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; - art->listener = info_header_listener; - art->message_subscribe = info_header_region_message_subscribe; - art->init = info_header_region_init; - art->draw = info_header_region_draw; + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; + art->listener = info_header_listener; + art->message_subscribe = info_header_region_message_subscribe; + art->init = info_header_region_init; + art->draw = info_header_region_draw; - BLI_addhead(&st->regiontypes, art); + BLI_addhead(&st->regiontypes, art); - BKE_spacetype_register(st); + BKE_spacetype_register(st); } -- cgit v1.2.3