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

1 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index f5e4c4d55d9..b1f8949871b 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -393,8 +393,8 @@ static void view_pan_init(bContext *C, wmOperator *op, const wmEvent *event)
     WM_cursor_modal_set(win, WM_CURSOR_NSEW_SCROLL);
   }
 
-  vpd->x = event->x;
-  vpd->y = event->y;
+  vpd->x = event->xy[0];
+  vpd->y = event->xy[1];
 
   if (clip_view_has_locked_selection(C)) {
     vpd->vec = &sc->xlockof;
@@ -454,8 +454,8 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
     SpaceClip *sc = CTX_wm_space_clip(C);
     float offset[2];
 
-    offset[0] = (event->prevx - event->x) / sc->zoom;
-    offset[1] = (event->prevy - event->y) / sc->zoom;
+    offset[0] = (event->prev_xy[0] - event->xy[0]) / sc->zoom;
+    offset[1] = (event->prev_xy[1] - event->xy[1]) / sc->zoom;
 
     RNA_float_set_array(op->ptr, "offset", offset);
 
@@ -478,8 +478,8 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event)
   switch (event->type) {
     case MOUSEMOVE:
       copy_v2_v2(vpd->vec, &vpd->xorig);
-      offset[0] = (vpd->x - event->x) / sc->zoom;
-      offset[1] = (vpd->y - event->y) / sc->zoom;
+      offset[0] = (vpd->x - event->xy[0]) / sc->zoom;
+      offset[1] = (vpd->y - event->xy[1]) / sc->zoom;
       RNA_float_set_array(op->ptr, "offset", offset);
       view_pan_exec(C, op);
       break;
@@ -575,8 +575,8 @@ static void view_zoom_init(bContext *C, wmOperator *op, const wmEvent *event)
     vpd->timer_lastdraw = PIL_check_seconds_timer();
   }
 
-  vpd->x = event->x;
-  vpd->y = event->y;
+  vpd->x = event->xy[0];
+  vpd->y = event->xy[1];
   vpd->zoom = sc->zoom;
   vpd->launch_event = WM_userdef_event_type_from_keymap_type(event->type);
 
@@ -619,7 +619,7 @@ static int view_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *event)
   if (ELEM(event->type, MOUSEZOOM, MOUSEPAN)) {
     float delta, factor;
 
-    delta = event->prevx - event->x + event->prevy - event->y;
+    delta = event->prev_xy[0] - event->xy[0] + event->prev_xy[1] - event->xy[1];
 
     if (U.uiflag & USER_ZOOM_INVERT) {
       delta *= -1;
@@ -646,14 +646,14 @@ static void view_zoom_apply(
 
   if (U.viewzoom != USER_ZOOM_SCALE) {
     if (U.uiflag & USER_ZOOM_HORIZ) {
-      delta = (float)(event->x - vpd->x);
+      delta = (float)(event->xy[0] - vpd->x);
     }
     else {
-      delta = (float)(event->y - vpd->y);
+      delta = (float)(event->xy[1] - vpd->y);
     }
   }
   else {
-    delta = event->x - vpd->x + event->y - vpd->y;
+    delta = event->xy[0] - vpd->x + event->xy[1] - vpd->y;
   }
 
   delta /= U.pixelsize;