menu_setting: move the OSK overlay group into descriptor rows

The first hand-CONFIG builder migrated to def-file rows rather than
just reshaped: the three OSK overlay settings - preset path,
auto-scale toggle, opacity - were built imperatively with their
commands, refresh handlers, ranges and flags poked on afterward.
They are descriptor rows now. The preset's runtime default (the
OSK overlay directory) rides in through the existing _DS variant
that reads the default from a settings field, so even that holdout
needed no new grammar; the auto-scale and opacity customizations
map onto the EX row slots that were already there.

The builder body collapses to one ADD_DESC; the settings dump is
byte-identical, proving every target, default, range, flag,
command and handler reproduced exactly, and the referee reads three
more settings index-faithful and three fewer hand-built. Net 43
lines out of the builder plus a 28-line def file, and - the point
of the exercise - three settings crossed from code the walker can
never swallow into data it can. This is the template for the
thirty-odd hand-CONFIG builders that hold the bulk of the surface;
each movable row that crosses is one the walker eventually reaches.

Author: libretroadmin

menu/menu_setting.c

@@ -15290,6 +15290,13 @@ static void settings_build_overlay(
    }
 }
 
+#ifdef HAVE_OVERLAY
+static const setting_desc_t osk_overlay_desc_0[] = {
+/* GENERATED: rows come from settings_def_osk_overlay.h in order. */
+#include "../settings/settings_def_osk_overlay.h"
+};
+#endif
+
 static void settings_build_osk_overlay(
       settings_t *settings, global_t *global,
       rarch_setting_t **list, rarch_setting_info_t *list_info,
@@ -15310,60 +15317,7 @@ static void settings_build_osk_overlay(
 
       START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
 
-      /* Descriptor holdout: runtime default value. */
-      CONFIG_PATH(
-            list, list_info,
-            settings->paths.path_osk_overlay,
-            sizeof(settings->paths.path_osk_overlay),
-            MENU_ENUM_LABEL_OSK_OVERLAY_PRESET,
-            MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_PRESET,
-            settings->paths.directory_osk_overlay,
-            &group_info,
-            &subgroup_info,
-            parent_group,
-            general_write_handler,
-            general_read_handler);
-      MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "cfg");
-      MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_INIT);
-
-      /* Descriptor holdout: poke tail outside the descriptor grammar. */
-      CONFIG_BOOL(
-            list, list_info,
-            &settings->bools.input_osk_overlay_auto_scale,
-            MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_AUTO_SCALE,
-            MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_AUTO_SCALE,
-            DEFAULT_INPUT_OVERLAY_AUTO_SCALE,
-            MENU_ENUM_LABEL_VALUE_OFF,
-            MENU_ENUM_LABEL_VALUE_ON,
-            &group_info,
-            &subgroup_info,
-            parent_group,
-            general_write_handler,
-            general_read_handler,
-            SD_FLAG_NONE
-            );
-      SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_bool_action_left_with_refresh)
-      SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_bool_action_left_with_refresh)
-      SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_bool_action_right_with_refresh)
-      MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_SET_SCALE_FACTOR);
-      SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
-
-      CONFIG_FLOAT(
-            list, list_info,
-            &settings->floats.input_osk_overlay_opacity,
-            MENU_ENUM_LABEL_OSK_OVERLAY_OPACITY,
-            MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_OPACITY,
-            DEFAULT_INPUT_OVERLAY_OPACITY,
-            "%.2f",
-            &group_info,
-            &subgroup_info,
-            parent_group,
-            general_write_handler,
-            general_read_handler);
-      SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
-      MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_SET_ALPHA_MOD);
-      menu_settings_list_current_add_range(list, list_info, 0, 1, 0.01, true, true);
-      SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
+            ADD_DESC(osk_overlay_desc_0);
 
       GROUP_END();
 #endif
@@ -17937,6 +17891,9 @@ static const settings_desc_table_t settings_desc_registry[] = {
    { frame_throttli_desc_3, (uint16_t)ARRAY_SIZE(frame_throttli_desc_3) },
 #endif
 #ifdef HAVE_GFX_WIDGETS
+#ifdef HAVE_OVERLAY
+   { osk_overlay_desc_0, (uint16_t)ARRAY_SIZE(osk_overlay_desc_0) },
+#endif
    { osn_desc_0, (uint16_t)ARRAY_SIZE(osn_desc_0) },
 #endif
 #ifdef HAVE_GFX_WIDGETS

settings/settings_def_osk_overlay.h

@@ -0,0 +1,28 @@
+/* Single-source definitions: on-screen keyboard overlay group.
+ * 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. */
+
+#ifdef HAVE_OVERLAY
+/* Preset path defaults to the OSK overlay directory at runtime, so
+ * the default rides in via the _DS variant reading that settings
+ * field; the "cfg" filter and overlay-init command are row data. */
+S_PATH_DS(path_osk_overlay, OSK_OVERLAY_PRESET,
+      "osk_overlay_preset",
+      directory_osk_overlay, SD_FLAG_NONE, CMD_EVENT_OVERLAY_INIT, "cfg", NULL, 0,
+      "OSK Overlay Preset",
+      "Select and load an on-screen keyboard overlay preset.")
+/* Auto-scale toggles a live rescale: refresh on left/right/ok and a
+ * scale-factor command, applied automatically. */
+S_BOOL_EX(input_osk_overlay_auto_scale, INPUT_OSK_OVERLAY_AUTO_SCALE,
+      "input_osk_overlay_auto_scale",
+      DEFAULT_INPUT_OVERLAY_AUTO_SCALE, SD_FLAG_CMD_APPLY_AUTO, 0, CMD_EVENT_OVERLAY_SET_SCALE_FACTOR, setting_bool_action_left_with_refresh, NULL, NULL, NULL, setting_bool_action_left_with_refresh, setting_bool_action_right_with_refresh, 0,
+      "Auto-Scale OSK Overlay",
+      "Automatically scale the on-screen keyboard overlay to fit the screen and adjust for aspect ratios.")
+S_FLOAT_EX(input_osk_overlay_opacity, OSK_OVERLAY_OPACITY,
+      "input_osk_overlay_opacity",
+      DEFAULT_INPUT_OVERLAY_OPACITY, "%.2f", SD_FLAG_CMD_APPLY_AUTO, SDESC_RANGE_MINMAX, CMD_EVENT_OVERLAY_SET_ALPHA_MOD, 0.0f, 1.0f, 0.01f, setting_action_ok_uint, NULL, NULL, NULL, NULL, NULL, 0,
+      "OSK Overlay Opacity",
+      "Opacity of the on-screen keyboard overlay.")
+#endif