overlay: add user-configurable Minimal Overlay Preset (FR #18178)

Wire up the minimal-preset path that the conditional resolver was
already returning OVERLAY_PROFILE_MINIMAL for. Before this commit the
master enum + English strings existed but the menu entry, file
browser, default constant, and resolver fallback were not connected.

- file_path_special.h: FILE_PATH_DEFAULT_OVERLAY_MINIMAL =
  "gamepads/neo-retropad/neo-retropad_collapsed.cfg".
- configuration.c: fill settings->paths.path_overlay_minimal with the
  default at config-defaults time (mirrors path_overlay).
- menu/menu_setting.c: CONFIG_PATH for path_overlay_minimal under the
  overlay group; emits CMD_EVENT_OVERLAY_INIT on change. Also remove
  the obsolete "Hide When Controller Connected" bool menu entry - it
  is superseded by input_overlay_behavior. cfg key + migration remain
  for downgrade safety.
- menu/cbs/menu_cbs.h, menu_cbs_ok.c: ACTION_OK_DL_INPUT_OVERLAY_MINIMAL_PRESET
  with the same expansion+archive-delim handling the main preset uses.
- intl/msg_hash_lbl.h, msg_hash_lbl_str.h: register the label enum and
  cfg key "input_overlay_minimal".
- input/input_driver.{h,c}: extend overlay_resolve_profile() with a
  minimal_available parameter. When CONDITIONAL is selected and the
  user has not set a minimal preset, downgrade MINIMAL to FULL so the
  caller's state machine stays consistent with what input_overlay_path()
  will actually return. Removes the runtime fallback inside
  input_overlay_path() (the resolver handles it now). Three call sites
  updated (input_overlay_want_hidden, input_overlay_loaded, input_overlay_path).
- runloop.c: pass minimal_available into the runloop resolver call.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: f4mrfaux

configuration.c

@@ -3359,6 +3359,11 @@ void config_set_defaults(void *data)
                settings->paths.directory_overlay,
                FILE_PATH_DEFAULT_OVERLAY,
                sizeof(settings->paths.path_overlay));
