Add confirmation messagebox structure (#19059)

Author: sonninnos

input/input_driver.c

@@ -7998,6 +7998,8 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
        * port 0 */
       if (!display_kb && input && input->input_state)
       {
+         struct menu_state *menu_st  = menu_state_get_ptr();
+         bool swap_ok_cancel_buttons = settings->bools.input_menu_swap_ok_cancel_buttons;
          unsigned i;
          unsigned ids[][2] =
          {
@@ -8021,15 +8023,22 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
             {0,                RARCH_UI_COMPANION_TOGGLE     },
             {0,                RARCH_FPS_TOGGLE              },
             {0,                RARCH_NETPLAY_HOST_TOGGLE     },
+            {0,                RARCH_BIND_LIST_END_NULL      },
          };
 
          ids[14][0] = input_config_binds[0][RARCH_QUIT_KEY].key;
          ids[15][0] = input_config_binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key;
          ids[16][0] = input_config_binds[0][RARCH_UI_COMPANION_TOGGLE].key;
          ids[17][0] = input_config_binds[0][RARCH_FPS_TOGGLE].key;
          ids[18][0] = input_config_binds[0][RARCH_NETPLAY_HOST_TOGGLE].key;
+         ids[19][0] = RETROK_ESCAPE;
 
-         if (settings->bools.input_menu_swap_ok_cancel_buttons)
+         /* Escape cancels dialogs */
+         if (menu_st && menu_st->driver_data && *menu_st->driver_data->menu_state_msg)
+            ids[19][1] = (swap_ok_cancel_buttons)
+                  ? RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B;
+
+         if (swap_ok_cancel_buttons)
          {
             ids[0][1] = RETRO_DEVICE_ID_JOYPAD_B;
             ids[1][1] = RETRO_DEVICE_ID_JOYPAD_A;
@@ -8046,7 +8055,14 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
                      !!(input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED),
                      0,
                      RETRO_DEVICE_KEYBOARD, 0, ids[i][0]))
+            {
+               /* Wait for release when closing dialogs with Escape,
+                * otherwise quit hotkey will also get triggered */
+               if (ids[i][0] == RETROK_ESCAPE && ids[19][1] != RARCH_BIND_LIST_END_NULL)
+                  input_st->flags |= INP_FLAG_WAIT_INPUT_RELEASE;
+
                BIT256_SET_PTR(current_bits, ids[i][1]);
+            }
          }
       }
       else if (display_kb && input && input->input_state)

menu/cbs/menu_cbs_ok.c

@@ -5828,79 +5828,87 @@ static int action_ok_core_options_flush(const char *path,
    return 0;
 }
 
