settings: migrate the auto mouse grab setting to a single-source def file

Performed by tools/settings_migrate_group.py with the standard
battery including the platform-profile lanes and the integrated
enum consolidation stage; the lookup gate's parent baseline is
computed per run.

Author: libretroadmin

configuration.c

@@ -1964,6 +1964,7 @@ static struct config_bool_setting *populate_settings_bool(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_input_auto_mouse_grab.h"
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
 #include "settings/settings_def_input_nowinkey.h"
 #endif
@@ -2224,7 +2225,6 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("input_autodetect_enable",       &settings->bools.input_autodetect_enable, true, DEFAULT_INPUT_AUTODETECT_ENABLE, false);
    SETTING_BOOL("input_turbo_enable",            &settings->bools.input_turbo_enable, true, DEFAULT_TURBO_ENABLE, false);
    SETTING_BOOL("input_turbo_allow_dpad",        &settings->bools.input_turbo_allow_dpad, true, DEFAULT_TURBO_ALLOW_DPAD, false);
-   SETTING_BOOL("input_auto_mouse_grab",         &settings->bools.input_auto_mouse_grab, true, DEFAULT_INPUT_AUTO_MOUSE_GRAB, false);
    SETTING_BOOL("input_remap_binds_enable",      &settings->bools.input_remap_binds_enable, true, true, false);
    SETTING_BOOL("input_remap_sort_by_controller_enable",      &settings->bools.input_remap_sort_by_controller_enable, true, false, false);
    SETTING_BOOL("input_hotkey_device_merge",     &settings->bools.input_hotkey_device_merge, true, DEFAULT_INPUT_HOTKEY_DEVICE_MERGE, false);
@@ -2348,6 +2348,7 @@ static struct config_float_setting *populate_settings_float(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_input_auto_mouse_grab.h"
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
 #include "settings/settings_def_input_nowinkey.h"
 #endif
@@ -2674,6 +2675,7 @@ static struct config_uint_setting *populate_settings_uint(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_input_auto_mouse_grab.h"
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
 #include "settings/settings_def_input_nowinkey.h"
 #endif
@@ -2975,6 +2977,7 @@ static struct config_int_setting *populate_settings_int(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_input_auto_mouse_grab.h"
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
 #include "settings/settings_def_input_nowinkey.h"
 #endif

intl/msg_hash_lbl.h

@@ -1762,10 +1762,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE,
    MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB,
-   MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB_STR
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS,
    MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS_STR

intl/msg_hash_us.c

@@ -537,6 +537,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
 #define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) n,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_input_auto_mouse_grab.h"
 #include "../settings/settings_def_input_nowinkey.h"
 #include "../settings/settings_def_overlay_enable.h"
 #include "../settings/settings_def_microphone.h"
@@ -603,6 +604,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
 #define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_input_auto_mouse_grab.h"
 #include "../settings/settings_def_input_nowinkey.h"
 #include "../settings/settings_def_overlay_enable.h"
 #include "../settings/settings_def_microphone.h"

intl/msg_hash_us.h

@@ -3612,14 +3612,38 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_SENSORS_ENABLE,
    "Enable input from accelerometer, gyroscope and illuminance sensors, if supported by the current hardware. May have a performance impact and/or increase power drain on some platforms."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_INPUT_AUTO_MOUSE_GRAB,
-   "Automatic Mouse Grab"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_INPUT_AUTO_MOUSE_GRAB,
-   "Enable mouse grab on application focus."
-   )
+/* GENERATED REGION: auto mouse grab setting (see settings_def_input_auto_mouse_grab.h). */
+#define SETTINGS_DEF_STRINGS_PASS
+#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#include "../settings/settings_def_input_auto_mouse_grab.h"
+#undef S_BOOL
+#undef S_BOOL_NS
+#undef S_UINT
+#undef S_UINT_NS
+#undef S_INT
+#undef S_INT_NS
+#undef S_FLOAT
+#undef S_FLOAT_NS
+#undef SETTINGS_DEF_STRINGS_PASS
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_AUTO_GAME_FOCUS,
    "Auto Enable 'Game Focus' Mode"

menu/menu_setting.c

@@ -15187,8 +15187,32 @@ static bool setting_append_list(
 
          {
             static const setting_desc_t inp_desc_8[] = {
-               SDESC_BOOL_ROW(input_auto_mouse_grab, INPUT_AUTO_MOUSE_GRAB,
-                     DEFAULT_INPUT_AUTO_MOUSE_GRAB, SD_FLAG_NONE, 0, 0),
+/* GENERATED: rows come from settings_def_input_auto_mouse_grab.h in order. */
+#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
+                  SDESC_BOOL_ROW(f, T, d, sd, df, c),
+#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
+                  SDESC_BOOL_ROW(f, T, d, sd, df, c),
+#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+                  SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+                  SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+                  SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+                  SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
+                  SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
+#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
+                  SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
+#include "../settings/settings_def_input_auto_mouse_grab.h"
+#undef S_BOOL
+#undef S_BOOL_NS
+#undef S_UINT
+#undef S_UINT_NS
+#undef S_INT
+#undef S_INT_NS
+#undef S_FLOAT
+#undef S_FLOAT_NS
             };
             settings_list_add_desc(list, list_info, settings,
                   inp_desc_8, ARRAY_SIZE(inp_desc_8),

msg_hash.h

@@ -1443,7 +1443,44 @@ enum msg_hash_enums
 #endif
 
    MENU_LABEL(INPUT_SENSORS_ENABLE),
-   MENU_LABEL(INPUT_AUTO_MOUSE_GRAB),
+   /* GENERATED REGION: auto mouse grab setting enum rows (see settings/settings_def_input_auto_mouse_grab.h). */
+#define SETTINGS_DEF_ENUM_PASS
+#define SETTINGS_DEF_STRINGS_PASS
+#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
+#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
+#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
+#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
+#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
+#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
+#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
+#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
+#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
+#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
+#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
+#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
+#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
+#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
+#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
+#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
+#include "settings/settings_def_input_auto_mouse_grab.h"
+#undef S_BOOL
+#undef S_BOOL_NS
+#undef S_UINT
+#undef S_UINT_NS
+#undef S_INT
+#undef S_INT_NS
+#undef S_FLOAT
+#undef S_FLOAT_NS
+#undef S_BOOL_H
+#undef S_UINT_H
+#undef S_BOOL_NS_H
+#undef S_INT_H
+#undef S_FLOAT_H
+#undef S_UINT_NS_H
+#undef S_INT_NS_H
+#undef S_FLOAT_NS_H
+#undef SETTINGS_DEF_STRINGS_PASS
+#undef SETTINGS_DEF_ENUM_PASS
 
    MENU_LABEL(INPUT_AUTO_GAME_FOCUS),
    MENU_ENUM_LABEL_VALUE_INPUT_AUTO_GAME_FOCUS_OFF,

msg_hash_lbl_str.h

@@ -445,7 +445,6 @@
 #define MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE_STR "input_autodetect_enable"
 #define MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD_STR "input_android_physical_keyboard"
 #define MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE_STR "input_sensors_enable"
-#define MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB_STR "input_auto_mouse_grab"
 #define MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS_STR "input_auto_game_focus"
 #define MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD_STR "input_axis_threshold"
 #define MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE_STR "input_analog_deadzone"

settings/settings_def_input_auto_mouse_grab.h

@@ -0,0 +1,11 @@
+/* Single-source definitions: auto mouse grab setting.
+ * Grammar identical to settings_def_video_sync.h plus S_FLOAT and
+ * the _NS no-sublabel variants; the descriptor argument span
+ * matches SDESC_<kind>_ROW; row order is menu display order;
+ * h2json.py parses these rows for the Crowdin source upload. */
+
+S_BOOL(input_auto_mouse_grab, INPUT_AUTO_MOUSE_GRAB,
+      "input_auto_mouse_grab",
+      DEFAULT_INPUT_AUTO_MOUSE_GRAB, SD_FLAG_NONE, 0, 0,
+      "Automatic Mouse Grab",
+      "Enable mouse grab on application focus.")