[Bf-blender-cvs] [035dcdad90e] master: Cleanup: use underscore separators for event struct members
Campbell Barton
noreply at git.blender.org
Thu Oct 21 04:27:26 CEST 2021
Commit: 035dcdad90ec9d6881e2d99b90e30f5a481237e1
Author: Campbell Barton
Date: Thu Oct 21 13:24:17 2021 +1100
Branches: master
https://developer.blender.org/rB035dcdad90ec9d6881e2d99b90e30f5a481237e1
Cleanup: use underscore separators for event struct members
Improve readability using underscores for separators, e.g.
prev_click_time instead of prevclicktime.
===================================================================
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/sculpt_mask_expand.c
M source/blender/editors/transform/transform.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.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_window.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index fe4caf03184..5068969946a 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -7013,7 +7013,7 @@ void UI_but_focus_on_enter_event(wmWindow *win, uiBut *but)
event.val = KM_PRESS;
event.is_repeat = false;
event.customdata = but;
- event.customdatafree = false;
+ event.customdata_free = false;
wm_event_add(win, &event);
}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 243ebe4e75c..556474f6df4 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9034,7 +9034,7 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but)
event.val = KM_PRESS;
event.is_repeat = false;
event.customdata = but;
- event.customdatafree = false;
+ event.customdata_free = false;
ui_do_button(C, but->block, but, &event);
}
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 036a2d9582f..d073f5f2ba4 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -4515,7 +4515,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
knife_recalc_ortho(kcd);
/* Get the value of the event which triggered this one. */
- if (event->prevval != KM_RELEASE) {
+ if (event->prev_val != KM_RELEASE) {
if (kcd->mode == MODE_DRAGGING) {
knife_add_cut(kcd);
}
@@ -4754,7 +4754,7 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event)
if (wait_for_input == false) {
/* Avoid copy-paste logic. */
wmEvent event_modal = {
- .prevval = KM_NOTHING,
+ .prev_val = KM_NOTHING,
.type = EVT_MODAL_MAP,
.val = KNF_MODAL_ADD_CUT,
};
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 861c2573de8..80ad35b8d8f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1051,7 +1051,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
event.val = KM_NOTHING;
event.is_repeat = false;
event.customdata = op->customdata;
- event.customdatafree = true;
+ event.customdata_free = true;
op->customdata = NULL;
wm_event_add(win, &event);
diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
index 9b06b2ee5d5..b59d461bab5 100644
--- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
@@ -170,10 +170,10 @@ static int sculpt_mask_expand_modal(bContext *C, wmOperator *op, const wmEvent *
SculptSession *ss = ob->sculpt;
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
ARegion *region = CTX_wm_region(C);
- float prevclick_f[2];
- copy_v2_v2(prevclick_f, op->customdata);
- const int prevclick[2] = {(int)prevclick_f[0], (int)prevclick_f[1]};
- int len = (int)len_v2v2_int(prevclick, event->mval);
+ float prev_click_f[2];
+ copy_v2_v2(prev_click_f, op->customdata);
+ const int prev_click[2] = {(int)prev_click_f[0], (int)prev_click_f[1]};
+ int len = (int)len_v2v2_int(prev_click, event->mval);
len = abs(len);
int mask_speed = RNA_int_get(op->ptr, "mask_speed");
int mask_expand_update_it = len / mask_speed;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 86afe1172a1..f212c7f5747 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1097,8 +1097,8 @@ int transformEvent(TransInfo *t, const wmEvent *event)
break;
case TFM_MODAL_AUTOCONSTRAINT:
case TFM_MODAL_AUTOCONSTRAINTPLANE:
- if ((t->flag & T_RELEASE_CONFIRM) && (event->prevval == KM_RELEASE) &&
- event->prevtype == t->launch_event) {
+ if ((t->flag & T_RELEASE_CONFIRM) && (event->prev_val == KM_RELEASE) &&
+ event->prev_type == t->launch_event) {
/* Confirm transform if launch key is released after mouse move. */
t->state = TRANS_CONFIRM;
}
@@ -1137,13 +1137,13 @@ int transformEvent(TransInfo *t, const wmEvent *event)
}
break;
case TFM_MODAL_PRECISION:
- if (event->prevval == KM_PRESS) {
+ if (event->prev_val == KM_PRESS) {
t->modifiers |= MOD_PRECISION;
/* Shift is modifier for higher precision transform. */
t->mouse.precision = 1;
t->redraw |= TREDRAW_HARD;
}
- else if (event->prevval == KM_RELEASE) {
+ else if (event->prev_val == KM_RELEASE) {
t->modifiers &= ~MOD_PRECISION;
t->mouse.precision = 0;
t->redraw |= TREDRAW_HARD;
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 105e533ad22..f4595869baf 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -600,7 +600,7 @@ typedef struct wmTabletData {
* - Previous x/y are exceptions: #wmEvent.prev
* these are set on mouse motion, see #MOUSEMOVE & track-pad events.
*
- * - Modal key-map handling sets `prevval` & `prevtype` to `val` & `type`,
+ * - Modal key-map handling sets `prev_val` & `prev_type` to `val` & `type`,
* this allows modal keys-maps to check the original values (needed in some cases).
*/
typedef struct wmEvent {
@@ -632,17 +632,17 @@ typedef struct wmEvent {
char is_repeat;
/** The previous value of `type`. */
- short prevtype;
+ short prev_type;
/** The previous value of `val`. */
- short prevval;
+ short prev_val;
/** The time when the key is pressed, see #PIL_check_seconds_timer. */
- double prevclicktime;
+ double prev_click_time;
/** The location when the key is pressed (used to enforce drag thresholds). */
int prev_click_xy[2];
/**
* The previous value of #wmEvent.xy,
* Unlike other previous state variables, this is set on any mouse motion.
- * Use `prevclick` for the value at time of pressing.
+ * Use `prev_click` for the value at time of pressing.
*/
int prev_xy[2];
@@ -658,7 +658,7 @@ typedef struct wmEvent {
/* Custom data. */
/** Custom data type, stylus, 6dof, see wm_event_types.h */
short custom;
- short customdatafree;
+ short customdata_free;
int pad2;
/** Ascii, unicode, mouse-coords, angles, vectors, NDOF data, drag-drop info. */
void *customdata;
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 7772c87f71c..b6d759eb95f 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -549,8 +549,8 @@ static int gizmo_tweak_modal(bContext *C, wmOperator *op, const wmEvent *event)
if (event->type == EVT_MODAL_MAP) {
event_modal_val = evil_event->val;
- evil_event->type = evil_event->prevtype;
- evil_event->val = evil_event->prevval;
+ evil_event->type = evil_event->prev_type;
+ evil_event->val = evil_event->prev_val;
}
int modal_retval = modal_fn(C, gz, event, mtweak->flag);
diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c
index 85abd8469fe..5687e024975 100644
--- a/source/blender/windowmanager/intern/wm_event_query.c
+++ b/source/blender/windowmanager/intern/wm_event_query.c
@@ -82,7 +82,7 @@ void WM_event_print(const wmEvent *event)
const char *prev_val_id = unknown;
event_ids_from_type_and_value(event->type, event->val, &type_id, &val_id);
- event_ids_from_type_and_value(event->prevtype, event->prevval, &prev_type_id, &prev_val_id);
+ event_ids_from_type_and_value(event->prev_type, event->prev_val, &prev_type_id, &prev_val_id);
printf(
"wmEvent type:%d / %s, val:%d / %s,\n"
@@ -93,9 +93,9 @@ void WM_event_print(const wmEvent *event)
type_id,
event->val,
val_id,
- event->prevtype,
+ event->prev_type,
prev_type_id,
- event->prevval,
+ event->prev_val,
prev_val_id,
event->shift,
event->ctrl,
@@ -288,8 +288,8 @@ bool WM_event_is_mouse_drag_or_press(const wmEvent *event)
int WM_event_drag_threshold(const struct wmEvent *event)
{
int drag_threshold;
- if (ISMOUSE(event->prevtype)) {
- BLI_assert(event->prevtype != MOUSEMOVE);
+ if (ISMOUSE(event->prev_type)) {
+ BLI_assert(event->prev_type != MOUSEMOVE);
/* Using the previous type is important is we want to check the last pressed/released button,
* The `event->type` would include #MOUSEMOVE which is always the case when dragging
* and does not help us know which threshold to use. */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 3c03d413214..8d55a684f10 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -161,8 +161,8 @@ wmEvent *WM_event_add_simulate(wmWindow *win, const wmEvent *event_to_add)
win->eventstate->prev_xy[1] = event->prev_xy[1] = win->eventstate->xy[1];
}
else if (ISMOUSE_BUTTON(event->type) || ISKEYBOARD(event->type)) {
- win->eventstate->prevval = event->prevval = win->eventstate->val;
- win->eventstate->prevtype = event->prevtype = win->eventstate->type;
+ win->eventstate->prev_val = event->prev_val = win->eventstate->val;
+ win->eventstate->prev_type = event->prev_type = win->eventstate->type;
win->eventstate->val = event->val;
win->eventstate->type = event->type;
@@ -188,7 +188,7 @@ void wm_event_free(wmEvent *event)
#endif
if (event->customdata) {
- if (event->customdatafree) {
+ if (event->customdata_free) {
/* NOTE: poi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list