diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/space_statusbar | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
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
Diffstat (limited to 'source/blender/editors/space_statusbar')
-rw-r--r-- | source/blender/editors/space_statusbar/CMakeLists.txt | 30 | ||||
-rw-r--r-- | source/blender/editors/space_statusbar/space_statusbar.c | 189 |
2 files changed, 107 insertions, 112 deletions
diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 63562621d34..39957c6792c 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -16,30 +16,30 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - ../include - ../../blenkernel - ../../blenlib - ../../blenloader - ../../blentranslation - ../../gpu - ../../makesdna - ../../makesrna - ../../windowmanager - ../../../../intern/guardedalloc - ../../../../intern/glew-mx + ../include + ../../blenkernel + ../../blenlib + ../../blenloader + ../../blentranslation + ../../gpu + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/glew-mx ) set(INC_SYS - ${GLEW_INCLUDE_PATH} + ${GLEW_INCLUDE_PATH} ) set(SRC - space_statusbar.c + space_statusbar.c ) set(LIB - bf_blenkernel - bf_blenlib + bf_blenkernel + bf_blenlib ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/space_statusbar/space_statusbar.c b/source/blender/editors/space_statusbar/space_statusbar.c index 3c5ccb7e59b..63f27b4d74a 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.c +++ b/source/blender/editors/space_statusbar/space_statusbar.c @@ -18,7 +18,6 @@ * \ingroup spstatusbar */ - #include <string.h> #include <stdio.h> @@ -41,147 +40,143 @@ #include "WM_types.h" #include "WM_message.h" - /* ******************** default callbacks for statusbar space ******************** */ static SpaceLink *statusbar_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { - ARegion *ar; - SpaceStatusBar *sstatusbar; + ARegion *ar; + SpaceStatusBar *sstatusbar; - sstatusbar = MEM_callocN(sizeof(*sstatusbar), "init statusbar"); - sstatusbar->spacetype = SPACE_STATUSBAR; + sstatusbar = MEM_callocN(sizeof(*sstatusbar), "init statusbar"); + sstatusbar->spacetype = SPACE_STATUSBAR; - /* header region */ - ar = MEM_callocN(sizeof(*ar), "header for statusbar"); - BLI_addtail(&sstatusbar->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = RGN_ALIGN_NONE; + /* header region */ + ar = MEM_callocN(sizeof(*ar), "header for statusbar"); + BLI_addtail(&sstatusbar->regionbase, ar); + ar->regiontype = RGN_TYPE_HEADER; + ar->alignment = RGN_ALIGN_NONE; - return (SpaceLink *)sstatusbar; + return (SpaceLink *)sstatusbar; } /* not spacelink itself */ static void statusbar_free(SpaceLink *UNUSED(sl)) { - } - /* spacetype; init callback */ static void statusbar_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa)) { - } static SpaceLink *statusbar_duplicate(SpaceLink *sl) { - SpaceStatusBar *sstatusbarn = MEM_dupallocN(sl); + SpaceStatusBar *sstatusbarn = MEM_dupallocN(sl); - /* clear or remove stuff from old */ + /* clear or remove stuff from old */ - return (SpaceLink *)sstatusbarn; + return (SpaceLink *)sstatusbarn; } - - /* add handlers, stuff you only do once or on area/region changes */ static void statusbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) { - if (ELEM(region->alignment, RGN_ALIGN_RIGHT)) { - region->flag |= RGN_FLAG_DYNAMIC_SIZE; - } - ED_region_header_init(region); + if (ELEM(region->alignment, RGN_ALIGN_RIGHT)) { + region->flag |= RGN_FLAG_DYNAMIC_SIZE; + } + ED_region_header_init(region); } static void statusbar_operatortypes(void) { - } static void statusbar_keymap(struct wmKeyConfig *UNUSED(keyconf)) { - } -static void statusbar_header_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void statusbar_header_region_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 statusbar_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 statusbar_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_statusbar(void) { - SpaceType *st = MEM_callocN(sizeof(*st), "spacetype statusbar"); - ARegionType *art; - - st->spaceid = SPACE_STATUSBAR; - strncpy(st->name, "Status Bar", BKE_ST_MAXNAME); - - st->new = statusbar_new; - st->free = statusbar_free; - st->init = statusbar_init; - st->duplicate = statusbar_duplicate; - st->operatortypes = statusbar_operatortypes; - st->keymap = statusbar_keymap; - - /* regions: header window */ - art = MEM_callocN(sizeof(*art), "spacetype statusbar header region"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = 0.8f * HEADERY; - art->prefsizex = UI_UNIT_X * 5; /* Mainly to avoid glitches */ - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; - art->init = statusbar_header_region_init; - art->layout = ED_region_header_layout; - art->draw = ED_region_header_draw; - art->listener = statusbar_header_region_listener; - art->message_subscribe = statusbar_header_region_message_subscribe; - BLI_addhead(&st->regiontypes, art); - - BKE_spacetype_register(st); + SpaceType *st = MEM_callocN(sizeof(*st), "spacetype statusbar"); + ARegionType *art; + + st->spaceid = SPACE_STATUSBAR; + strncpy(st->name, "Status Bar", BKE_ST_MAXNAME); + + st->new = statusbar_new; + st->free = statusbar_free; + st->init = statusbar_init; + st->duplicate = statusbar_duplicate; + st->operatortypes = statusbar_operatortypes; + st->keymap = statusbar_keymap; + + /* regions: header window */ + art = MEM_callocN(sizeof(*art), "spacetype statusbar header region"); + art->regionid = RGN_TYPE_HEADER; + art->prefsizey = 0.8f * HEADERY; + art->prefsizex = UI_UNIT_X * 5; /* Mainly to avoid glitches */ + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; + art->init = statusbar_header_region_init; + art->layout = ED_region_header_layout; + art->draw = ED_region_header_draw; + art->listener = statusbar_header_region_listener; + art->message_subscribe = statusbar_header_region_message_subscribe; + BLI_addhead(&st->regiontypes, art); + + BKE_spacetype_register(st); } |