From b2ee1770d4c31078518f4ec9edd5196a41345162 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 6 Mar 2020 16:56:42 +0100 Subject: Cleanup: Rename ARegion variables from ar to region The old convention was easy to confuse with ScrArea. Part of https://developer.blender.org/T74432. This is mostly a batch rename with some manual fixing. Only single word variable names are changed, no prefixed/suffixed names. Brecht van Lommel and Campbell Barton both gave me a green light for this convention change. Also ran clan clang format on affected files. --- .../editors/space_sequencer/sequencer_draw.c | 87 +++++--- .../editors/space_sequencer/sequencer_edit.c | 18 +- .../editors/space_sequencer/sequencer_intern.h | 4 +- .../editors/space_sequencer/sequencer_view.c | 14 +- .../editors/space_sequencer/space_sequencer.c | 248 ++++++++++----------- 5 files changed, 192 insertions(+), 179 deletions(-) (limited to 'source/blender/editors/space_sequencer') diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index a4558f31cc8..ef192f6c9db 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -690,11 +690,14 @@ static void draw_seq_text(View2D *v2d, UI_view2d_text_cache_add_rectf(v2d, &rect, str, str_len, col); } -static void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq, unsigned int pos) +static void draw_sequence_extensions(Scene *scene, + ARegion *region, + Sequence *seq, + unsigned int pos) { float x1, x2, y1, y2, pixely; unsigned char col[4], blendcol[3]; - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; x1 = seq->startdisp; x2 = seq->enddisp; @@ -800,12 +803,12 @@ static void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq, u static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, - ARegion *ar, + ARegion *region, Sequence *seq, int outline_tint, float pixelx) { - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; float x1, x2, y1, y2; unsigned char col[4], background_col[4], is_single_image; const float handsize_clamped = sequence_handle_size_get_clamped(seq, pixelx); @@ -862,7 +865,7 @@ static void draw_seq_strip(const bContext *C, if (!is_single_image) { if ((sseq->draw_flag & SEQ_DRAW_OFFSET_EXT) || (seq == special_seq_update)) { - draw_sequence_extensions(scene, ar, seq, pos); + draw_sequence_extensions(scene, region, seq, pos); } } @@ -877,8 +880,16 @@ static void draw_seq_strip(const bContext *C, /* draw sound wave */ if (seq->type == SEQ_TYPE_SOUND_RAM) { if (!(sseq->flag & SEQ_NO_WAVEFORMS)) { - drawseqwave( - v2d, C, sseq, scene, seq, x1, y1, x2, y2, BLI_rctf_size_x(&ar->v2d.cur) / ar->winx); + drawseqwave(v2d, + C, + sseq, + scene, + seq, + x1, + y1, + x2, + y2, + BLI_rctf_size_x(®ion->v2d.cur) / region->winx); } } @@ -1002,10 +1013,10 @@ Sequence *ED_sequencer_special_preview_get(void) void ED_sequencer_special_preview_set(bContext *C, const int mval[2]) { Scene *scene = CTX_data_scene(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); int hand; Sequence *seq; - seq = find_nearest_seq(scene, &ar->v2d, &hand, mval); + seq = find_nearest_seq(scene, ®ion->v2d, &hand, mval); sequencer_special_update_set(seq); } @@ -1185,7 +1196,7 @@ static void sequencer_draw_borders(const SpaceSeq *sseq, const View2D *v2d, cons } #if 0 -void sequencer_draw_maskedit(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq) +void sequencer_draw_maskedit(const bContext *C, Scene *scene, ARegion *region, SpaceSeq *sseq) { /* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not, * for now just disable drawing since the strip frame will likely be offset */ @@ -1204,7 +1215,7 @@ void sequencer_draw_maskedit(const bContext *C, Scene *scene, ARegion *ar, Space height = (scene->r.size * scene->r.ysch) / 100; ED_mask_draw_region(mask, - ar, + region, 0, 0, 0, /* TODO */ @@ -1326,12 +1337,12 @@ static void sequencer_preview_clear(void) static void sequencer_preview_get_rect(rctf *preview, Scene *scene, - ARegion *ar, + ARegion *region, SpaceSeq *sseq, bool draw_overlay, bool draw_backdrop) { - struct View2D *v2d = &ar->v2d; + struct View2D *v2d = ®ion->v2d; float viewrect[2]; sequencer_display_size(scene, viewrect); @@ -1348,7 +1359,7 @@ static void sequencer_preview_get_rect(rctf *preview, (fabsf(BLI_rctf_size_y(&v2d->tot)) * scene->ed->over_border.ymin); } else if (draw_backdrop) { - float aspect = BLI_rcti_size_x(&ar->winrct) / (float)BLI_rcti_size_y(&ar->winrct); + float aspect = BLI_rcti_size_x(®ion->winrct) / (float)BLI_rcti_size_y(®ion->winrct); float image_aspect = viewrect[0] / viewrect[1]; if (aspect >= image_aspect) { @@ -1367,7 +1378,7 @@ static void sequencer_preview_get_rect(rctf *preview, static void sequencer_draw_display_buffer(const bContext *C, Scene *scene, - ARegion *ar, + ARegion *region, SpaceSeq *sseq, ImBuf *ibuf, ImBuf *scope, @@ -1438,7 +1449,7 @@ static void sequencer_draw_display_buffer(const bContext *C, rctf preview; rctf canvas; - sequencer_preview_get_rect(&preview, scene, ar, sseq, draw_overlay, draw_backdrop); + sequencer_preview_get_rect(&preview, scene, region, sseq, draw_overlay, draw_backdrop); if (draw_overlay && sseq->overlay_type == SEQ_DRAW_OVERLAY_RECT) { canvas = scene->ed->over_border; @@ -1543,7 +1554,7 @@ static ImBuf *sequencer_get_scope(Scene *scene, SpaceSeq *sseq, ImBuf *ibuf, boo void sequencer_draw_preview(const bContext *C, Scene *scene, - ARegion *ar, + ARegion *region, SpaceSeq *sseq, int cfra, int frame_ofs, @@ -1552,7 +1563,7 @@ void sequencer_draw_preview(const bContext *C, { struct Main *bmain = CTX_data_main(C); struct Depsgraph *depsgraph = CTX_data_expect_evaluated_depsgraph(C); - struct View2D *v2d = &ar->v2d; + struct View2D *v2d = ®ion->v2d; struct ImBuf *ibuf = NULL; struct ImBuf *scope = NULL; float viewrect[2]; @@ -1592,7 +1603,8 @@ void sequencer_draw_preview(const bContext *C, scope = sequencer_get_scope(scene, sseq, ibuf, draw_backdrop); /* Draw image */ - sequencer_draw_display_buffer(C, scene, ar, sseq, ibuf, scope, draw_overlay, draw_backdrop); + sequencer_draw_display_buffer( + C, scene, region, sseq, ibuf, scope, draw_overlay, draw_backdrop); /* Draw over image */ if (sseq->flag & SEQ_SHOW_METADATA) { @@ -1609,7 +1621,7 @@ void sequencer_draw_preview(const bContext *C, } /* TODO */ - /* sequencer_draw_maskedit(C, scene, ar, sseq); */ + /* sequencer_draw_maskedit(C, scene, region, sseq); */ /* Scope is freed in sequencer_check_scopes when ibuf changes and * scope image is to be replaced. */ @@ -1664,10 +1676,10 @@ static void draw_seq_backdrop(View2D *v2d) } /* draw the contents of the sequencer strips view */ -static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar) +static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *region) { Scene *scene = CTX_data_scene(C); - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; SpaceSeq *sseq = CTX_wm_space_seq(C); Sequence *last_seq = BKE_sequencer_active_get(scene); int sel = 0, j; @@ -1702,7 +1714,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar) } /* strip passed all tests unscathed... so draw it now */ - draw_seq_strip(C, sseq, scene, ar, seq, outline_tint, pixelx); + draw_seq_strip(C, sseq, scene, region, seq, outline_tint, pixelx); } /* draw selected next time round */ @@ -1712,7 +1724,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar) /* draw the last selected last (i.e. 'active' in other parts of Blender), * removes some overlapping error */ if (last_seq) { - draw_seq_strip(C, sseq, scene, ar, last_seq, 120, pixelx); + draw_seq_strip(C, sseq, scene, region, last_seq, 120, pixelx); } /* draw highlight when previewing a single strip */ @@ -1892,8 +1904,8 @@ static void draw_cache_view_batch( static void draw_cache_view(const bContext *C) { Scene *scene = CTX_data_scene(C); - ARegion *ar = CTX_wm_region(C); - struct View2D *v2d = &ar->v2d; + ARegion *region = CTX_wm_region(C); + struct View2D *v2d = ®ion->v2d; if ((scene->ed->cache_flag & SEQ_CACHE_VIEW_ENABLE) == 0) { return; @@ -2000,12 +2012,12 @@ static void draw_cache_view(const bContext *C) } /* Draw Timeline/Strip Editor Mode for Sequencer */ -void draw_timeline_seq(const bContext *C, ARegion *ar) +void draw_timeline_seq(const bContext *C, ARegion *region) { Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, false); SpaceSeq *sseq = CTX_wm_space_seq(C); - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; View2DScrollers *scrollers; short cfra_flag = 0; float col[3]; @@ -2037,20 +2049,20 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) /* Only draw backdrop in pure sequence view. */ if (sseq->view == SEQ_VIEW_SEQUENCE && sseq->draw_flag & SEQ_DRAW_BACKDROP) { - sequencer_draw_preview(C, scene, ar, sseq, scene->r.cfra, 0, false, true); + sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, true); UI_view2d_view_ortho(v2d); } - ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW); + ED_region_draw_cb_draw(C, region, REGION_DRAW_PRE_VIEW); seq_draw_sfra_efra(scene, v2d); /* sequence strips (if there is data available to be drawn) */ if (ed) { /* draw the data */ - draw_seq_strips(C, ed, ar); + draw_seq_strips(C, ed, region); /* text draw cached (for sequence names), in pixelspace now */ - UI_view2d_text_cache_draw(ar); + UI_view2d_text_cache_draw(region); } /* current frame */ @@ -2061,7 +2073,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) ANIM_draw_cfra(C, v2d, cfra_flag); /* markers */ - UI_view2d_view_orthoSpecial(ar, v2d, 1); + UI_view2d_view_orthoSpecial(region, v2d, 1); int marker_draw_flag = DRAW_MARKERS_MARGIN; if (sseq->flag & SEQ_SHOW_MARKERS) { ED_markers_draw(C, marker_draw_flag); @@ -2099,13 +2111,13 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) } /* callback */ - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); + ED_region_draw_cb_draw(C, region, REGION_DRAW_POST_VIEW); /* reset view matrix */ UI_view2d_view_restore(C); /* scrubbing region */ - ED_time_scrub_draw(ar, scene, !(sseq->flag & SEQ_DRAWFRAMES), true); + ED_time_scrub_draw(region, scene, !(sseq->flag & SEQ_DRAWFRAMES), true); /* scrollers */ scrollers = UI_view2d_scrollers_calc(v2d, NULL); @@ -2115,7 +2127,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) /* channel numbers */ { rcti rect; - BLI_rcti_init(&rect, 0, 15 * UI_DPI_FAC, 15 * UI_DPI_FAC, ar->winy - UI_TIME_SCRUB_MARGIN_Y); - UI_view2d_draw_scale_y__block(ar, v2d, &rect, TH_SCROLL_TEXT); + BLI_rcti_init( + &rect, 0, 15 * UI_DPI_FAC, 15 * UI_DPI_FAC, region->winy - UI_TIME_SCRUB_MARGIN_Y); + UI_view2d_draw_scale_y__block(region, v2d, &rect, TH_SCROLL_TEXT); } } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 905692de8a6..ca2a5eaa54f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2478,9 +2478,9 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) static int sequencer_delete_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); - if (ar->regiontype == RGN_TYPE_WINDOW) { + if (region->regiontype == RGN_TYPE_WINDOW) { /* bounding box of 30 pixels is used for markers shortcuts, * prevent conflict with markers shortcuts here */ @@ -2899,13 +2899,13 @@ void SEQUENCER_OT_meta_separate(wmOperatorType *ot) /* view_all operator */ static int sequencer_view_all_exec(bContext *C, wmOperator *op) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); rctf box; const int smooth_viewtx = WM_operator_smooth_viewtx_get(op); boundbox_seq(CTX_data_scene(C), &box); - UI_view2d_smooth_view(C, ar, &box, smooth_viewtx); + UI_view2d_smooth_view(C, region, &box, smooth_viewtx); return OPERATOR_FINISHED; } @@ -2953,7 +2953,7 @@ static int sequencer_view_all_preview_exec(bContext *C, wmOperator *UNUSED(op)) bScreen *sc = CTX_wm_screen(C); ScrArea *area = CTX_wm_area(C); #if 0 - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceSeq *sseq = area->spacedata.first; Scene *scene = CTX_data_scene(C); #endif @@ -2968,8 +2968,8 @@ static int sequencer_view_all_preview_exec(bContext *C, wmOperator *UNUSED(op)) float zoomX, zoomY; int width, height, imgwidth, imgheight; - width = ar->winx; - height = ar->winy; + width = region->winx; + height = region->winy; seq_reset_imageofs(sseq); @@ -3102,7 +3102,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); View2D *v2d = UI_view2d_fromcontext(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *last_seq = BKE_sequencer_active_get(scene); Sequence *seq; @@ -3155,7 +3155,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op) cur_new.ymax = ymid + (orig_height / 2); } - UI_view2d_smooth_view(C, ar, &cur_new, smooth_viewtx); + UI_view2d_smooth_view(C, region, &cur_new, smooth_viewtx); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index ebdaf068f0a..2cbd4d35e27 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -42,10 +42,10 @@ struct rctf; struct wmOperator; /* sequencer_draw.c */ -void draw_timeline_seq(const struct bContext *C, struct ARegion *ar); +void draw_timeline_seq(const struct bContext *C, struct ARegion *region); void sequencer_draw_preview(const struct bContext *C, struct Scene *scene, - struct ARegion *ar, + struct ARegion *region, struct SpaceSeq *sseq, int cfra, int offset, diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index 534d02c7bf3..f30a604ca93 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -68,14 +68,14 @@ typedef struct ImageSampleInfo { int color_manage; } ImageSampleInfo; -static void sample_draw(const bContext *C, ARegion *ar, void *arg_info) +static void sample_draw(const bContext *C, ARegion *region, void *arg_info) { Scene *scene = CTX_data_scene(C); ImageSampleInfo *info = arg_info; if (info->draw) { ED_image_draw_info(scene, - ar, + region, info->color_manage, false, info->channels, @@ -95,7 +95,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event) struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene = CTX_data_scene(C); SpaceSeq *sseq = (SpaceSeq *)CTX_wm_space_data(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); ImBuf *ibuf = sequencer_ibuf_get(bmain, depsgraph, scene, sseq, CFRA, 0, NULL); ImageSampleInfo *info = op->customdata; float fx, fy; @@ -106,7 +106,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event) return; } - UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fx, &fy); + UI_view2d_region_to_view(®ion->v2d, event->mval[0], event->mval[1], &fx, &fy); fx /= scene->r.xasp / scene->r.yasp; @@ -184,7 +184,7 @@ static void sample_exit(bContext *C, wmOperator *op) static int sample_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceSeq *sseq = CTX_wm_space_seq(C); ImageSampleInfo *info; @@ -193,9 +193,9 @@ static int sample_invoke(bContext *C, wmOperator *op, const wmEvent *event) } info = MEM_callocN(sizeof(ImageSampleInfo), "ImageSampleInfo"); - info->art = ar->type; + info->art = region->type; info->draw_handle = ED_region_draw_cb_activate( - ar->type, sample_draw, info, REGION_DRAW_POST_PIXEL); + region->type, sample_draw, info, REGION_DRAW_POST_PIXEL); op->customdata = info; sample_apply(C, op, event); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index d225c70b56b..8a934a28690 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -72,22 +72,22 @@ static void sequencer_scopes_tag_refresh(ScrArea *sa) static ARegion *sequencer_find_region(ScrArea *sa, short type) { - ARegion *ar = NULL; + ARegion *region = NULL; - for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->regiontype == type) { - return ar; + for (region = sa->regionbase.first; region; region = region->next) { + if (region->regiontype == type) { + return region; } } - return ar; + return region; } /* ******************** default callbacks for sequencer space ***************** */ static SpaceLink *sequencer_new(const ScrArea *UNUSED(sa), const Scene *scene) { - ARegion *ar; + ARegion *region; SpaceSeq *sseq; sseq = MEM_callocN(sizeof(SpaceSeq), "initsequencer"); @@ -98,88 +98,88 @@ static SpaceLink *sequencer_new(const ScrArea *UNUSED(sa), const Scene *scene) sseq->flag = SEQ_SHOW_GPENCIL | SEQ_USE_ALPHA | SEQ_SHOW_MARKERS; /* tool header */ - ar = MEM_callocN(sizeof(ARegion), "tool header for sequencer"); + region = MEM_callocN(sizeof(ARegion), "tool header for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_TOOL_HEADER; - ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; - ar->flag = RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER; + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_TOOL_HEADER; + region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + region->flag = RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER; /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for sequencer"); + region = MEM_callocN(sizeof(ARegion), "header for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_HEADER; + region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; /* buttons/list view */ - ar = MEM_callocN(sizeof(ARegion), "buttons for sequencer"); + region = MEM_callocN(sizeof(ARegion), "buttons for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_UI; - ar->alignment = RGN_ALIGN_RIGHT; - ar->flag = RGN_FLAG_HIDDEN; + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_UI; + region->alignment = RGN_ALIGN_RIGHT; + region->flag = RGN_FLAG_HIDDEN; /* toolbar */ - ar = MEM_callocN(sizeof(ARegion), "tools for sequencer"); + region = MEM_callocN(sizeof(ARegion), "tools for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_TOOLS; - ar->alignment = RGN_ALIGN_LEFT; - ar->flag = RGN_FLAG_HIDDEN; + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_TOOLS; + region->alignment = RGN_ALIGN_LEFT; + region->flag = RGN_FLAG_HIDDEN; /* preview region */ /* NOTE: if you change values here, also change them in sequencer_init_preview_region */ - ar = MEM_callocN(sizeof(ARegion), "preview region for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_PREVIEW; - ar->alignment = RGN_ALIGN_TOP; - ar->flag |= RGN_FLAG_HIDDEN; + region = MEM_callocN(sizeof(ARegion), "preview region for sequencer"); + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_PREVIEW; + region->alignment = RGN_ALIGN_TOP; + region->flag |= RGN_FLAG_HIDDEN; /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */ - ar->v2d.keepzoom = V2D_KEEPASPECT | V2D_KEEPZOOM | V2D_LIMITZOOM; - ar->v2d.minzoom = 0.001f; - ar->v2d.maxzoom = 1000.0f; - ar->v2d.tot.xmin = -960.0f; /* 1920 width centered */ - ar->v2d.tot.ymin = -540.0f; /* 1080 height centered */ - ar->v2d.tot.xmax = 960.0f; - ar->v2d.tot.ymax = 540.0f; - ar->v2d.min[0] = 0.0f; - ar->v2d.min[1] = 0.0f; - ar->v2d.max[0] = 12000.0f; - ar->v2d.max[1] = 12000.0f; - ar->v2d.cur = ar->v2d.tot; - ar->v2d.align = V2D_ALIGN_FREE; - ar->v2d.keeptot = V2D_KEEPTOT_FREE; + region->v2d.keepzoom = V2D_KEEPASPECT | V2D_KEEPZOOM | V2D_LIMITZOOM; + region->v2d.minzoom = 0.001f; + region->v2d.maxzoom = 1000.0f; + region->v2d.tot.xmin = -960.0f; /* 1920 width centered */ + region->v2d.tot.ymin = -540.0f; /* 1080 height centered */ + region->v2d.tot.xmax = 960.0f; + region->v2d.tot.ymax = 540.0f; + region->v2d.min[0] = 0.0f; + region->v2d.min[1] = 0.0f; + region->v2d.max[0] = 12000.0f; + region->v2d.max[1] = 12000.0f; + region->v2d.cur = region->v2d.tot; + region->v2d.align = V2D_ALIGN_FREE; + region->v2d.keeptot = V2D_KEEPTOT_FREE; /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for sequencer"); + region = MEM_callocN(sizeof(ARegion), "main region for sequencer"); - BLI_addtail(&sseq->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&sseq->regionbase, region); + region->regiontype = RGN_TYPE_WINDOW; /* seq space goes from (0,8) to (0, efra) */ - ar->v2d.tot.xmin = 0.0f; - ar->v2d.tot.ymin = 0.0f; - ar->v2d.tot.xmax = scene->r.efra; - ar->v2d.tot.ymax = 8.0f; + region->v2d.tot.xmin = 0.0f; + region->v2d.tot.ymin = 0.0f; + region->v2d.tot.xmax = scene->r.efra; + region->v2d.tot.ymax = 8.0f; - ar->v2d.cur = ar->v2d.tot; + region->v2d.cur = region->v2d.tot; - ar->v2d.min[0] = 10.0f; - ar->v2d.min[1] = 0.5f; + region->v2d.min[0] = 10.0f; + region->v2d.min[1] = 0.5f; - ar->v2d.max[0] = MAXFRAMEF; - ar->v2d.max[1] = MAXSEQ; + region->v2d.max[0] = MAXFRAMEF; + region->v2d.max[1] = MAXSEQ; - ar->v2d.minzoom = 0.01f; - ar->v2d.maxzoom = 100.0f; + region->v2d.minzoom = 0.01f; + region->v2d.maxzoom = 100.0f; - ar->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES); - ar->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HANDLES); - ar->v2d.keepzoom = 0; - ar->v2d.keeptot = 0; - ar->v2d.align = V2D_ALIGN_NO_NEG_Y; + region->v2d.scroll |= (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES); + region->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HANDLES); + region->v2d.keepzoom = 0; + region->v2d.keeptot = 0; + region->v2d.align = V2D_ALIGN_NO_NEG_Y; return (SpaceLink *)sseq; } @@ -365,13 +365,13 @@ static bool image_drop_poll(bContext *C, const wmEvent *event, const char **UNUSED(tooltip)) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); int hand; if (drag->type == WM_DRAG_PATH) { if (ELEM(drag->icon, ICON_FILE_IMAGE, ICON_FILE_BLANK)) { /* rule might not work? */ - if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL) { + if (find_nearest_seq(scene, ®ion->v2d, &hand, event->mval) == NULL) { return 1; } } @@ -385,13 +385,13 @@ static bool movie_drop_poll(bContext *C, const wmEvent *event, const char **UNUSED(tooltip)) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); int hand; if (drag->type == WM_DRAG_PATH) { if (ELEM(drag->icon, 0, ICON_FILE_MOVIE, ICON_FILE_BLANK)) { /* rule might not work? */ - if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL) { + if (find_nearest_seq(scene, ®ion->v2d, &hand, event->mval) == NULL) { return 1; } } @@ -404,13 +404,13 @@ static bool sound_drop_poll(bContext *C, const wmEvent *event, const char **UNUSED(tooltip)) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); int hand; if (drag->type == WM_DRAG_PATH) { if (ELEM(drag->icon, ICON_FILE_SOUND, ICON_FILE_BLANK)) { /* rule might not work? */ - if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL) { + if (find_nearest_seq(scene, ®ion->v2d, &hand, event->mval) == NULL) { return 1; } } @@ -490,40 +490,40 @@ static void sequencer_gizmos(void) /* *********************** sequencer (main) region ************************ */ /* add handlers, stuff you only do once or on area/region changes */ -static void sequencer_main_region_init(wmWindowManager *wm, ARegion *ar) +static void sequencer_main_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; ListBase *lb; - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); + UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); #if 0 keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); #endif keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "Sequencer", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* add drop boxes */ lb = WM_dropboxmap_find("Sequencer", SPACE_SEQ, RGN_TYPE_WINDOW); - WM_event_add_dropbox_handler(&ar->handlers, lb); + WM_event_add_dropbox_handler(®ion->handlers, lb); } -static void sequencer_main_region_draw(const bContext *C, ARegion *ar) +static void sequencer_main_region_draw(const bContext *C, ARegion *region) { /* NLE - strip editing timeline interface */ - draw_timeline_seq(C, ar); + draw_timeline_seq(C, region); } static void sequencer_main_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *ar, + ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) { @@ -537,30 +537,30 @@ static void sequencer_main_region_listener(wmWindow *UNUSED(win), case ND_RENDER_OPTIONS: /* for FPS and FPS Base */ case ND_SEQUENCER: case ND_RENDER_RESULT: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_ANIMATION: switch (wmn->data) { case ND_KEYFRAME: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_SPACE: if (wmn->data == ND_SPACE_SEQUENCER) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_ID: if (wmn->action == NA_RENAME) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_SCREEN: if (ELEM(wmn->data, ND_ANIMPLAY)) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; } @@ -571,12 +571,12 @@ static void sequencer_main_region_message_subscribe(const struct bContext *UNUSE struct Scene *scene, struct bScreen *UNUSED(screen), struct ScrArea *UNUSED(sa), - struct ARegion *ar, + struct ARegion *region, struct wmMsgBus *mbus) { wmMsgSubscribeValue msg_sub_value_region_tag_redraw = { - .owner = ar, - .user_data = ar, + .owner = region, + .user_data = region, .notify = ED_region_do_msg_notify_tag_redraw, }; @@ -626,54 +626,54 @@ static void sequencer_main_region_message_subscribe(const struct bContext *UNUSE /* *********************** header region ************************ */ /* add handlers, stuff you only do once or on area/region changes */ -static void sequencer_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) +static void sequencer_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) { - ED_region_header_init(ar); + ED_region_header_init(region); } -static void sequencer_header_region_draw(const bContext *C, ARegion *ar) +static void sequencer_header_region_draw(const bContext *C, ARegion *region) { - ED_region_header(C, ar); + ED_region_header(C, region); } /* *********************** toolbar region ************************ */ /* add handlers, stuff you only do once or on area/region changes */ -static void sequencer_tools_region_init(wmWindowManager *wm, ARegion *ar) +static void sequencer_tools_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; - ED_region_panels_init(wm, ar); + region->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ED_region_panels_init(wm, region); keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void sequencer_tools_region_draw(const bContext *C, ARegion *ar) +static void sequencer_tools_region_draw(const bContext *C, ARegion *region) { - ED_region_panels(C, ar); + ED_region_panels(C, region); } /* *********************** preview region ************************ */ -static void sequencer_preview_region_init(wmWindowManager *wm, ARegion *ar) +static void sequencer_preview_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); + UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); #if 0 keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); #endif keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "SequencerPreview", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void sequencer_preview_region_draw(const bContext *C, ARegion *ar) +static void sequencer_preview_region_draw(const bContext *C, ARegion *region) { ScrArea *sa = CTX_wm_area(C); SpaceSeq *sseq = sa->spacedata.first; @@ -688,7 +688,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar) } if (!show_split || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) { - sequencer_draw_preview(C, scene, ar, sseq, scene->r.cfra, 0, false, false); + sequencer_draw_preview(C, scene, region, sseq, scene->r.cfra, 0, false, false); } if (show_split && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { @@ -703,14 +703,14 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar) if (over_cfra != scene->r.cfra || sseq->overlay_type != SEQ_DRAW_OVERLAY_RECT) { sequencer_draw_preview( - C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra, true, false); + C, scene, region, sseq, scene->r.cfra, over_cfra - scene->r.cfra, true, false); } } - WM_gizmomap_draw(ar->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D); + WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D); if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_no_scrub(wm)) { - const rcti *rect = ED_region_visible_rect(ar); + const rcti *rect = ED_region_visible_rect(region); int xoffset = rect->xmin + U.widget_unit; int yoffset = rect->ymax; ED_scene_draw_fps(scene, xoffset, &yoffset); @@ -719,7 +719,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar) static void sequencer_preview_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *ar, + ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) { @@ -727,7 +727,7 @@ static void sequencer_preview_region_listener(wmWindow *UNUSED(win), switch (wmn->category) { case NC_GPENCIL: if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_SCENE: @@ -737,32 +737,32 @@ static void sequencer_preview_region_listener(wmWindow *UNUSED(win), case ND_SEQUENCER: case ND_RENDER_OPTIONS: case ND_DRAW_RENDER_VIEWPORT: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_ANIMATION: switch (wmn->data) { case ND_KEYFRAME: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_SPACE: if (wmn->data == ND_SPACE_SEQUENCER) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_ID: switch (wmn->data) { case NA_RENAME: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_MASK: if (wmn->action == NA_EDITED) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; } @@ -771,25 +771,25 @@ static void sequencer_preview_region_listener(wmWindow *UNUSED(win), /* *********************** buttons region ************************ */ /* add handlers, stuff you only do once or on area/region changes */ -static void sequencer_buttons_region_init(wmWindowManager *wm, ARegion *ar) +static void sequencer_buttons_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - UI_panel_category_active_set_default(ar, "Strip"); - ED_region_panels_init(wm, ar); + UI_panel_category_active_set_default(region, "Strip"); + ED_region_panels_init(wm, region); } -static void sequencer_buttons_region_draw(const bContext *C, ARegion *ar) +static void sequencer_buttons_region_draw(const bContext *C, ARegion *region) { - ED_region_panels(C, ar); + ED_region_panels(C, region); } static void sequencer_buttons_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *ar, + ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) { @@ -797,25 +797,25 @@ static void sequencer_buttons_region_listener(wmWindow *UNUSED(win), switch (wmn->category) { case NC_GPENCIL: if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_SCENE: switch (wmn->data) { case ND_FRAME: case ND_SEQUENCER: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; case NC_SPACE: if (wmn->data == ND_SPACE_SEQUENCER) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; case NC_ID: if (wmn->action == NA_RENAME) { - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } break; } -- cgit v1.2.3