(RMenu) Move input settings to submenu

frontend/menu/rmenu.c

@@ -229,9 +229,6 @@ static void menu_stack_pop(unsigned menu_type)
       case PATH_MENU:
          selected = FIRST_EMU_AUDIO_SETTING;
          break;
-      case CONTROLS_MENU:
-         selected = FIRST_PATH_SETTING;
-         break;
       case LIBRETRO_CHOICE:
       case INGAME_MENU_CORE_OPTIONS:
       case INGAME_MENU_LOAD_GAME_HISTORY:
@@ -240,6 +237,7 @@ static void menu_stack_pop(unsigned menu_type)
          rgui->frame_buf_show = true;
          break;
       case INGAME_MENU_VIDEO_OPTIONS:
+      case INGAME_MENU_INPUT_OPTIONS:
          selected = FIRST_INGAME_MENU_SETTING;
          rgui->frame_buf_show = true;
          break;
@@ -278,6 +276,9 @@ static void menu_stack_push(unsigned menu_type, bool prev_dir)
       case INGAME_MENU_VIDEO_OPTIONS:
          selected = FIRST_SHADERMAN_SETTING;
          break;
+      case INGAME_MENU_INPUT_OPTIONS:
+         selected = FIRST_CONTROLS_SETTING_PAGE_1;
+         break;
       case GENERAL_VIDEO_MENU:
          selected = FIRST_VIDEO_SETTING;
          break;
@@ -296,9 +297,6 @@ static void menu_stack_push(unsigned menu_type, bool prev_dir)
       case PATH_MENU:
          selected = FIRST_PATH_SETTING;
          break;
-      case CONTROLS_MENU:
-         selected = FIRST_CONTROLS_SETTING_PAGE_1;
-         break;
       default:
          break;
    }
@@ -368,8 +366,13 @@ static void display_menubar(uint8_t menu_type)
          strlcpy(title, "History", sizeof(title));
          break;
       case INGAME_MENU_VIDEO_OPTIONS:
+      case INGAME_MENU_VIDEO_OPTIONS_MODE:
          strlcpy(title, "Video Options", sizeof(title));
          break;
+      case INGAME_MENU_INPUT_OPTIONS:
+      case INGAME_MENU_INPUT_OPTIONS_MODE:
+         strlcpy(title, "Input Options", sizeof(title));
+         break;
       case INGAME_MENU_RESIZE:
          strlcpy(title, "Resize Menu", sizeof(title));
          break;
@@ -397,9 +400,6 @@ static void display_menubar(uint8_t menu_type)
       case PATH_MENU:
          strlcpy(title, "Path", sizeof(title));
          break;
-      case CONTROLS_MENU:
-         strlcpy(title, "Controls", sizeof(title));
-         break;
    }
 
    switch(menu_type)
@@ -1501,7 +1501,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
             return -1;
          }
          break;
-      case INGAME_MENU_RESIZE_MODE:
+      case SETTING_CUSTOM_VIEWPORT:
          if (input & (1ULL << DEVICE_NAV_B))
             menu_stack_push(INGAME_MENU_RESIZE, false);
          break;
@@ -1575,6 +1575,10 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
          if (input & (1ULL << DEVICE_NAV_B))
             menu_stack_push(INGAME_MENU_VIDEO_OPTIONS, false);
          break;
+      case INGAME_MENU_INPUT_OPTIONS_MODE:
+         if (input & (1ULL << DEVICE_NAV_B))
+            menu_stack_push(INGAME_MENU_INPUT_OPTIONS, false);
+         break;
 #ifdef HAVE_SHADER_MANAGER
       case SHADERMAN_LOAD_CGP:
          if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
@@ -1770,14 +1774,14 @@ static int select_setting(void *data, uint64_t input)
          first_setting = FIRST_PATH_SETTING;
          max_settings = MAX_NO_OF_PATH_SETTINGS;
          break;
-      case CONTROLS_MENU:
-         first_setting = FIRST_CONTROLS_SETTING_PAGE_1;
-         max_settings = MAX_NO_OF_CONTROLS_SETTINGS;
-         break;
       case INGAME_MENU:
          first_setting = FIRST_INGAME_MENU_SETTING;
          max_settings = MAX_NO_OF_INGAME_MENU_SETTINGS;
          break;
