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. --- source/blender/editors/space_file/file_draw.c | 25 ++-- source/blender/editors/space_file/file_intern.h | 8 +- source/blender/editors/space_file/file_ops.c | 124 +++++++++--------- source/blender/editors/space_file/file_utils.c | 4 +- source/blender/editors/space_file/filesel.c | 14 +- source/blender/editors/space_file/space_file.c | 162 ++++++++++++------------ 6 files changed, 170 insertions(+), 167 deletions(-) (limited to 'source/blender/editors/space_file') diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index db29d058e49..10c56901eca 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -201,12 +201,12 @@ static void file_draw_string(int sx, }); } -void file_calc_previews(const bContext *C, ARegion *ar) +void file_calc_previews(const bContext *C, ARegion *region) { SpaceFile *sfile = CTX_wm_space_file(C); - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; - ED_fileselect_init_layout(sfile, ar); + ED_fileselect_init_layout(sfile, region); UI_view2d_totRect_set(v2d, sfile->layout->width, sfile->layout->height); } @@ -384,7 +384,7 @@ static void renamebutton_cb(bContext *C, void *UNUSED(arg1), char *oldname) wmWindowManager *wm = CTX_wm_manager(C); SpaceFile *sfile = (SpaceFile *)CTX_wm_space_data(C); ScrArea *sa = CTX_wm_area(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); const char *blendfile_path = BKE_main_blendfile_path(bmain); BLI_make_file_string(blendfile_path, orgname, sfile->params->dir, oldname); @@ -415,7 +415,7 @@ static void renamebutton_cb(bContext *C, void *UNUSED(arg1), char *oldname) ED_fileselect_clear(wm, sa, sfile); } - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } } @@ -669,17 +669,17 @@ static void draw_details_columns(const FileSelectParams *params, } } -void file_draw_list(const bContext *C, ARegion *ar) +void file_draw_list(const bContext *C, ARegion *region) { SpaceFile *sfile = CTX_wm_space_file(C); FileSelectParams *params = ED_fileselect_get_params(sfile); - FileLayout *layout = ED_fileselect_get_layout(sfile, ar); - View2D *v2d = &ar->v2d; + FileLayout *layout = ED_fileselect_get_layout(sfile, region); + View2D *v2d = ®ion->v2d; struct FileList *files = sfile->files; struct FileDirEntry *file; const char *root = filelist_dir(files); ImBuf *imb; - uiBlock *block = UI_block_begin(C, ar, __func__, UI_EMBOSS); + uiBlock *block = UI_block_begin(C, region, __func__, UI_EMBOSS); int numfiles; int numfiles_layout; int sx, sy; @@ -700,12 +700,13 @@ void file_draw_list(const bContext *C, ARegion *ar) draw_dividers(layout, v2d); } - offset = ED_fileselect_layout_offset(layout, (int)ar->v2d.cur.xmin, (int)-ar->v2d.cur.ymax); + offset = ED_fileselect_layout_offset( + layout, (int)region->v2d.cur.xmin, (int)-region->v2d.cur.ymax); if (offset < 0) { offset = 0; } - numfiles_layout = ED_fileselect_layout_numfiles(layout, ar); + numfiles_layout = ED_fileselect_layout_numfiles(layout, region); /* adjust, so the next row is already drawn when scrolling */ if (layout->flag & FILE_LAYOUT_HOR) { @@ -851,7 +852,7 @@ void file_draw_list(const bContext *C, ARegion *ar) UI_but_func_rename_set(but, renamebutton_cb, file); UI_but_flag_enable(but, UI_BUT_NO_UTF8); /* allow non utf8 names */ UI_but_flag_disable(but, UI_BUT_UNDO); - if (false == UI_but_active_only(C, ar, block, but)) { + if (false == UI_but_active_only(C, region, block, but)) { file_selflag = filelist_entry_select_set( sfile->files, file, FILE_SEL_REMOVE, FILE_SEL_EDITING, CHECK_ALL); } diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 2ded69aef2f..6ef35132087 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -37,8 +37,8 @@ struct View2D; #define SMALL_SIZE_CHECK(_size) ((_size) < 64) /* Related to FileSelectParams.thumbnail_size. */ -void file_calc_previews(const bContext *C, ARegion *ar); -void file_draw_list(const bContext *C, ARegion *ar); +void file_calc_previews(const bContext *C, ARegion *region); +void file_draw_list(const bContext *C, ARegion *region); void file_draw_check(bContext *C); void file_draw_check_cb(bContext *C, void *arg1, void *arg2); @@ -86,7 +86,7 @@ int file_delete_exec(bContext *C, struct wmOperator *unused); void file_directory_enter_handle(bContext *C, void *arg_unused, void *arg_but); void file_filename_enter_handle(bContext *C, void *arg_unused, void *arg_but); -int file_highlight_set(struct SpaceFile *sfile, struct ARegion *ar, int mx, int my); +int file_highlight_set(struct SpaceFile *sfile, struct ARegion *region, int mx, int my); void file_sfile_filepath_set(struct SpaceFile *sfile, const char *filepath); void file_sfile_to_operator_ex(bContext *C, @@ -123,6 +123,6 @@ void file_tool_props_region_panels_register(struct ARegionType *art); void file_execute_region_panels_register(struct ARegionType *art); /* file_utils.c */ -void file_tile_boundbox(const ARegion *ar, FileLayout *layout, const int file, rcti *r_bounds); +void file_tile_boundbox(const ARegion *region, FileLayout *layout, const int file, rcti *r_bounds); #endif /* __FILE_INTERN_H__ */ diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index e065c146962..e03d15d9f34 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -69,11 +69,13 @@ #include /* ---------- FILE SELECTION ------------ */ -static FileSelection find_file_mouse_rect(SpaceFile *sfile, ARegion *ar, const rcti *rect_region) +static FileSelection find_file_mouse_rect(SpaceFile *sfile, + ARegion *region, + const rcti *rect_region) { FileSelection sel; - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; rcti rect_view; rctf rect_view_fl; rctf rect_region_fl; @@ -141,12 +143,12 @@ static void clamp_to_filelist(int numfiles, FileSelection *sel) static FileSelection file_selection_get(bContext *C, const rcti *rect, bool fill) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); int numfiles = filelist_files_ensure(sfile->files); FileSelection sel; - sel = find_file_mouse_rect(sfile, ar, rect); + sel = find_file_mouse_rect(sfile, region, rect); if (!((sel.first == -1) && (sel.last == -1))) { clamp_to_filelist(numfiles, &sel); } @@ -253,34 +255,34 @@ static bool file_is_any_selected(struct FileList *files) /** * If \a file is outside viewbounds, this adjusts view to make sure it's inside */ -static void file_ensure_inside_viewbounds(ARegion *ar, SpaceFile *sfile, const int file) +static void file_ensure_inside_viewbounds(ARegion *region, SpaceFile *sfile, const int file) { - FileLayout *layout = ED_fileselect_get_layout(sfile, ar); - rctf *cur = &ar->v2d.cur; + FileLayout *layout = ED_fileselect_get_layout(sfile, region); + rctf *cur = ®ion->v2d.cur; rcti rect; bool changed = true; - file_tile_boundbox(ar, layout, file, &rect); + file_tile_boundbox(region, layout, file, &rect); /* down - also use if tile is higher than viewbounds so view is aligned to file name */ - if (cur->ymin > rect.ymin || layout->tile_h > ar->winy) { + if (cur->ymin > rect.ymin || layout->tile_h > region->winy) { cur->ymin = rect.ymin - (2 * layout->tile_border_y); - cur->ymax = cur->ymin + ar->winy; + cur->ymax = cur->ymin + region->winy; } /* up */ else if ((cur->ymax - layout->offset_top) < rect.ymax) { cur->ymax = rect.ymax + layout->tile_border_y + layout->offset_top; - cur->ymin = cur->ymax - ar->winy; + cur->ymin = cur->ymax - region->winy; } /* left - also use if tile is wider than viewbounds so view is aligned to file name */ - else if (cur->xmin > rect.xmin || layout->tile_w > ar->winx) { + else if (cur->xmin > rect.xmin || layout->tile_w > region->winx) { cur->xmin = rect.xmin - layout->tile_border_x; - cur->xmax = cur->xmin + ar->winx; + cur->xmax = cur->xmin + region->winx; } /* right */ else if (cur->xmax < rect.xmax) { cur->xmax = rect.xmax + (2 * layout->tile_border_x); - cur->xmin = cur->xmax - ar->winx; + cur->xmin = cur->xmax - region->winx; } else { BLI_assert(cur->xmin <= rect.xmin && cur->xmax >= rect.xmax && cur->ymin <= rect.ymin && @@ -289,7 +291,7 @@ static void file_ensure_inside_viewbounds(ARegion *ar, SpaceFile *sfile, const i } if (changed) { - UI_view2d_curRect_validate(&ar->v2d); + UI_view2d_curRect_validate(®ion->v2d); } } @@ -323,16 +325,16 @@ static FileSelect file_select( sfile->params->active_file = -1; } else if (sel.last >= 0) { - ARegion *ar = CTX_wm_region(C); - const FileLayout *layout = ED_fileselect_get_layout(sfile, ar); + ARegion *region = CTX_wm_region(C); + const FileLayout *layout = ED_fileselect_get_layout(sfile, region); /* Adjust view to display selection. Doing iterations for first and last * selected item makes view showing as much of the selection possible. * Not really useful if tiles are (almost) bigger than viewbounds though. */ - if (((layout->flag & FILE_LAYOUT_HOR) && ar->winx > (1.2f * layout->tile_w)) || - ((layout->flag & FILE_LAYOUT_VER) && ar->winy > (2.0f * layout->tile_h))) { - file_ensure_inside_viewbounds(ar, sfile, sel.last); - file_ensure_inside_viewbounds(ar, sfile, sel.first); + if (((layout->flag & FILE_LAYOUT_HOR) && region->winx > (1.2f * layout->tile_w)) || + ((layout->flag & FILE_LAYOUT_VER) && region->winy > (2.0f * layout->tile_h))) { + file_ensure_inside_viewbounds(region, sfile, sel.last); + file_ensure_inside_viewbounds(region, sfile, sel.first); } } @@ -343,19 +345,19 @@ static FileSelect file_select( } static int file_box_select_find_last_selected(SpaceFile *sfile, - ARegion *ar, + ARegion *region, const FileSelection *sel, const int mouse_xy[2]) { - FileLayout *layout = ED_fileselect_get_layout(sfile, ar); + FileLayout *layout = ED_fileselect_get_layout(sfile, region); rcti bounds_first, bounds_last; int dist_first, dist_last; float mouseco_view[2]; - UI_view2d_region_to_view(&ar->v2d, UNPACK2(mouse_xy), &mouseco_view[0], &mouseco_view[1]); + UI_view2d_region_to_view(®ion->v2d, UNPACK2(mouse_xy), &mouseco_view[0], &mouseco_view[1]); - file_tile_boundbox(ar, layout, sel->first, &bounds_first); - file_tile_boundbox(ar, layout, sel->last, &bounds_last); + file_tile_boundbox(region, layout, sel->first, &bounds_first); + file_tile_boundbox(region, layout, sel->last, &bounds_last); /* are first and last in the same column (horizontal layout)/row (vertical layout)? */ if ((layout->flag & FILE_LAYOUT_HOR && bounds_first.xmin == bounds_last.xmin) || @@ -377,7 +379,7 @@ static int file_box_select_find_last_selected(SpaceFile *sfile, static int file_box_select_modal(bContext *C, wmOperator *op, const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); FileSelectParams *params = ED_fileselect_get_params(sfile); FileSelection sel; @@ -390,7 +392,7 @@ static int file_box_select_modal(bContext *C, wmOperator *op, const wmEvent *eve if (result == OPERATOR_RUNNING_MODAL) { WM_operator_properties_border_to_rcti(op, &rect); - ED_fileselect_layout_isect_rect(sfile->layout, &ar->v2d, &rect, &rect); + ED_fileselect_layout_isect_rect(sfile->layout, ®ion->v2d, &rect, &rect); sel = file_selection_get(C, &rect, 0); if ((sel.first != params->sel_first) || (sel.last != params->sel_last)) { @@ -418,7 +420,7 @@ static int file_box_select_modal(bContext *C, wmOperator *op, const wmEvent *eve } params->sel_first = sel.first; params->sel_last = sel.last; - params->active_file = file_box_select_find_last_selected(sfile, ar, &sel, event->mval); + params->active_file = file_box_select_find_last_selected(sfile, region, &sel, event->mval); } else { params->highlight_file = -1; @@ -433,7 +435,7 @@ static int file_box_select_modal(bContext *C, wmOperator *op, const wmEvent *eve static int file_box_select_exec(bContext *C, wmOperator *op) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); rcti rect; FileSelect ret; @@ -446,7 +448,7 @@ static int file_box_select_exec(bContext *C, wmOperator *op) file_deselect_all(sfile, FILE_SEL_SELECTED); } - ED_fileselect_layout_isect_rect(sfile->layout, &ar->v2d, &rect, &rect); + ED_fileselect_layout_isect_rect(sfile->layout, ®ion->v2d, &rect, &rect); ret = file_select(C, &rect, select ? FILE_SEL_ADD : FILE_SEL_REMOVE, false, false); @@ -484,7 +486,7 @@ void FILE_OT_select_box(wmOperatorType *ot) static int file_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); FileSelect ret; rcti rect; @@ -493,14 +495,14 @@ static int file_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) const bool do_diropen = RNA_boolean_get(op->ptr, "open"); const bool deselect_all = RNA_boolean_get(op->ptr, "deselect_all"); - if (ar->regiontype != RGN_TYPE_WINDOW) { + if (region->regiontype != RGN_TYPE_WINDOW) { return OPERATOR_CANCELLED; } rect.xmin = rect.xmax = event->mval[0]; rect.ymin = rect.ymax = event->mval[1]; - if (!ED_fileselect_layout_is_inside_pt(sfile->layout, &ar->v2d, rect.xmin, rect.ymin)) { + if (!ED_fileselect_layout_is_inside_pt(sfile->layout, ®ion->v2d, rect.xmin, rect.ymin)) { return OPERATOR_CANCELLED; } @@ -579,7 +581,7 @@ void FILE_OT_select(wmOperatorType *ot) * \returns true if selection has changed */ static bool file_walk_select_selection_set(wmWindow *win, - ARegion *ar, + ARegion *region, SpaceFile *sfile, const int direction, const int numfiles, @@ -687,7 +689,7 @@ static bool file_walk_select_selection_set(wmWindow *win, fileselect_file_set(sfile, params->active_file); /* ensure newly selected file is inside viewbounds */ - file_ensure_inside_viewbounds(ar, sfile, params->active_file); + file_ensure_inside_viewbounds(region, sfile, params->active_file); /* selection changed */ return true; @@ -704,7 +706,7 @@ static bool file_walk_select_do(bContext *C, const bool fill) { wmWindow *win = CTX_wm_window(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); struct FileList *files = sfile->files; const int numfiles = filelist_files_ensure(files); const bool has_selection = file_is_any_selected(files); @@ -720,7 +722,7 @@ static bool file_walk_select_do(bContext *C, } if (has_selection) { - FileLayout *layout = ED_fileselect_get_layout(sfile, ar); + FileLayout *layout = ED_fileselect_get_layout(sfile, region); const int idx_shift = (layout->flag & FILE_LAYOUT_HOR) ? layout->rows : layout->flow_columns; if ((layout->flag & FILE_LAYOUT_HOR && direction == UI_SELECT_WALK_UP) || @@ -766,7 +768,7 @@ static bool file_walk_select_do(bContext *C, } return file_walk_select_selection_set(win, - ar, + region, sfile, direction, numfiles, @@ -1186,9 +1188,9 @@ void FILE_OT_reset_recent(wmOperatorType *ot) ot->poll = ED_operator_file_active; } -int file_highlight_set(SpaceFile *sfile, ARegion *ar, int mx, int my) +int file_highlight_set(SpaceFile *sfile, ARegion *region, int mx, int my) { - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; FileSelectParams *params; int numfiles, origfile; @@ -1201,8 +1203,8 @@ int file_highlight_set(SpaceFile *sfile, ARegion *ar, int mx, int my) origfile = params->highlight_file; - mx -= ar->winrct.xmin; - my -= ar->winrct.ymin; + mx -= region->winrct.xmin; + my -= region->winrct.ymin; if (ED_fileselect_layout_is_inside_pt(sfile->layout, v2d, mx, my)) { float fx, fy; @@ -1229,10 +1231,10 @@ int file_highlight_set(SpaceFile *sfile, ARegion *ar, int mx, int my) static int file_highlight_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); - if (!file_highlight_set(sfile, ar, event->x, event->y)) { + if (!file_highlight_set(sfile, region, event->x, event->y)) { return OPERATOR_PASS_THROUGH; } @@ -1257,13 +1259,13 @@ static int file_column_sort_ui_context_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { - const ARegion *ar = CTX_wm_region(C); + const ARegion *region = CTX_wm_region(C); SpaceFile *sfile = CTX_wm_space_file(C); if (file_attribute_column_header_is_inside( - &ar->v2d, sfile->layout, event->mval[0], event->mval[1])) { + ®ion->v2d, sfile->layout, event->mval[0], event->mval[1])) { const FileAttributeColumnType column_type = file_attribute_column_type_find_isect( - &ar->v2d, sfile->params, sfile->layout, event->mval[0]); + ®ion->v2d, sfile->params, sfile->layout, event->mval[0]); if (column_type != COLUMN_NONE) { const FileAttributeColumn *column = &sfile->layout->attribute_columns[column_type]; @@ -1725,7 +1727,7 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w { ScrArea *sa = CTX_wm_area(C); SpaceFile *sfile = CTX_wm_space_file(C); - ARegion *ar, *ar_ctx = CTX_wm_region(C); + ARegion *region, *ar_ctx = CTX_wm_region(C); const bool is_horizontal = (sfile->layout->flag & FILE_LAYOUT_HOR) != 0; int i; @@ -1767,8 +1769,8 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w } /* we need the correct area for scrolling */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if (!ar || ar->regiontype != RGN_TYPE_WINDOW) { + region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + if (!region || region->regiontype != RGN_TYPE_WINDOW) { WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), sfile->smoothscroll_timer); sfile->smoothscroll_timer = NULL; return OPERATOR_PASS_THROUGH; @@ -1784,9 +1786,9 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w sfile->scroll_offset = (edit_idx / items_block_size) * items_block_size; } - const int numfiles_layout = ED_fileselect_layout_numfiles(sfile->layout, ar); + const int numfiles_layout = ED_fileselect_layout_numfiles(sfile->layout, region); const int first_visible_item = ED_fileselect_layout_offset( - sfile->layout, (int)ar->v2d.cur.xmin, (int)-ar->v2d.cur.ymax); + sfile->layout, (int)region->v2d.cur.xmin, (int)-region->v2d.cur.ymax); const int last_visible_item = first_visible_item + numfiles_layout + 1; /* Note: the special case for vertical layout is because filename is at the bottom of items then, @@ -1803,10 +1805,10 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w * beginning/end of the view. */ /* Note that there is a weird glitch, that sometimes tot rctf is smaller than cur rctf... * that is why we still need to keep the min/max_middle_offset checks too. :( */ - const float min_tot_scroll = is_horizontal ? ar->v2d.tot.xmin : -ar->v2d.tot.ymax; - const float max_tot_scroll = is_horizontal ? ar->v2d.tot.xmax : -ar->v2d.tot.ymin; - const float min_curr_scroll = is_horizontal ? ar->v2d.cur.xmin : -ar->v2d.cur.ymax; - const float max_curr_scroll = is_horizontal ? ar->v2d.cur.xmax : -ar->v2d.cur.ymin; + const float min_tot_scroll = is_horizontal ? region->v2d.tot.xmin : -region->v2d.tot.ymax; + const float max_tot_scroll = is_horizontal ? region->v2d.tot.xmax : -region->v2d.tot.ymin; + const float min_curr_scroll = is_horizontal ? region->v2d.cur.xmin : -region->v2d.cur.ymax; + const float max_curr_scroll = is_horizontal ? region->v2d.cur.xmax : -region->v2d.cur.ymin; /* Check if we have reached our final scroll position. */ /* Filelist has to be ready, otherwise it makes no sense to stop scrolling yet. */ @@ -1840,7 +1842,7 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w /* Temporarily set context to the main window region, * so that the pan operator works. */ - CTX_wm_region_set(C, ar); + CTX_wm_region_set(C, region); /* scroll one step in the desired direction */ PointerRNA op_ptr; @@ -1886,7 +1888,7 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), const w WM_operator_name_call(C, "VIEW2D_OT_pan", WM_OP_EXEC_DEFAULT, &op_ptr); WM_operator_properties_free(&op_ptr); - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); /* and restore context */ CTX_wm_region_set(C, ar_ctx); @@ -2535,10 +2537,10 @@ void FILE_OT_delete(struct wmOperatorType *ot) static int file_start_filter_exec(bContext *C, wmOperator *UNUSED(op)) { ScrArea *sa = CTX_wm_area(C); - ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_UI); + ARegion *region = BKE_area_find_region_type(sa, RGN_TYPE_UI); SpaceFile *sf = CTX_wm_space_file(C); - UI_textbutton_activate_rna(C, ar, sf->params, "filter_search"); + UI_textbutton_activate_rna(C, region, sf->params, "filter_search"); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_file/file_utils.c b/source/blender/editors/space_file/file_utils.c index a432afc4d99..61ddd7d63f2 100644 --- a/source/blender/editors/space_file/file_utils.c +++ b/source/blender/editors/space_file/file_utils.c @@ -32,12 +32,12 @@ #include "file_intern.h" -void file_tile_boundbox(const ARegion *ar, FileLayout *layout, const int file, rcti *r_bounds) +void file_tile_boundbox(const ARegion *region, FileLayout *layout, const int file, rcti *r_bounds) { int xmin, ymax; ED_fileselect_layout_tilepos(layout, file, &xmin, &ymax); - ymax = (int)ar->v2d.tot.ymax - ymax; /* real, view space ymax */ + ymax = (int)region->v2d.tot.ymax - ymax; /* real, view space ymax */ BLI_rcti_init(r_bounds, xmin, xmin + layout->tile_w + layout->tile_border_x, diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 02fb98aa7d7..c0b859122a8 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -413,7 +413,7 @@ void fileselect_file_set(SpaceFile *sfile, const int index) } } -int ED_fileselect_layout_numfiles(FileLayout *layout, ARegion *ar) +int ED_fileselect_layout_numfiles(FileLayout *layout, ARegion *region) { int numfiles; @@ -429,14 +429,14 @@ int ED_fileselect_layout_numfiles(FileLayout *layout, ARegion *ar) */ if (layout->flag & FILE_LAYOUT_HOR) { const int x_item = layout->tile_w + (2 * layout->tile_border_x); - const int x_view = (int)(BLI_rctf_size_x(&ar->v2d.cur)); + const int x_view = (int)(BLI_rctf_size_x(®ion->v2d.cur)); const int x_over = x_item - (x_view % x_item); numfiles = (int)((float)(x_view + x_over) / (float)(x_item)); return numfiles * layout->rows; } else { const int y_item = layout->tile_h + (2 * layout->tile_border_y); - const int y_view = (int)(BLI_rctf_size_y(&ar->v2d.cur)) - layout->offset_top; + const int y_view = (int)(BLI_rctf_size_y(®ion->v2d.cur)) - layout->offset_top; const int y_over = y_item - (y_view % y_item); numfiles = (int)((float)(y_view + y_over) / (float)(y_item)); return numfiles * layout->flow_columns; @@ -720,11 +720,11 @@ static void file_attribute_columns_init(const FileSelectParams *params, FileLayo layout->attribute_columns[COLUMN_SIZE].text_align = UI_STYLE_TEXT_RIGHT; } -void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *ar) +void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *region) { FileSelectParams *params = ED_fileselect_get_params(sfile); FileLayout *layout = NULL; - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; int numfiles; int textheight; @@ -817,10 +817,10 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *ar) layout->dirty = false; } -FileLayout *ED_fileselect_get_layout(struct SpaceFile *sfile, ARegion *ar) +FileLayout *ED_fileselect_get_layout(struct SpaceFile *sfile, ARegion *region) { if (!sfile->layout) { - ED_fileselect_init_layout(sfile, ar); + ED_fileselect_init_layout(sfile, region); } return sfile->layout; } diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 79ccbf6542f..c7dee1c1680 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -57,79 +57,79 @@ static ARegion *file_execute_region_ensure(ScrArea *sa, ARegion *ar_prev) { - ARegion *ar; + ARegion *region; - if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_EXECUTE)) != NULL) { - return ar; + if ((region = BKE_area_find_region_type(sa, RGN_TYPE_EXECUTE)) != NULL) { + return region; } - ar = MEM_callocN(sizeof(ARegion), "execute region for file"); - BLI_insertlinkafter(&sa->regionbase, ar_prev, ar); - ar->regiontype = RGN_TYPE_EXECUTE; - ar->alignment = RGN_ALIGN_BOTTOM; - ar->flag = RGN_FLAG_DYNAMIC_SIZE; + region = MEM_callocN(sizeof(ARegion), "execute region for file"); + BLI_insertlinkafter(&sa->regionbase, ar_prev, region); + region->regiontype = RGN_TYPE_EXECUTE; + region->alignment = RGN_ALIGN_BOTTOM; + region->flag = RGN_FLAG_DYNAMIC_SIZE; - return ar; + return region; } static ARegion *file_tool_props_region_ensure(ScrArea *sa, ARegion *ar_prev) { - ARegion *ar; + ARegion *region; - if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS)) != NULL) { - return ar; + if ((region = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS)) != NULL) { + return region; } /* add subdiv level; after execute region */ - ar = MEM_callocN(sizeof(ARegion), "tool props for file"); - BLI_insertlinkafter(&sa->regionbase, ar_prev, ar); - ar->regiontype = RGN_TYPE_TOOL_PROPS; - ar->alignment = RGN_ALIGN_RIGHT; + region = MEM_callocN(sizeof(ARegion), "tool props for file"); + BLI_insertlinkafter(&sa->regionbase, ar_prev, region); + region->regiontype = RGN_TYPE_TOOL_PROPS; + region->alignment = RGN_ALIGN_RIGHT; - return ar; + return region; } /* ******************** default callbacks for file space ***************** */ static SpaceLink *file_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { - ARegion *ar; + ARegion *region; SpaceFile *sfile; sfile = MEM_callocN(sizeof(SpaceFile), "initfile"); sfile->spacetype = SPACE_FILE; /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for file"); - BLI_addtail(&sfile->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; + region = MEM_callocN(sizeof(ARegion), "header for file"); + BLI_addtail(&sfile->regionbase, region); + region->regiontype = RGN_TYPE_HEADER; /* Ignore user preference "USER_HEADER_BOTTOM" here (always show top for new types). */ - ar->alignment = RGN_ALIGN_TOP; + region->alignment = RGN_ALIGN_TOP; /* Tools region */ - ar = MEM_callocN(sizeof(ARegion), "tools region for file"); - BLI_addtail(&sfile->regionbase, ar); - ar->regiontype = RGN_TYPE_TOOLS; - ar->alignment = RGN_ALIGN_LEFT; + region = MEM_callocN(sizeof(ARegion), "tools region for file"); + BLI_addtail(&sfile->regionbase, region); + region->regiontype = RGN_TYPE_TOOLS; + region->alignment = RGN_ALIGN_LEFT; /* ui list region */ - ar = MEM_callocN(sizeof(ARegion), "ui region for file"); - BLI_addtail(&sfile->regionbase, ar); - ar->regiontype = RGN_TYPE_UI; - ar->alignment = RGN_ALIGN_TOP; - ar->flag |= RGN_FLAG_DYNAMIC_SIZE; + region = MEM_callocN(sizeof(ARegion), "ui region for file"); + BLI_addtail(&sfile->regionbase, region); + region->regiontype = RGN_TYPE_UI; + region->alignment = RGN_ALIGN_TOP; + region->flag |= RGN_FLAG_DYNAMIC_SIZE; /* Tool props and execute region are added as needed, see file_refresh(). */ /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for file"); - BLI_addtail(&sfile->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; - ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM); - ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y); - ar->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT); - ar->v2d.keeptot = V2D_KEEPTOT_STRICT; - ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f; + region = MEM_callocN(sizeof(ARegion), "main region for file"); + BLI_addtail(&sfile->regionbase, region); + region->regiontype = RGN_TYPE_WINDOW; + region->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM); + region->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y); + region->v2d.keepzoom = (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_LIMITZOOM | V2D_KEEPASPECT); + region->v2d.keeptot = V2D_KEEPTOT_STRICT; + region->v2d.minzoom = region->v2d.maxzoom = 1.0f; return (SpaceLink *)sfile; } @@ -369,23 +369,23 @@ static void file_listener(wmWindow *UNUSED(win), } /* add handlers, stuff you only do once or on area/region changes */ -static void file_main_region_init(wmWindowManager *wm, ARegion *ar) +static void file_main_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy); + UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* own keymaps */ keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Main", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } static void file_main_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *ar, + ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) { @@ -394,10 +394,10 @@ static void file_main_region_listener(wmWindow *UNUSED(win), case NC_SPACE: switch (wmn->data) { case ND_SPACE_FILE_LIST: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; case ND_SPACE_FILE_PARAMS: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; @@ -409,7 +409,7 @@ static void file_main_region_message_subscribe(const struct bContext *UNUSED(C), struct Scene *UNUSED(scene), struct bScreen *screen, struct ScrArea *sa, - struct ARegion *ar, + struct ARegion *region, struct wmMsgBus *mbus) { SpaceFile *sfile = sa->spacedata.first; @@ -418,7 +418,7 @@ static void file_main_region_message_subscribe(const struct bContext *UNUSED(C), * keep for now since all subscribers for WM are regions. * May be worth re-visiting later. */ wmMsgSubscribeValue msg_sub_value_area_tag_refresh = { - .owner = ar, + .owner = region, .user_data = sa, .notify = ED_area_do_msg_notify_tag_refresh, }; @@ -442,13 +442,13 @@ static void file_main_region_message_subscribe(const struct bContext *UNUSED(C), } } -static void file_main_region_draw(const bContext *C, ARegion *ar) +static void file_main_region_draw(const bContext *C, ARegion *region) { /* draw entirely, view changes should be handled here */ SpaceFile *sfile = CTX_wm_space_file(C); FileSelectParams *params = ED_fileselect_get_params(sfile); - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; View2DScrollers *scrollers; float col[3]; @@ -487,10 +487,10 @@ static void file_main_region_draw(const bContext *C, ARegion *ar) } } /* v2d has initialized flag, so this call will only set the mask correct */ - UI_view2d_region_reinit(v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy); + UI_view2d_region_reinit(v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* sets tile/border settings in sfile */ - file_calc_previews(C, ar); + file_calc_previews(C, region); /* set view */ UI_view2d_view_ortho(v2d); @@ -498,10 +498,10 @@ static void file_main_region_draw(const bContext *C, ARegion *ar) /* on first read, find active file */ if (params->highlight_file == -1) { wmEvent *event = CTX_wm_window(C)->eventstate; - file_highlight_set(sfile, ar, event->x, event->y); + file_highlight_set(sfile, region, event->x, event->y); } - file_draw_list(C, ar); + file_draw_list(C, region); /* reset view matrix */ UI_view2d_view_restore(C); @@ -557,26 +557,26 @@ static void file_keymap(struct wmKeyConfig *keyconf) WM_keymap_ensure(keyconf, "File Browser Buttons", SPACE_FILE, 0); } -static void file_tools_region_init(wmWindowManager *wm, ARegion *ar) +static void file_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); /* own keymaps */ keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void file_tools_region_draw(const bContext *C, ARegion *ar) +static void file_tools_region_draw(const bContext *C, ARegion *region) { - ED_region_panels(C, ar); + ED_region_panels(C, region); } static void file_tools_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *UNUSED(ar), + ARegion *UNUSED(region), wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene)) { @@ -589,62 +589,62 @@ static void file_tools_region_listener(wmWindow *UNUSED(win), } /* add handlers, stuff you only do once or on area/region changes */ -static void file_header_region_init(wmWindowManager *wm, ARegion *ar) +static void file_header_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - ED_region_header_init(ar); + ED_region_header_init(region); keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void file_header_region_draw(const bContext *C, ARegion *ar) +static void file_header_region_draw(const bContext *C, ARegion *region) { - ED_region_header(C, ar); + ED_region_header(C, region); } /* add handlers, stuff you only do once or on area/region changes */ -static void file_ui_region_init(wmWindowManager *wm, ARegion *ar) +static void file_ui_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - ED_region_panels_init(wm, ar); - ar->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; + ED_region_panels_init(wm, region); + region->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Buttons", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void file_ui_region_draw(const bContext *C, ARegion *ar) +static void file_ui_region_draw(const bContext *C, ARegion *region) { - ED_region_panels(C, ar); + ED_region_panels(C, region); } -static void file_execution_region_init(wmWindowManager *wm, ARegion *ar) +static void file_execution_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - ED_region_panels_init(wm, ar); - ar->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; + ED_region_panels_init(wm, region); + region->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; /* own keymap */ keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); - WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap); + WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } -static void file_execution_region_draw(const bContext *C, ARegion *ar) +static void file_execution_region_draw(const bContext *C, ARegion *region) { - ED_region_panels(C, ar); + ED_region_panels(C, region); } static void file_ui_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), - ARegion *ar, + ARegion *region, wmNotifier *wmn, const Scene *UNUSED(scene)) { @@ -653,7 +653,7 @@ static void file_ui_region_listener(wmWindow *UNUSED(win), case NC_SPACE: switch (wmn->data) { case ND_SPACE_FILE_LIST: - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); break; } break; -- cgit v1.2.3