-int action_ok_close_content(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx)
+static int action_ok_dialog_init(struct menu_state *menu_st)
 {
-   int ret;
-   struct menu_state   *menu_st = menu_state_get_ptr();
-   bool contentless_core        = false;
-
-   /* Reset navigation pointer
-    * > If we are returning to the quick menu, want
-    *   the active entry to be 'Run' (first item in
-    *   menu list) */
-   menu_st->selection_ptr       = 0;
-
-   /* Check if we need to quit */
-   if (should_quit_on_close())
-      return generic_action_ok_command(CMD_EVENT_QUIT);
-
-   /* Otherwise, unload core */
-   ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE);
-
-   /* If close content was selected via any means other than
-    * 'Playlist > Quick Menu', have to flush the menu stack
-    * (otherwise users will be presented with an empty
-    * 'No items' quick menu, requiring needless backwards
-    * navigation) */
-   if (type == MENU_SETTING_ACTION_CLOSE)
-   {
-      const char *parent_label   = NULL;
-      const char *flush_target   = MENU_ENUM_LABEL_MAIN_MENU_STR;
-      file_list_t *list          = NULL;
-      if (menu_st->entries.list)
-         list                    = MENU_LIST_GET(menu_st->entries.list, 0);
-      if (list && (list->size > 1))
-      {
-         parent_label = list->list[list->size - 2].label;
+   menu_displaylist_info_t info;
+   menu_list_t *menu_list        = menu_st->entries.list;
+   file_list_t *menu_stack       = MENU_LIST_GET(menu_list, 0);
+   size_t selection              = menu_st->selection_ptr;
+   settings_t *settings          = config_get_ptr();
+#ifdef HAVE_AUDIOMIXER
+   bool audio_enable_menu        = settings->bools.audio_enable_menu;
+   bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
+#endif
 
-         if (   string_is_equal(parent_label, MENU_ENUM_LABEL_CONTENTLESS_CORES_TAB_STR)
-             || string_is_equal(parent_label, MENU_ENUM_LABEL_DEFERRED_CONTENTLESS_CORES_LIST_STR))
-         {
-            flush_target = parent_label;
-            contentless_core = true;
-         }
-      }
+   menu_displaylist_info_init(&info);
+
+   info.list                    = menu_stack;
+   info.directory_ptr           = selection;
+   info.enum_idx                = MENU_ENUM_LABEL_INFO_SCREEN;
+   info.label                   = strdup(MENU_ENUM_LABEL_INFO_SCREEN_STR);
+
+   if (!menu_displaylist_ctl(DISPLAYLIST_HELP, &info, settings))
+      goto error;
+
+#ifdef HAVE_AUDIOMIXER
+   if (audio_enable_menu && audio_enable_menu_notice)
+      audio_driver_mixer_play_menu_sound(AUDIO_MIXER_SYSTEM_SLOT_NOTICE);
+#endif
+
+   if (!menu_displaylist_process(&info))
+      goto error;
+
+   menu_displaylist_info_free(&info);
+   return 0;
+
+error:
+   menu_displaylist_info_free(&info);
+   return -1;
+}
+
+int action_ok_quit(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   settings_t *settings       = config_get_ptr();
 
-      menu_entries_flush_stack(flush_target, 0);
-      /* An annoyance - some menu drivers (Ozone...) set
-       * MENU_ST_FLAG_PREVENT_POPULATE in awkward places,
-       * which can cause breakage here when flushing
-       * the menu stack. We therefore have to unset
-       * MENU_ST_FLAG_PREVENT_POPULATE */
-      menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE;
+   if (settings->bools.confirm_quit)
+   {
+      struct menu_state *menu_st = menu_state_get_ptr();
+      menu_dialog_confirm_set(menu_st, MSG_PRESS_AGAIN_TO_QUIT, CMD_EVENT_QUIT);
+      return action_ok_dialog_init(menu_st);
    }
+   return generic_action_ok_command(CMD_EVENT_QUIT);
+}
 
-   /* Single-click playlist return */
-   if (config_get_ptr()->bools.input_menu_singleclick_playlists && !contentless_core)
+int action_ok_restart_content(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   settings_t *settings       = config_get_ptr();
+
+   if (settings->bools.confirm_reset)
    {
-      size_t new_selection = menu_st->selection_ptr;
-      menu_entries_pop_stack(&new_selection, 0, 0);
-      menu_st->selection_ptr = new_selection;
-      menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE;
+      struct menu_state *menu_st = menu_state_get_ptr();
+      menu_dialog_confirm_set(menu_st, MSG_PRESS_AGAIN_TO_RESET, CMD_EVENT_RESET);
+      return action_ok_dialog_init(menu_st);
    }
+   return generic_action_ok_command(CMD_EVENT_RESET);
+}
 
-   /* Try to reload last core if loaded manually */
-   menu_st->flags |= MENU_ST_FLAG_PENDING_RELOAD_CORE;
+int action_ok_close_content(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   settings_t *settings       = config_get_ptr();
 
-   return ret;
+   if (settings->bools.confirm_close)
+   {
+      struct menu_state *menu_st = menu_state_get_ptr();
+      menu_dialog_confirm_set(menu_st, MSG_PRESS_AGAIN_TO_CLOSE_CONTENT, CMD_EVENT_CLOSE_CONTENT);
+      return action_ok_dialog_init(menu_st);
+   }
+   return generic_action_ok_command(CMD_EVENT_CLOSE_CONTENT);
 }
 
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_cheat_apply_changes,      CMD_EVENT_CHEATS_APPLY)
-STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_quit,                     CMD_EVENT_QUIT)
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_save_new_config,          CMD_EVENT_MENU_SAVE_CONFIG)
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_save_main_config,         CMD_EVENT_MENU_SAVE_MAIN_CONFIG)
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_resume_content,           CMD_EVENT_RESUME)
-STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_restart_content,          CMD_EVENT_RESET)
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_screenshot,               CMD_EVENT_TAKE_SCREENSHOT)
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 STATIC_DEFAULT_ACTION_OK_CMD_FUNC(action_ok_shader_apply_changes,     CMD_EVENT_SHADERS_APPLY_CHANGES)