+      case INGAME_MENU_INPUT_OPTIONS:
+         first_setting = FIRST_CONTROLS_SETTING_PAGE_1;
+         max_settings = MAX_NO_OF_CONTROLS_SETTINGS;
+         break;
       case INGAME_MENU_VIDEO_OPTIONS:
          first_setting = FIRST_SHADERMAN_SETTING;
          max_settings = SHADERMAN_SHADER_LAST;
@@ -2155,7 +2159,7 @@ static int select_setting(void *data, uint64_t input)
             strlcpy(setting_text, rotation_lut[g_extern.console.screen.orientation], sizeof(setting_text));
             strlcpy(comment, "Change orientation of the screen.", sizeof(comment));
             break;
-         case INGAME_MENU_RESIZE_MODE:
+         case SETTING_CUSTOM_VIEWPORT:
             strlcpy(text, "Custom Ratio", sizeof(text));
             strlcpy(setting_text, "...", sizeof(setting_text));
             strlcpy(comment, "Allows you to resize the screen.", sizeof(comment));
@@ -2391,13 +2395,13 @@ static int select_setting(void *data, uint64_t input)
    }
 
    /* back to ROM menu if CIRCLE is pressed */
-   if ((input & (1ULL << DEVICE_NAV_L1)) || (input & (1ULL << DEVICE_NAV_A))
+   if ((input & (1ULL << DEVICE_NAV_A))
          || (input & (1ULL << DEVICE_NAV_MENU)))
       menu_stack_pop(rgui->menu_type);
    else if (input & (1ULL << DEVICE_NAV_R1))
    {
 
-      if (rgui->menu_type != CONTROLS_MENU
+      if (rgui->menu_type != INGAME_MENU_INPUT_OPTIONS
             || rgui->menu_type != INGAME_MENU_VIDEO_OPTIONS
             || rgui->menu_type != INGAME_MENU
             )
@@ -3093,9 +3097,9 @@ int rgui_iterate(rgui_handle_t *rgui)
       case EMU_VIDEO_MENU:
       case EMU_AUDIO_MENU:
       case PATH_MENU:
-      case CONTROLS_MENU:
       case INGAME_MENU:
       case INGAME_MENU_VIDEO_OPTIONS:
+      case INGAME_MENU_INPUT_OPTIONS:
          return select_setting(rgui, rgui->trigger_state);
    }
 

frontend/menu/rmenu.h

@@ -47,7 +47,6 @@ enum
    EMU_VIDEO_MENU,
    EMU_AUDIO_MENU,
    PATH_MENU,
-   CONTROLS_MENU,
 #ifdef HAVE_SHADER_MANAGER
    SHADER_CHOICE,
    CGP_CHOICE,
@@ -67,6 +66,7 @@ enum
    INGAME_MENU_CORE_OPTIONS,
    INGAME_MENU_LOAD_GAME_HISTORY,
    INGAME_MENU_VIDEO_OPTIONS,
+   INGAME_MENU_INPUT_OPTIONS,
    INGAME_MENU_SCREENSHOT,
 };
 
@@ -134,13 +134,13 @@ enum
    INGAME_MENU_CHANGE_GAME,
    INGAME_MENU_CORE_OPTIONS_MODE,
    INGAME_MENU_VIDEO_OPTIONS_MODE,
+   INGAME_MENU_INPUT_OPTIONS_MODE,
    INGAME_MENU_SETTINGS,
    INGAME_MENU_LOAD_STATE,
    INGAME_MENU_SAVE_STATE,
    INGAME_MENU_SCREENSHOT_MODE,
    INGAME_MENU_RETURN_TO_GAME,
    INGAME_MENU_RESET,
-   INGAME_MENU_RESIZE_MODE,
    INGAME_MENU_FRAME_ADVANCE,
 #ifdef HAVE_MULTIMAN
    INGAME_MENU_RETURN_TO_MULTIMAN,
@@ -156,6 +156,7 @@ enum
    SETTING_SOFT_DISPLAY_FILTER,
 #endif
    SETTING_ASPECT_RATIO,
+   SETTING_CUSTOM_VIEWPORT,
    SETTING_ROTATION,
 #ifdef HAVE_SHADER_MANAGER
    SHADERMAN_AUTOSTART_CGP_ON_STARTUP,