Cleanup: Continue renaming ARegion variables from ar to region

Continuation of b2ee1770d4c3, now non-single word variables are also
renamed.
Part of T74432.

Also ran clang-format on affected files.

6 files changed, 37 insertions, 37 deletions

diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index 93599b8727a..bf118481be2 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -155,7 +155,7 @@ static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int
   ScrArea *sa = BKE_screen_find_area_xy(screen, -1, mx, my);
 
   ScrArea *area_prev = CTX_wm_area(C);
-  ARegion *ar_prev = CTX_wm_region(C);
+  ARegion *region_prev = CTX_wm_region(C);
 
   ddr->name[0] = '\0';
 
@@ -208,7 +208,7 @@ static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int
   }
 
   CTX_wm_area_set(C, area_prev);
-  CTX_wm_region_set(C, ar_prev);
+  CTX_wm_region_set(C, region_prev);
 }
 
 /* sets the ID, returns success */
diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index a5e60adec55..26a6109e8cf 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -160,7 +160,7 @@ static void depthdropper_depth_sample_pt(
   Scene *scene = CTX_data_scene(C);
 
   ScrArea *area_prev = CTX_wm_area(C);
-  ARegion *ar_prev = CTX_wm_region(C);
+  ARegion *region_prev = CTX_wm_region(C);
 
   ddr->name[0] = '\0';
 
@@ -209,7 +209,7 @@ static void depthdropper_depth_sample_pt(
   }
 
   CTX_wm_area_set(C, area_prev);
-  CTX_wm_region_set(C, ar_prev);
+  CTX_wm_region_set(C, region_prev);
 }
 
 /* sets the sample depth RGB, maintaining A */
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index d378613c035..61c59643bcd 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1874,7 +1874,7 @@ static bool ui_but_drag_init(bContext *C,
 #ifdef USE_DRAG_TOGGLE
     if (ui_drag_toggle_but_is_supported(but)) {
       uiDragToggleHandle *drag_info = MEM_callocN(sizeof(*drag_info), __func__);
-      ARegion *ar_prev;
+      ARegion *region_prev;
 
       /* call here because regular mouse-up event wont run,
        * typically 'button_activate_exit()' handles this */
@@ -1887,7 +1887,7 @@ static bool ui_but_drag_init(bContext *C,
       copy_v2_v2_int(drag_info->xy_last, &event->x);
 
       /* needed for toggle drag on popups */
-      ar_prev = CTX_wm_region(C);
+      region_prev = CTX_wm_region(C);
       CTX_wm_region_set(C, data->region);
 
       WM_event_add_ui_handler(C,
@@ -1897,7 +1897,7 @@ static bool ui_but_drag_init(bContext *C,
                               drag_info,
                               WM_HANDLER_BLOCKING);
 
-      CTX_wm_region_set(C, ar_prev);
+      CTX_wm_region_set(C, region_prev);
 
       /* Initialize alignment for single row/column regions,
        * otherwise we use the relative position of the first other button dragged over. */
@@ -1906,13 +1906,13 @@ static bool ui_but_drag_init(bContext *C,
                RGN_TYPE_HEADER,
                RGN_TYPE_TOOL_HEADER,
                RGN_TYPE_FOOTER)) {
-        const int ar_alignment = RGN_ALIGN_ENUM_FROM_MASK(data->region->alignment);
+        const int region_alignment = RGN_ALIGN_ENUM_FROM_MASK(data->region->alignment);
         int lock_axis = -1;
 
-        if (ELEM(ar_alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
+        if (ELEM(region_alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
           lock_axis = 0;
         }
-        else if (ELEM(ar_alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
+        else if (ELEM(region_alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
           lock_axis = 1;
         }
         if (lock_axis != -1) {
@@ -8326,16 +8326,16 @@ void UI_context_active_but_prop_handle(bContext *C)
 
 wmOperator *UI_context_active_operator_get(const struct bContext *C)
 {
-  ARegion *ar_ctx = CTX_wm_region(C);
+  ARegion *region_ctx = CTX_wm_region(C);
   uiBlock *block;
 
   /* background mode */
-  if (ar_ctx == NULL) {
+  if (region_ctx == NULL) {
     return NULL;
   }
 
   /* scan active regions ui */
-  for (block = ar_ctx->uiblocks.first; block; block = block->next) {
+  for (block = region_ctx->uiblocks.first; block; block = block->next) {
     if (block->ui_operator) {
       return block->ui_operator;
     }
@@ -8347,7 +8347,7 @@ wmOperator *UI_context_active_operator_get(const struct bContext *C)
     ARegion *region;
 
     for (region = sc->regionbase.first; region; region = region->next) {
-      if (region == ar_ctx) {
+      if (region == region_ctx) {
         continue;
       }
       for (block = region->uiblocks.first; block; block = block->next) {
@@ -8470,10 +8470,10 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but)
   event.customdata = but;
   event.customdatafree = false;
 
-  ARegion *ar_ctx = CTX_wm_region(C);
+  ARegion *region_ctx = CTX_wm_region(C);
   CTX_wm_region_set(C, region);
   ui_do_button(C, but->block, but, &event);
-  CTX_wm_region_set(C, ar_ctx);
+  CTX_wm_region_set(C, region_ctx);
 }
 
 /**
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index b418cb4a1ac..5a4a549ea3e 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -1622,11 +1622,11 @@ static int ui_button_press_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 {
   bScreen *sc = CTX_wm_screen(C);
   const bool skip_depressed = RNA_boolean_get(op->ptr, "skip_depressed");
-  ARegion *ar_prev = CTX_wm_region(C);
+  ARegion *region_prev = CTX_wm_region(C);
   ARegion *region = sc ? BKE_screen_find_region_xy(sc, RGN_TYPE_ANY, event->x, event->y) : NULL;
 
   if (region == NULL) {
-    region = ar_prev;
+    region = region_prev;
   }
 
   if (region == NULL) {
@@ -1635,7 +1635,7 @@ static int ui_button_press_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 
   CTX_wm_region_set(C, region);
   uiBut *but = UI_context_active_but_get(C);
-  CTX_wm_region_set(C, ar_prev);
+  CTX_wm_region_set(C, region_prev);
 
   if (but == NULL) {
     return OPERATOR_PASS_THROUGH;
diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c
index f77739b5114..e0fc7a3ee71 100644
--- a/source/blender/editors/interface/interface_region_hud.c
+++ b/source/blender/editors/interface/interface_region_hud.c
@@ -75,14 +75,14 @@ static bool last_redo_poll(const bContext *C, short region_type)
      * wrong context.
      */
     ScrArea *sa = CTX_wm_area(C);
-    ARegion *ar_op = (region_type != -1) ? BKE_area_find_region_type(sa, region_type) : NULL;
-    ARegion *ar_prev = CTX_wm_region(C);
-    CTX_wm_region_set((bContext *)C, ar_op);
+    ARegion *region_op = (region_type != -1) ? BKE_area_find_region_type(sa, region_type) : NULL;
+    ARegion *region_prev = CTX_wm_region(C);
+    CTX_wm_region_set((bContext *)C, region_op);
 
     if (WM_operator_repeat_check(C, op) && WM_operator_check_ui_empty(op->type) == false) {
       success = WM_operator_poll((bContext *)C, op->type);
     }
-    CTX_wm_region_set((bContext *)C, ar_prev);
+    CTX_wm_region_set((bContext *)C, region_prev);
   }
   return success;
 }
@@ -253,9 +253,9 @@ ARegionType *ED_area_type_hud(int space_type)
 static ARegion *hud_region_add(ScrArea *sa)
 {
   ARegion *region = MEM_callocN(sizeof(ARegion), "area region");
-  ARegion *ar_win = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
-  if (ar_win) {
-    BLI_insertlinkbefore(&sa->regionbase, ar_win, region);
+  ARegion *region_win = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
+  if (region_win) {
+    BLI_insertlinkbefore(&sa->regionbase, region_win, region);
   }
   else {
     BLI_addtail(&sa->regionbase, region);
@@ -265,10 +265,10 @@ static ARegion *hud_region_add(ScrArea *sa)
   region->overlap = true;
   region->flag |= RGN_FLAG_DYNAMIC_SIZE;
 
-  if (ar_win) {
+  if (region_win) {
     float x, y;
 
-    UI_view2d_scroller_size_get(&ar_win->v2d, &x, &y);
+    UI_view2d_scroller_size_get(&region_win->v2d, &x, &y);
     region->runtime.offset_x = x;
     region->runtime.offset_y = y;
   }
@@ -316,9 +316,9 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
 
   bool init = false;
   bool was_hidden = region == NULL || region->visible == false;
-  ARegion *ar_op = CTX_wm_region(C);
-  BLI_assert((ar_op == NULL) || (ar_op->regiontype != RGN_TYPE_HUD));
-  if (!last_redo_poll(C, ar_op ? ar_op->regiontype : -1)) {
+  ARegion *region_op = CTX_wm_region(C);
+  BLI_assert((region_op == NULL) || (region_op->regiontype != RGN_TYPE_HUD));
+  if (!last_redo_poll(C, region_op ? region_op->regiontype : -1)) {
     if (region) {
       ED_region_tag_redraw(region);
       hud_region_hide(region);
@@ -350,8 +350,8 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
       hrd = MEM_callocN(sizeof(*hrd), __func__);
       region->regiondata = hrd;
     }
-    if (ar_op) {
-      hrd->regionid = ar_op->regiontype;
+    if (region_op) {
+      hrd->regionid = region_op->regiontype;
     }
     else {
       hrd->regionid = -1;
@@ -380,7 +380,7 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
   /* We shouldn't need to do this every time :S */
   /* XXX, this is evil! - it also makes the menu show on first draw. :( */
   if (region->visible) {
-    ARegion *ar_prev = CTX_wm_region(C);
+    ARegion *region_prev = CTX_wm_region(C);
     CTX_wm_region_set((bContext *)C, region);
     hud_region_layout(C, region);
     if (was_hidden) {
@@ -391,7 +391,7 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
           .ymax = region->winy,
       };
     }
-    CTX_wm_region_set((bContext *)C, ar_prev);
+    CTX_wm_region_set((bContext *)C, region_prev);
   }
 
   region->visible = !((region->flag & RGN_FLAG_HIDDEN) || (region->flag & RGN_FLAG_TOO_SMALL));
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c
index ba9a5026ce3..7e32a91d08d 100644
--- a/source/blender/editors/interface/interface_region_popup.c
+++ b/source/blender/editors/interface/interface_region_popup.c
@@ -526,7 +526,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
 {
   wmWindow *ctx_win = CTX_wm_window(C);
   ScrArea *ctx_sa = CTX_wm_area(C);
-  ARegion *ctx_ar = CTX_wm_region(C);
+  ARegion *ctx_region = CTX_wm_region(C);
 
   wmWindowManager *wm = CTX_wm_manager(C);
   wmWindow *win = ctx_win;
@@ -551,7 +551,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
   /* Reset context (area and region were NULL'ed when chaning context window). */
   CTX_wm_window_set(C, ctx_win);
   CTX_wm_area_set(C, ctx_sa);
-  CTX_wm_region_set(C, ctx_ar);
+  CTX_wm_region_set(C, ctx_region);
 
   /* reset to region cursor (only if there's not another menu open) */
   if (BLI_listbase_is_empty(&sc->regionbase)) {