From 2743d746ea4f38c098512f6dd6fc33d5a62429d3 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Wed, 20 Oct 2021 23:45:30 +1100
Subject: Cleanup: use an array for wmEvent cursor position variables

Use arrays for wmEvent coordinates, this quiets warnings with GCC11.

- `x, y` -> `xy`.
- `prevx, prevy` -> `prev_xy`.
- `prevclickx, prevclicky` -> `prev_click_xy`.

There is still some cleanup such as using `copy_v2_v2_int()`,
this can be done separately.

Reviewed By: campbellbarton, Severin

Ref D12901
---
 source/blender/editors/mesh/editmesh_add_gizmo.c          | 4 ++--
 source/blender/editors/mesh/editmesh_bevel.c              | 2 +-
 source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c | 2 +-
 source/blender/editors/mesh/editmesh_loopcut.c            | 4 ++--
 source/blender/editors/mesh/editmesh_mask_extract.c       | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'source/blender/editors/mesh')

diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.c b/source/blender/editors/mesh/editmesh_add_gizmo.c
index 9efcf0963b4..e2c75435af4 100644
--- a/source/blender/editors/mesh/editmesh_add_gizmo.c
+++ b/source/blender/editors/mesh/editmesh_add_gizmo.c
@@ -220,8 +220,8 @@ static void gizmo_mesh_placement_modal_from_setup(const bContext *C, wmGizmoGrou
       float location[3];
       calc_initial_placement_point_from_view((bContext *)C,
                                              (float[2]){
-                                                 win->eventstate->x - region->winrct.xmin,
-                                                 win->eventstate->y - region->winrct.ymin,
+                                                 win->eventstate->xy[0] - region->winrct.xmin,
+                                                 win->eventstate->xy[1] - region->winrct.ymin,
                                              },
                                              location,
                                              mat3);
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 6f41b7f04a6..332f1f98d81 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -705,7 +705,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
     }
   }
   else if (etype == MOUSEPAN) {
-    float delta = 0.02f * (event->y - event->prevy);
+    float delta = 0.02f * (event->xy[1] - event->prev_xy[1]);
     if (opdata->segments >= 1 && opdata->segments + delta < 1) {
       opdata->segments = 1;
     }
diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
index 5faafa77bba..7c289744eeb 100644
--- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
+++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
@@ -941,7 +941,7 @@ static void gizmo_mesh_spin_redo_setup(const bContext *C, wmGizmoGroup *gzgroup)
     /* Use cursor as fallback if it's not set by the 'ortho_axis_active'. */
     if (is_zero_v3(ggd->data.orient_axis_relative)) {
       float cursor_co[3];
-      const int mval[2] = {event->x - region->winrct.xmin, event->y - region->winrct.ymin};
+      const int mval[2] = {event->xy[0] - region->winrct.xmin, event->xy[1] - region->winrct.ymin};
       float plane[4];
       plane_from_point_normal_v3(plane, plane_co, plane_no);
       if (UNLIKELY(!ED_view3d_win_to_3d_on_plane_int(region, plane, mval, false, cursor_co))) {
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 8b78b091fd2..24825ef1e3a 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -598,13 +598,13 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event)
         break;
       case MOUSEPAN:
         if (event->alt == 0) {
-          cuts += 0.02f * (event->y - event->prevy);
+          cuts += 0.02f * (event->xy[1] - event->prev_xy[1]);
           if (cuts < 1 && lcd->cuts >= 1) {
             cuts = 1;
           }
         }
         else {
-          smoothness += 0.002f * (event->y - event->prevy);
+          smoothness += 0.002f * (event->xy[1] - event->prev_xy[1]);
         }
         handled = true;
         break;
diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c
index cccfc7e934c..8cfcc96517c 100644
--- a/source/blender/editors/mesh/editmesh_mask_extract.c
+++ b/source/blender/editors/mesh/editmesh_mask_extract.c
@@ -389,13 +389,14 @@ static int face_set_extract_modal(bContext *C, wmOperator *op, const wmEvent *ev
          * the PBVH and update the active Face Set ID. */
         bScreen *screen = CTX_wm_screen(C);
         ARegion *region = BKE_screen_find_main_region_at_xy(
-            screen, SPACE_VIEW3D, event->x, event->y);
+            screen, SPACE_VIEW3D, event->xy[0], event->xy[1]);
 
         if (!region) {
           return OPERATOR_CANCELLED;
         }
 
-        const float mval[2] = {event->x - region->winrct.xmin, event->y - region->winrct.ymin};
+        const float mval[2] = {event->xy[0] - region->winrct.xmin,
+                               event->xy[1] - region->winrct.ymin};
 
         Object *ob = CTX_data_active_object(C);
         const int face_set_id = ED_sculpt_face_sets_active_update_and_get(C, ob, mval);
-- 
cgit v1.2.3