Cleanup: use underscore separators for event struct members

Improve readability using underscores for separators, e.g.
prev_click_time instead of prevclicktime.

11 files changed, 66 insertions, 66 deletions

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: pointer to listbase struct elsewhere. */
       if (event->custom == EVT_DATA_DRAGDROP) {
         ListBase *lb = event->customdata;
@@ -2108,8 +2108,8 @@ static wmKeyMapItem *wm_eventmatch_modal_keymap_items(const wmKeyMap *keymap,
 }
 
 struct wmEvent_ModalMapStore {
-  short prevtype;
-  short prevval;
+  short prev_type;
+  short prev_val;
 
   bool dbl_click_disabled;
 };
@@ -2157,19 +2157,19 @@ static void wm_event_modalkeymap_begin(const bContext *C,
     }
 
     if (event_match != NULL) {
-      event_backup->prevtype = event->prevtype;
-      event_backup->prevval = event->prevval;
+      event_backup->prev_type = event->prev_type;
+      event_backup->prev_val = event->prev_val;
 
-      event->prevtype = event_match->type;
-      event->prevval = event_match->val;
+      event->prev_type = event_match->type;
+      event->prev_val = event_match->val;
       event->type = EVT_MODAL_MAP;
       event->val = kmi->propvalue;
 
       /* Avoid double-click events even in the case of 'EVT_MODAL_MAP',
        * since it's possible users configure double-click keymap items
        * which would break when modal functions expect press/release. */
-      if (event->prevtype == KM_DBL_CLICK) {
-        event->prevtype = KM_PRESS;
+      if (event->prev_type == KM_DBL_CLICK) {
+        event->prev_type = KM_PRESS;
         event_backup->dbl_click_disabled = true;
       }
     }
@@ -2195,11 +2195,11 @@ static void wm_event_modalkeymap_end(wmEvent *event,
                                      const struct wmEvent_ModalMapStore *event_backup)
 {
   if (event->type == EVT_MODAL_MAP) {
-    event->type = event->prevtype;
-    event->val = event->prevval;
+    event->type = event->prev_type;
+    event->val = event->prev_val;
 
-    event->prevtype = event_backup->prevtype;
-    event->prevval = event_backup->prevval;
+    event->prev_type = event_backup->prev_type;
+    event->prev_val = event_backup->prev_val;
   }
 
   if (event_backup->dbl_click_disabled) {
@@ -3184,7 +3184,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
           event->xy[0] = event->prev_click_xy[0];
           event->xy[1] = event->prev_click_xy[1];
           event->val = KM_CLICK_DRAG;
-          event->type = event->prevtype;
+          event->type = event->prev_type;
 
           CLOG_INFO(WM_LOG_HANDLERS, 1, "handling PRESS_DRAG");
 
@@ -3208,7 +3208,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
     }
   }
   else if (ISMOUSE_BUTTON(event->type) || ISKEYBOARD(event->type)) {
-    /* All events that don't set wmEvent.prevtype must be ignored. */
+    /* All events that don't set wmEvent.prev_type must be ignored. */
 
     /* Test for CLICK events. */
     if (wm_action_not_handled(action)) {
@@ -3226,10 +3226,10 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
         win->event_queue_check_drag = false;
       }
 
-      if (event->prevtype == event->type) {
+      if (event->prev_type == event->type) {
 
         if (event->val == KM_RELEASE) {
-          if (event->prevval == KM_PRESS) {
+          if (event->prev_val == KM_PRESS) {
             if (win->event_queue_check_click == true) {
               if (WM_event_drag_test(event, event->prev_click_xy)) {
                 win->event_queue_check_click = false;
@@ -3280,7 +3280,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
       /* pass */
     }
     else {
-      if (ISKEYMODIFIER(event->prevtype)) {
+      if (ISKEYMODIFIER(event->prev_type)) {
         win->event_queue_check_click = false;
       }
     }
@@ -3407,14 +3407,14 @@ static void wm_event_drag_and_drop_test(wmWindowManager *wm, wmWindow *win, wmEv
 
     /* Create customdata, first free existing. */
     if (event->customdata) {
-      if (event->customdatafree) {
+      if (event->customdata_free) {
         MEM_freeN(event->customdata);
       }
     }
 
     event->custom = EVT_DATA_DRAGDROP;
     event->customdata = &wm->drags;
-    event->customdatafree = 1;
+    event->customdata_free = true;
 
     /* Clear drop icon. */
     screen->do_draw_drag = true;
@@ -4653,7 +4653,7 @@ static void attach_ndof_data(wmEvent *event, const GHOST_TEventNDOFMotionData *g
 
   event->custom = EVT_DATA_NDOF_MOTION;
   event->customdata = data;
-  event->customdatafree = 1;
+  event->customdata_free = true;
 }
 #endif /* WITH_INPUT_NDOF */
 
@@ -4692,13 +4692,13 @@ static wmWindow *wm_event_cursor_other_windows(wmWindowManager *wm, wmWindow *wi
 
 static bool wm_event_is_double_click(const wmEvent *event)
 {
-  if ((event->type == event->prevtype) && (event->prevval == KM_RELEASE) &&
+  if ((event->type == event->prev_type) && (event->prev_val == KM_RELEASE) &&
       (event->val == KM_PRESS)) {
     if (ISMOUSE(event->type) && WM_event_drag_test(event, event->prev_click_xy)) {
       /* Pass. */
     }
     else {
-      if ((PIL_check_seconds_timer() - event->prevclicktime) * 1000 < U.dbl_click_time) {
+      if ((PIL_check_seconds_timer() - event->prev_click_time) * 1000 < U.dbl_click_time) {
         return true;
       }
     }
@@ -4712,13 +4712,13 @@ static bool wm_event_is_double_click(const wmEvent *event)
  */
 static void wm_event_prev_values_set(wmEvent *event, wmEvent *event_state)
 {
-  event->prevval = event_state->prevval = event_state->val;
-  event->prevtype = event_state->prevtype = event_state->type;
+  event->prev_val = event_state->prev_val = event_state->val;
+  event->prev_type = event_state->prev_type = event_state->type;
 }
 
 static void wm_event_prev_click_set(wmEvent *event, wmEvent *event_state)
 {
-  event->prevclicktime = event_state->prevclicktime = PIL_check_seconds_timer();
+  event->prev_click_time = event_state->prev_click_time = PIL_check_seconds_timer();
   event->prev_click_xy[0] = event_state->prev_click_xy[0] = event_state->xy[0];
   event->prev_click_xy[1] = event_state->prev_click_xy[1] = event_state->xy[1];
 }
@@ -4799,8 +4799,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
    * If this was done it could leave `win->eventstate` previous and current value
    * set to the same key press/release state which doesn't make sense.
    */
-  event.prevtype = event.type;
-  event.prevval = event.val;
+  event.prev_type = event.type;
+  event.prev_val = event.val;
 
   /* Ensure the event state is correct, any deviation from this may cause bugs.
    *
@@ -4814,12 +4814,12 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
               "Non-keyboard/mouse button found in 'win->eventstate->type = %d'",
               event_state->type);
   }
-  if ((event_state->prevtype || event_state->prevval) && /* Ignore cleared event state. */
-      !(ISMOUSE_BUTTON(event_state->prevtype) || ISKEYBOARD(event_state->prevtype) ||
+  if ((event_state->prev_type || event_state->prev_val) && /* Ignore cleared event state. */
+      !(ISMOUSE_BUTTON(event_state->prev_type) || ISKEYBOARD(event_state->prev_type) ||
         (event_state->type == EVENT_NONE))) {
     CLOG_WARN(WM_LOG_HANDLERS,
-              "Non-keyboard/mouse button found in 'win->eventstate->prevtype = %d'",
-              event_state->prevtype);
+              "Non-keyboard/mouse button found in 'win->eventstate->prev_type = %d'",
+              event_state->prev_type);
   }
 #endif
 
@@ -4846,8 +4846,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
         wmEvent event_other = *win_other->eventstate;
 
         /* See comment for this operation on `event` for details. */
-        event_other.prevtype = event_other.type;
-        event_other.prevval = event_other.val;
+        event_other.prev_type = event_other.type;
+        event_other.prev_val = event_other.val;
 
         copy_v2_v2_int(event_other.xy, event.xy);
         event_other.type = MOUSEMOVE;
@@ -4945,8 +4945,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
         wmEvent event_other = *win_other->eventstate;
 
         /* See comment for this operation on `event` for details. */
-        event_other.prevtype = event_other.type;
-        event_other.prevval = event_other.val;
+        event_other.prev_type = event_other.type;
+        event_other.prev_val = event_other.val;
 
         copy_v2_v2_int(event_other.xy, event.xy);
 
@@ -5207,7 +5207,7 @@ void wm_event_add_xrevent(wmWindow *win, wmXrActionData *actiondata, short val)
       .is_repeat = false,
       .custom = EVT_DATA_XR,
       .customdata = actiondata,
-      .customdatafree = 1,
+      .customdata_free = true,
   };
 
   wm_event_add(win, &event);
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index e8d626512ca..ce0f710f4c2 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1412,7 +1412,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr
         event.val = KM_RELEASE;
         event.custom = EVT_DATA_DRAGDROP;
         event.customdata = &wm->drags;
-        event.customdatafree = 1;
+        event.customdata_free = true;
 
         wm_event_add(win, &event);