+      /* No default for path_overlay_minimal: leave it empty so the
+       * resolver falls back to the main preset until the user explicitly
+       * picks a minimal preset via Settings -> On-Screen Display -> On-Screen
+       * Overlay -> Minimal Overlay Preset. Avoids pointing at an asset that
+       * may not ship in the user's overlay bundle. */
       if (!*settings->paths.path_osk_overlay)
          fill_pathname_join_special(settings->paths.path_osk_overlay,
                settings->paths.directory_overlay,
@@ -4021,7 +4026,10 @@ static bool config_load_file(global_t *global,
       const char *extra_path = NULL;
 #ifdef HAVE_OVERLAY
       char old_overlay_path[PATH_MAX_LENGTH], new_overlay_path[PATH_MAX_LENGTH];
+      char old_overlay_minimal_path[PATH_MAX_LENGTH], new_overlay_minimal_path[PATH_MAX_LENGTH];
       config_get_path(conf, "input_overlay", old_overlay_path, sizeof(old_overlay_path));
+      config_get_path(conf, "input_overlay_minimal",
+            old_overlay_minimal_path, sizeof(old_overlay_minimal_path));
 #endif
       strlcpy(tmp_append_path, path_get(RARCH_PATH_CONFIG_OVERRIDE),
             sizeof(tmp_append_path));
@@ -4051,6 +4059,11 @@ static bool config_load_file(global_t *global,
       config_get_path(conf, "input_overlay", new_overlay_path, sizeof(new_overlay_path));
       if (!string_is_equal(old_overlay_path, new_overlay_path))
          retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_OVERLAY_PRESET, NULL);
+      config_get_path(conf, "input_overlay_minimal",
+            new_overlay_minimal_path, sizeof(new_overlay_minimal_path));
+      if (!string_is_equal(old_overlay_minimal_path, new_overlay_minimal_path))
+         retroarch_override_setting_set(
+               RARCH_OVERRIDE_SETTING_OVERLAY_MINIMAL_PRESET, NULL);
 #endif
    }
 

input/input_driver.c

@@ -6174,16 +6174,19 @@ void input_overlay_set_visibility(int overlay_idx,
  * it is safe to call every frame.  Additional input sources (e.g. an active
  * stylus) can be added as parameters here without touching the call sites. */
 enum overlay_profile overlay_resolve_profile(
-      unsigned behavior, bool controller_connected)
+      unsigned behavior, bool controller_connected,
+      bool minimal_available)
 {
    switch (behavior)
    {
       case OVERLAY_BEHAVIOR_HIDE_WHEN_GAMEPAD:
          return controller_connected
             ? OVERLAY_PROFILE_HIDDEN : OVERLAY_PROFILE_FULL;
       case OVERLAY_BEHAVIOR_CONDITIONAL:
-         return controller_connected
-            ? OVERLAY_PROFILE_MINIMAL : OVERLAY_PROFILE_FULL;
+         if (controller_connected)
+            return minimal_available
+               ? OVERLAY_PROFILE_MINIMAL : OVERLAY_PROFILE_FULL;
+         return OVERLAY_PROFILE_FULL;
       case OVERLAY_BEHAVIOR_STATIC:
       default:
          break;
@@ -6207,7 +6210,9 @@ static bool input_overlay_want_hidden(void)
    {
       unsigned behavior         = settings->uints.input_overlay_behavior;
       bool controller_connected = (input_config_get_device_name(0) != NULL);
-      if (overlay_resolve_profile(behavior, controller_connected)
+      bool minimal_available    = (*settings->paths.path_overlay_minimal != '\0');
+      if (overlay_resolve_profile(behavior, controller_connected,
+               minimal_available)
             == OVERLAY_PROFILE_HIDDEN)
          hide = true;
    }
@@ -6346,7 +6351,8 @@ static void input_overlay_loaded(retro_task_t *task,
       if (enable_overlay
             && settings->bools.input_overlay_pointer_enable
             && overlay_resolve_profile(behavior,
-                  input_config_get_device_name(0) != NULL)
+                  input_config_get_device_name(0) != NULL,
+                  *settings->paths.path_overlay_minimal != '\0')
                == OVERLAY_PROFILE_HIDDEN)
          ol->flags |= INPUT_OVERLAY_GAMEPAD_HIDDEN;
    }
@@ -6387,20 +6393,18 @@ static const char *input_overlay_path(bool want_osk)
       return settings->paths.path_osk_overlay;
 
    /* Conditional profiles: when the resolved profile is MINIMAL, skip the
-    * auto-preferred lookup and return the user's minimal preset directly,
-    * falling back to the full preset when it is unset. */
+    * auto-preferred lookup and return the user's minimal preset directly.
+    * The resolver only returns MINIMAL when the path is non-empty, so no
+    * further fallback is needed here. */
    {
       unsigned             behavior          = settings->uints.input_overlay_behavior;
       bool                 controller_active = (input_config_get_device_name(0) != NULL);
+      bool                 minimal_available = (*settings->paths.path_overlay_minimal != '\0');
       enum overlay_profile profile           = overlay_resolve_profile(
-            behavior, controller_active);
+            behavior, controller_active, minimal_available);
 
       if (profile == OVERLAY_PROFILE_MINIMAL)
-      {
-         if (*settings->paths.path_overlay_minimal)
-            return settings->paths.path_overlay_minimal;
-         return settings->paths.path_overlay;
-      }
+         return settings->paths.path_overlay_minimal;
    }
 
    /* If the option is set to turn this off, just return default */

input/input_driver.h

@@ -1141,9 +1141,13 @@ void input_overlay_unload(void);
 void input_overlay_init(void);
 
 /* Conditional overlay profiles (FR #18178): pure resolver mapping the
- * behaviour mode + controller state to the overlay profile to show. */
+ * behaviour mode + controller state to the overlay profile to show.
+ * minimal_available must be true iff a non-empty Minimal Overlay Preset path
+ * is configured; when false the resolver downgrades MINIMAL to FULL so the
+ * caller's state machine stays in sync with what will actually be loaded. */
 enum overlay_profile overlay_resolve_profile(
-      unsigned behavior, bool controller_connected);
+      unsigned behavior, bool controller_connected,
+      bool minimal_available);
 
 void input_overlay_check_mouse_cursor(void);
 #endif

intl/msg_hash_lbl.h

@@ -2736,6 +2736,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_OVERLAY_PRESET,
    MENU_ENUM_LABEL_OVERLAY_PRESET_STR
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET,
+   MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET_STR
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_OSK_OVERLAY_PRESET,
    MENU_ENUM_LABEL_OSK_OVERLAY_PRESET_STR

menu/cbs/menu_cbs_ok.c

@@ -1130,6 +1130,32 @@ int generic_action_ok_displaylist_push(
                   parent_dir, sizeof(parent_dir), true);
          }
 
