[Bf-blender-cvs] [2743d746ea4] master: Cleanup: use an array for wmEvent cursor position variables
Aaron Carlisle
noreply at git.blender.org
Wed Oct 20 15:00:35 CEST 2021
Commit: 2743d746ea4f38c098512f6dd6fc33d5a62429d3
Author: Aaron Carlisle
Date: Wed Oct 20 23:45:30 2021 +1100
Branches: master
https://developer.blender.org/rB2743d746ea4f38c098512f6dd6fc33d5a62429d3
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
===================================================================
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/time_scrub_ui.c
M source/blender/editors/armature/pose_lib_2.c
M source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_interpolate.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_context_menu.c
M source/blender/editors/interface/interface_dropboxes.cc
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/interface/interface_eyedropper_color.c
M source/blender/editors/interface/interface_eyedropper_colorband.c
M source/blender/editors/interface/interface_eyedropper_datablock.c
M source/blender/editors/interface/interface_eyedropper_depth.c
M source/blender/editors/interface/interface_eyedropper_gpencil_color.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_query.c
M source/blender/editors/interface/interface_region_menu_pie.c
M source/blender/editors/interface/interface_region_menu_popup.c
M source/blender/editors/interface/interface_region_popup.c
M source/blender/editors/interface/interface_region_search.c
M source/blender/editors/interface/interface_region_tooltip.c
M source/blender/editors/interface/interface_template_search_menu.c
M source/blender/editors/interface/tree_view.cc
M source/blender/editors/interface/view2d_edge_pan.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/mesh/editmesh_add_gizmo.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/mesh/editmesh_mask_extract.c
M source/blender/editors/object/object_add.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_view.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_cloth.c
M source/blender/editors/sculpt_paint/sculpt_detail.c
M source/blender/editors/sculpt_paint/sculpt_filter_color.c
M source/blender/editors/sculpt_paint/sculpt_filter_mesh.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_console/space_console.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
M source/blender/editors/space_text/space_text.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_navigate_fly.c
M source/blender/editors/transform/transform.c
M source/blender/editors/util/ed_draw.c
M source/blender/editors/util/ed_util_imbuf.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/WM_gizmo_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M source/blender/windowmanager/intern/wm_dragdrop.c
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_query.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_gesture.c
M source/blender/windowmanager/intern/wm_gesture_ops.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_tooltip.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 0de3f429bc7..e12433f4d4c 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -872,7 +872,7 @@ static int ed_marker_move_invoke(bContext *C, wmOperator *op, const wmEvent *eve
ARegion *region = CTX_wm_region(C);
View2D *v2d = ®ion->v2d;
ListBase *markers = ED_context_get_markers(C);
- if (!region_position_is_over_marker(v2d, markers, event->x - region->winrct.xmin)) {
+ if (!region_position_is_over_marker(v2d, markers, event->xy[0] - region->winrct.xmin)) {
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
}
@@ -880,8 +880,8 @@ static int ed_marker_move_invoke(bContext *C, wmOperator *op, const wmEvent *eve
if (ed_marker_move_init(C, op)) {
MarkerMove *mm = op->customdata;
- mm->evtx = event->x;
- mm->firstx = event->x;
+ mm->evtx = event->xy[0];
+ mm->firstx = event->xy[0];
mm->event_type = event->type;
/* add temp handler */
@@ -993,11 +993,11 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even
dx = BLI_rctf_size_x(&v2d->cur) / BLI_rcti_size_x(&v2d->mask);
- if (event->x != mm->evtx) { /* XXX maybe init for first time */
+ if (event->xy[0] != mm->evtx) { /* XXX maybe init for first time */
float fac;
- mm->evtx = event->x;
- fac = ((float)(event->x - mm->firstx) * dx);
+ mm->evtx = event->xy[0];
+ fac = ((float)(event->xy[0] - mm->firstx) * dx);
apply_keyb_grid(event->shift, event->ctrl, &fac, 0.0, FPS, 0.1 * FPS, 0);
@@ -1354,7 +1354,8 @@ static int ed_marker_box_select_invoke(bContext *C, wmOperator *op, const wmEven
View2D *v2d = ®ion->v2d;
ListBase *markers = ED_context_get_markers(C);
- bool over_marker = region_position_is_over_marker(v2d, markers, event->x - region->winrct.xmin);
+ bool over_marker = region_position_is_over_marker(
+ v2d, markers, event->xy[0] - region->winrct.xmin);
bool tweak = RNA_boolean_get(op->ptr, "tweak");
if (tweak && over_marker) {
diff --git a/source/blender/editors/animation/time_scrub_ui.c b/source/blender/editors/animation/time_scrub_ui.c
index 94366a5e852..f3cfbabd544 100644
--- a/source/blender/editors/animation/time_scrub_ui.c
+++ b/source/blender/editors/animation/time_scrub_ui.c
@@ -208,7 +208,7 @@ bool ED_time_scrub_event_in_region(const ARegion *region, const wmEvent *event)
{
rcti rect = region->winrct;
rect.ymin = rect.ymax - UI_TIME_SCRUB_MARGIN_Y;
- return BLI_rcti_isect_pt(&rect, event->x, event->y);
+ return BLI_rcti_isect_pt(&rect, event->xy[0], event->xy[1]);
}
void ED_time_scrub_channel_search_draw(const bContext *C, ARegion *region, bDopeSheet *dopesheet)
diff --git a/source/blender/editors/armature/pose_lib_2.c b/source/blender/editors/armature/pose_lib_2.c
index 91a5dc67a21..328ca0265c1 100644
--- a/source/blender/editors/armature/pose_lib_2.c
+++ b/source/blender/editors/armature/pose_lib_2.c
@@ -209,11 +209,11 @@ static void poselib_slide_mouse_update_blendfactor(PoseBlendData *pbd, const wmE
if (pbd->release_confirm_info.use_release_confirm) {
/* Release confirm calculates factor based on where the dragging was started from. */
const float range = 300 * U.pixelsize;
- const float new_factor = (event->x - pbd->release_confirm_info.drag_start_xy[0]) / range;
+ const float new_factor = (event->xy[0] - pbd->release_confirm_info.drag_start_xy[0]) / range;
poselib_blend_set_factor(pbd, new_factor);
}
else {
- const float new_factor = (event->x - pbd->area->v1->vec.x) / ((float)pbd->area->winx);
+ const float new_factor = (event->xy[0] - pbd->area->v1->vec.x) / ((float)pbd->area->winx);
poselib_blend_set_factor(pbd, new_factor);
}
}
@@ -379,8 +379,8 @@ static bool poselib_blend_init_data(bContext *C, wmOperator *op, const wmEvent *
if (pbd->release_confirm_info.use_release_confirm) {
BLI_assert(event != NULL);
- pbd->release_confirm_info.drag_start_xy[0] = event->x;
- pbd->release_confirm_info.drag_start_xy[1] = event->y;
+ pbd->release_confirm_info.drag_start_xy[0] = event->xy[0];
+ pbd->release_confirm_info.drag_start_xy[1] = event->xy[1];
pbd->release_confirm_info.init_event_type = WM_userdef_event_type_from_keymap_type(
event->type);
}
diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
index 6345cd3525a..d4d4c889209 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
@@ -307,7 +307,7 @@ static void dial_ghostarc_get_angles(const wmGizmo *gz,
{
DialInteraction *inter = gz->interaction_data;
const RegionView3D *rv3d = region->regiondata;
- 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};
/* We might need to invert the direction of the angles. */
float view_vec[3], axis_vec[3];
diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
index 13d9f1ecda7..33532bd0549 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
@@ -120,8 +120,8 @@ void ED_gizmotypes_snap_3d_data_get(const struct bContext *C,
const wmEvent *event = wm->winactive ? wm->winactive->eventstate : NULL;
if (event) {
ARegion *region = CTX_wm_region(C);
- int x = event->x - region->winrct.xmin;
- int y = event->y - region->winrct.ymin;
+ int x = event->xy[0] - region->winrct.xmin;
+ int y = event->xy[1] - region->winrct.ymin;
snap_data = ED_view3d_cursor_snap_data_get(NULL, C, x, y);
}
}
@@ -250,8 +250,8 @@ static int snap_gizmo_test_select(bContext *C, wmGizmo *gz, const int mval[2])
const wmEvent *event = wm->winactive ? wm->winactive->eventstate : NULL;
if (event) {
ARegion *region = CTX_wm_region(C);
- x = event->x - region->winrct.xmin;
- y = event->y - region->winrct.ymin;
+ x = event->xy[0] - region->winrct.xmin;
+ y = event->xy[1] - region->winrct.ymin;
}
else {
x = mval[0];
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 8924865f5e1..ba603cdd6ec 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -2560,7 +2560,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve
if ((p->region) && (p->region->regiontype == RGN_TYPE_TOOLS)) {
/* Change to whatever region is now under the mouse */
ARegion *current_region = BKE_area_find_region_xy(
- p->area, RGN_TYPE_ANY, event->x, event->y);
+ p->area, RGN_TYPE_ANY, event->xy[0], event->xy[1]);
if (current_region) {
/* Assume that since we found the cursor in here, it is in bounds
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index f5474a7cdc3..52487e07f53 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -2103,11 +2103,11 @@ static int gpencil_fill_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* first time the event is not enabled to show help lines. */
if ((tgpf->oldkey != -1) || (!help_lines)) {
ARegion *region = BKE_area_find_region_xy(
- CTX_wm_area(C), RGN_TYPE_ANY, event->x, event->y);
+ CTX_wm_area(C), RGN_TYPE_ANY, event->xy[0], event->xy[1]);
if (region) {
bool in_bounds = false;
/* Perform bounds check */
- in_bounds = BLI_rcti_isect_pt(®ion->winrct, event->x, event->y);
+ in_bounds = BLI_rcti_isect_pt(®ion->winrct, event->xy[0], event->xy[1]);
if ((in_bounds) && (region->regiontype == RGN_TYPE_WINDOW)) {
tgpf->mouse[0] = event->mval[0];
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index d7cab85abad..22127d7ac3b 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -586,7 +586,7 @@ static void gpencil_interpolate_set_points(bContext *C, tGPDinterpolate *tgpi)
static void gpencil_mouse_update_shift(tGPDinterpolate *tgpi, wmOperator *op, const wmEvent *event)
{
float mid = (float)(tgpi->region->winx - tgpi->region->winrct.xmin) / 2.0f;
- float mpos = event->x - tgpi->region->winrct.xmin;
+ float mpos = event->xy[0] - tgpi->region->winrct.xmin;
if (mpos >= mid) {
tgpi->shift = ((mpos - mid) * tgpi->high_limit) / mid;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 2aa4b3b3282..070470b3734 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -3666,7 +3666,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
if ((p->region) && (p->region->regiontype == RGN_TYPE_TOOLS)) {
/* Change to whatever region is now under the mouse */
ARegion *current_region = BKE_area_find_region_xy(
- p->area, RGN_TYPE_ANY, event->x, event->y);
+ p->area, RGN_TYPE_ANY, event->xy[0], event->xy[1]);
if (current_region) {
/* Assume that since we found the cursor in here, it is in bounds
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index b7458793f15..fe4caf03184 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1988,7 +1988,7 @@ void UI_block_end(const bContext *C, uiBlock *block
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list