Cleanup: unhyphenate track-pad & thumb-stick

Both are typically written without hyphenation, add to local dictionary.
2023-12-15 22:54:55 +11:00
parent 422dd9404f
commit 9097f1c62d
14 changed files with 21 additions and 19 deletions
@@ -325,7 +325,7 @@ class GHOST_SystemCocoa : public GHOST_System {

  /** Temporarily ignore momentum scroll events */
  bool m_ignoreMomentumScroll;
-  /** Is the scroll wheel event generated by a multi-touch track-pad or mouse? */
+  /** Is the scroll wheel event generated by a multi-touch trackpad or mouse? */
  bool m_multiTouchScroll;
  /** To prevent multiple warp, we store the time of the last warp event
   * and ignore mouse moved events generated before that. */
@@ -549,7 +549,7 @@ GHOST_SystemCocoa::GHOST_SystemCocoa()
  sysctl(mib, 2, &boottime, &len, nullptr, 0);
  m_start_time = ((boottime.tv_sec * 1000) + (boottime.tv_usec / 1000));

-  /* Detect multi-touch track-pad. */
+  /* Detect multi-touch trackpad. */
  mib[0] = CTL_HW;
  mib[1] = HW_MODEL;
  sysctl(mib, 2, nullptr, &len, nullptr, 0);
@@ -3874,7 +3874,7 @@ static void gesture_pinch_handle_begin(void *data,
  seat->pointer_gesture_pinch.rotation.factor = 5;

  if (win) {
-    /* NOTE(@ideasman42): Blender's use of track-pad coordinates is inconsistent and needs work.
+    /* NOTE(@ideasman42): Blender's use of trackpad coordinates is inconsistent and needs work.
     * This isn't specific to WAYLAND, in practice they tend to work well enough in most cases.
     * Some operators scale by the UI scale, some don't.
     * Even though the window scale is correct, it doesn't account for the UI scale preference
@@ -539,7 +539,7 @@ static void flyEvent(FlyInfo *fly, const wmEvent *event)
        fly->state = FLY_CONFIRM;
        break;
      }
-      /* Speed adjusting with mouse-pan (track-pad). */
+      /* Speed adjusting with mouse-pan (trackpad). */
      case FLY_MODAL_SPEED: {
        float fac = 0.02f * float(event->prev_xy[1] - event->xy[1]);

@@ -703,7 +703,7 @@ bool ED_view3d_camera_lock_undo_test(const View3D *v3d, const RegionView3D *rv3d
 /**
 * Create a MEMFILE undo-step for locked camera movement when transforming the view.
 * Edit and texture paint mode don't use MEMFILE undo so undo push is skipped for them.
- * NDOF and track-pad navigation would create an undo step on every gesture and we may end up with
+ * NDOF and trackpad navigation would create an undo step on every gesture and we may end up with
 * unnecessary undo steps so undo push for them is not supported for now.
 * Operators that use smooth view for navigation are supported via an optional parameter field,
 * see: #V3D_SmoothParams.undo_str.
@@ -1010,8 +1010,8 @@ void ED_view3d_quadview_update(ScrArea *area, ARegion *region, bool do_clip)
 /* -------------------------------------------------------------------- */
 /** \name View Auto-Depth Last State Access
 *
- * Calling consecutive track-pad gestures reuses the previous offset to prevent
- * each track-pad event using a different offset, see: #103263.
+ * Calling consecutive trackpad gestures reuses the previous offset to prevent
+ * each trackpad event using a different offset, see: #103263.
 * \{ */

 static const char *view3d_autodepth_last_id = "view3d_autodist_last";
@@ -267,7 +267,7 @@ enum {
  TFM_MODAL_NODE_ATTACH_ON = 24,
  TFM_MODAL_NODE_ATTACH_OFF = 25,

-  /** For analog input, like track-pad. */
+  /** For analog input, like trackpad. */
  TFM_MODAL_PROPSIZE = 26,
  /** Node editor insert offset (also called auto-offset) direction toggle. */
  TFM_MODAL_INSERTOFS_TOGGLE_DIR = 27,
@@ -92,7 +92,7 @@ typedef enum eXrHapticFlag {
 } eXrHapticFlag;

 /**
- * For axis-based inputs (thumb-stick/track-pad/etc).
+ * For axis-based inputs (thumbstick/trackpad/etc).
 * Determines the region for action execution (mutually exclusive per axis).
 */
 typedef enum eXrAxisFlag {
@@ -6239,7 +6239,7 @@ static void rna_def_userdef_input(BlenderRNA *brna)
  RNA_def_property_ui_text(prop,
                           "Mouse Drag Threshold",
                           "Number of pixels to drag before a drag event is triggered "
-                           "for mouse/track-pad input "
+                           "for mouse/trackpad input "
                           "(otherwise click events are detected)");

  prop = RNA_def_property(srna, "drag_threshold_tablet", PROP_INT, PROP_PIXEL);
@@ -2166,13 +2166,13 @@ static void rna_def_event(BlenderRNA *brna)
  RNA_def_property_boolean_funcs(prop, "rna_Event_is_repeat_get", nullptr);
  RNA_def_property_ui_text(prop, "Is Repeat", "The event is generated by holding a key down");

-  /* Track-pad & NDOF. */
+  /* Trackpad & NDOF. */
  prop = RNA_def_property(srna, "is_consecutive", PROP_BOOLEAN, PROP_NONE);
  RNA_def_property_clear_flag(prop, PROP_EDITABLE);
  RNA_def_property_boolean_funcs(prop, "rna_Event_is_consecutive_get", nullptr);
  RNA_def_property_ui_text(prop,
                           "Is Consecutive",
-                           "Part of a track-pad or NDOF motion, "
+                           "Part of a trackpad or NDOF motion, "
                           "interrupted by cursor motion, button or key press events");

  /* mouse */
@@ -1364,7 +1364,7 @@ static const EnumPropertyItem rna_enum_xr_action_types[] = {
     "VECTOR2D",
     0,
     "Vector2D",
-     "2D float vector action, representing a thumb-stick or track-pad"},
+     "2D float vector action, representing a thumbstick or trackpad"},
    {XR_POSE_INPUT,
     "POSE",
     0,
@@ -632,11 +632,11 @@ enum eWM_EventFlag {
   */
  WM_EVENT_IS_REPEAT = (1 << 1),
  /**
-   * Generated for consecutive track-pad or NDOF-motion events,
+   * Generated for consecutive trackpad or NDOF-motion events,
   * the repeat chain is broken by key/button events,
   * or cursor motion exceeding #WM_EVENT_CURSOR_MOTION_THRESHOLD.
   *
-   * Changing the type of track-pad or gesture event also breaks the chain.
+   * Changing the type of trackpad or gesture event also breaks the chain.
   */
  WM_EVENT_IS_CONSECUTIVE = (1 << 2),
  /**
@@ -674,7 +674,7 @@ struct wmTabletData {
 *   See: #ISKEYBOARD_OR_BUTTON.
 *
 * - Previous x/y are exceptions: #wmEvent.prev
- *   these are set on mouse motion, see #MOUSEMOVE & track-pad events.
+ *   these are set on mouse motion, see #MOUSEMOVE & trackpad events.
 *
 * - 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).
@@ -5343,7 +5343,7 @@ static wmEvent *wm_event_add_mousemove_to_head(wmWindow *win)

 static wmEvent *wm_event_add_trackpad(wmWindow *win, const wmEvent *event, int deltax, int deltay)
 {
-  /* Ignore in between track-pad events for performance, we only need high accuracy
+  /* Ignore in between trackpad events for performance, we only need high accuracy
   * for painting with mouse moves, for navigation using the accumulated value is ok. */
  const wmEvent *event_last = static_cast<wmEvent *>(win->event_queue.last);
  if (event_last && event_last->type == event->type) {
@@ -58,7 +58,7 @@ enum {
  /* More mouse buttons - can't use 9 and 10 here (wheel) */
  BUTTON6MOUSE = 0x0012,
  BUTTON7MOUSE = 0x0013,
-  /* Extra track-pad gestures (check #WM_EVENT_IS_CONSECUTIVE to detect motion events). */
+  /* Extra trackpad gestures (check #WM_EVENT_IS_CONSECUTIVE to detect motion events). */
  MOUSEPAN = 0x000e,
  MOUSEZOOM = 0x000f,
  MOUSEROTATE = 0x0010,
@@ -415,7 +415,7 @@ enum {
        BUTTON7MOUSE))
 /** Test whether the event is a mouse wheel. */
 #define ISMOUSE_WHEEL(event_type) ((event_type) >= WHEELUPMOUSE && (event_type) <= WHEELOUTMOUSE)
-/** Test whether the event is a mouse (track-pad) gesture. */
+/** Test whether the event is a mouse (trackpad) gesture. */
 #define ISMOUSE_GESTURE(event_type) ((event_type) >= MOUSEPAN && (event_type) <= MOUSESMARTZOOM)

 /** Test whether the event is a NDOF event. */
@@ -380,8 +380,10 @@ dict_custom = {
    "teleporting",
    "templating",
    "tertiarily",
+    "thumbstick",
    "tokenize",
    "tokenizing",
+    "trackpad",
    "transcode",
    "transmissive",
    "triaging",