+         info_path          = parent_dir;
+         break;
+      case ACTION_OK_DL_INPUT_OVERLAY_MINIMAL_PRESET:
+         filebrowser_set_type(FILEBROWSER_SELECT_OVERLAY);
+         info.directory_ptr = idx;
+         info_label         = MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET_STR;
+         info.enum_idx      = MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET;
+         dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
+
+         {
+            char expanded[PATH_MAX_LENGTH];
+            fill_pathname_expand_special(expanded,
+                  settings->paths.path_overlay_minimal, sizeof(expanded));
+#ifdef HAVE_COMPRESSION
+            {
+               char *delim = (char*)path_get_archive_delim(expanded);
+               if (delim)
+                  *delim = '\0';
+            }
+#endif
+            action_ok_get_file_browser_start_path(
+                  expanded,
+                  settings->paths.directory_overlay,
+                  parent_dir, sizeof(parent_dir), true);
+         }
+
          info_path          = parent_dir;
          break;
       case ACTION_OK_DL_OSK_OVERLAY_PRESET:
@@ -2476,7 +2502,18 @@ static int generic_action_ok(const char *path,
          break;
       case ACTION_OK_SET_PATH_OVERLAY:
          flush_char = MENU_ENUM_LABEL_DEFERRED_ONSCREEN_OVERLAY_SETTINGS_LIST_STR;
-         retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_OVERLAY_PRESET, NULL);
+         /* Both the main and minimal overlay-preset file pickers reach this
+          * case (both register FILEBROWSER_SELECT_OVERLAY). Dispatch the
+          * override flag based on which setting the user is editing so the
+          * minimal-preset path participates in per-game / per-core overrides
+          * symmetrically with the main preset. */
+         if (string_is_equal(menu_label,
+                  MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET_STR))
+            retroarch_override_setting_set(
+                  RARCH_OVERRIDE_SETTING_OVERLAY_MINIMAL_PRESET, NULL);
+         else
+            retroarch_override_setting_set(
+                  RARCH_OVERRIDE_SETTING_OVERLAY_PRESET, NULL);
          ret        = set_path_generic(menu_label, action_path);
          break;
       case ACTION_OK_SET_PATH_OSK_OVERLAY:
@@ -6691,6 +6728,7 @@ STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_push_generic_list, ACTION_OK_DL_GENERIC)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_audio_dsp_plugin, ACTION_OK_DL_AUDIO_DSP_PLUGIN)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_video_filter, ACTION_OK_DL_VIDEO_FILTER)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_overlay_preset, ACTION_OK_DL_OVERLAY_PRESET)
+STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_input_overlay_minimal_preset, ACTION_OK_DL_INPUT_OVERLAY_MINIMAL_PRESET)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_osk_overlay_preset, ACTION_OK_DL_OSK_OVERLAY_PRESET)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_video_font, ACTION_OK_DL_VIDEO_FONT)
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_rpl_entry, ACTION_OK_DL_RPL_ENTRY)
@@ -9324,6 +9362,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          {MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN,                    action_ok_audio_dsp_plugin},
          {MENU_ENUM_LABEL_VIDEO_FILTER,                        action_ok_video_filter},
          {MENU_ENUM_LABEL_OVERLAY_PRESET,                      action_ok_overlay_preset},
+         {MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET,        action_ok_input_overlay_minimal_preset},
          {MENU_ENUM_LABEL_OSK_OVERLAY_PRESET,                  action_ok_osk_overlay_preset},
          {MENU_ENUM_LABEL_RECORD_CONFIG,                       action_ok_record_configfile},
          {MENU_ENUM_LABEL_STREAM_CONFIG,                       action_ok_stream_configfile},
@@ -9579,6 +9618,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          {MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN,                    action_ok_audio_dsp_plugin},
          {MENU_ENUM_LABEL_VIDEO_FILTER,                        action_ok_video_filter},
          {MENU_ENUM_LABEL_OVERLAY_PRESET,                      action_ok_overlay_preset},
+         {MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET,        action_ok_input_overlay_minimal_preset},
          {MENU_ENUM_LABEL_OSK_OVERLAY_PRESET,                  action_ok_osk_overlay_preset},
          {MENU_ENUM_LABEL_REMAP_FILE_LOAD,                     action_ok_remap_file},
          {MENU_ENUM_LABEL_OVERRIDE_FILE_LOAD,                  action_ok_override_file},

menu/menu_cbs.h

@@ -84,6 +84,7 @@ enum
    ACTION_OK_DL_AUDIO_DSP_PLUGIN,
    ACTION_OK_DL_VIDEO_FILTER,
    ACTION_OK_DL_OVERLAY_PRESET,
+   ACTION_OK_DL_INPUT_OVERLAY_MINIMAL_PRESET,
    ACTION_OK_DL_OSK_OVERLAY_PRESET,
    ACTION_OK_DL_VIDEO_FONT,
    ACTION_OK_DL_SHADER_PASS,

menu/menu_setting.c

@@ -18136,22 +18136,10 @@ static bool setting_append_list(
                );
          (*list)[list_info->index - 1].change_handler = overlay_enable_toggle_change_handler;
 
-         CONFIG_BOOL(
-               list, list_info,
-               &settings->bools.input_overlay_hide_when_gamepad_connected,
-               MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_WHEN_GAMEPAD_CONNECTED,
-               MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_WHEN_GAMEPAD_CONNECTED,
-               DEFAULT_OVERLAY_HIDE_WHEN_GAMEPAD_CONNECTED,
-               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
-               );
-         (*list)[list_info->index - 1].change_handler = overlay_enable_toggle_change_handler;
+         /* Legacy "Hide When Controller Is Connected" bool is superseded by
+          * input_overlay_behavior (FR #18178). The cfg key + migration in
+          * configuration.c are kept for downgrade safety; the menu entry is
+          * intentionally not registered so users see only the new enum. */
 
          CONFIG_UINT(
                list, list_info,

msg_hash_lbl_str.h

@@ -685,6 +685,7 @@
 #define MENU_ENUM_LABEL_OVERLAY_OPACITY_STR "input_overlay_opacity"
 #define MENU_ENUM_LABEL_OSK_OVERLAY_OPACITY_STR "input_osk_overlay_opacity"
 #define MENU_ENUM_LABEL_OVERLAY_PRESET_STR "input_overlay"
+#define MENU_ENUM_LABEL_INPUT_OVERLAY_MINIMAL_PRESET_STR "input_overlay_minimal"
 #define MENU_ENUM_LABEL_OSK_OVERLAY_PRESET_STR "input_osk_overlay"
 #define MENU_ENUM_LABEL_OVERLAY_SCALE_LANDSCAPE_STR "input_overlay_scale_landscape"
 #define MENU_ENUM_LABEL_OVERLAY_ASPECT_ADJUST_LANDSCAPE_STR "input_overlay_aspect_adjust_landscape"

retroarch.c

@@ -5865,6 +5865,9 @@ void retroarch_override_setting_set(
       case RARCH_OVERRIDE_SETTING_OVERLAY_PRESET:
          p_rarch->flags |= RARCH_FLAGS_HAS_SET_OVERLAY_PRESET;
          break;
+      case RARCH_OVERRIDE_SETTING_OVERLAY_MINIMAL_PRESET:
+         p_rarch->flags |= RARCH_FLAGS_HAS_SET_OVERLAY_MINIMAL_PRESET;
+         break;
       case RARCH_OVERRIDE_SETTING_NONE:
       default:
          break;
@@ -5950,6 +5953,9 @@ void retroarch_override_setting_unset(
       case RARCH_OVERRIDE_SETTING_OVERLAY_PRESET:
          p_rarch->flags &= ~RARCH_FLAGS_HAS_SET_OVERLAY_PRESET;
          break;
+      case RARCH_OVERRIDE_SETTING_OVERLAY_MINIMAL_PRESET:
+         p_rarch->flags &= ~RARCH_FLAGS_HAS_SET_OVERLAY_MINIMAL_PRESET;
+         break;
       case RARCH_OVERRIDE_SETTING_NONE:
       default:
          break;
@@ -8821,6 +8827,8 @@ bool retroarch_override_setting_is_set(
          return ((p_rarch->flags & RARCH_FLAGS_CLI_DATABASE_SCAN) > 0);
       case RARCH_OVERRIDE_SETTING_OVERLAY_PRESET:
          return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_OVERLAY_PRESET) > 0);
+      case RARCH_OVERRIDE_SETTING_OVERLAY_MINIMAL_PRESET:
+         return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_OVERLAY_MINIMAL_PRESET) > 0);
       case RARCH_OVERRIDE_SETTING_NONE:
       default:
          break;

retroarch.h

@@ -112,7 +112,8 @@ enum rarch_state_flags
    RARCH_FLAGS_CLI_DATABASE_SCAN            = (1 << 14),
    RARCH_FLAGS_HAS_SET_XDELTA_PREF          = (1 << 15),
    RARCH_FLAGS_XDELTA_PREF                  = (1 << 16),
-   RARCH_FLAGS_HAS_SET_OVERLAY_PRESET       = (1 << 17)
+   RARCH_FLAGS_HAS_SET_OVERLAY_PRESET       = (1 << 17),
+   RARCH_FLAGS_HAS_SET_OVERLAY_MINIMAL_PRESET = (1 << 18)
 };
 
 bool retroarch_ctl(enum rarch_ctl_state state, void *data);