Move input_assign_ports_on_button_press up the menu

Author: nijm

config.def.h

@@ -1626,7 +1626,7 @@
 
 /* Map user to core port on first button press. First person
  * to press a button is player 1, second is player 2, etc. */
-#define DEFAULT_INPUT_REMAP_PORTS_ON_BUTTON_PRESS false
+#define DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS false
 
 /* Enables accelerometer/gyroscope/illuminance
  * sensor input, if supported */

configuration.c

@@ -2176,9 +2176,9 @@ 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_assign_ports_on_button_press", &settings->bools.input_assign_ports_on_button_press, true, DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS, 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_assign_ports_on_button_press",   &settings->bools.input_assign_ports_on_button_press, true, DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS, 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);
    SETTING_BOOL("input_hotkey_follows_player1",  &settings->bools.input_hotkey_follows_player1, true, DEFAULT_INPUT_HOTKEY_FOLLOWS_PLAYER1, false);

configuration.h

@@ -700,9 +700,9 @@ typedef struct settings
 #endif
 
       /* Input */
+      bool input_assign_ports_on_button_press;
       bool input_remap_binds_enable;
       bool input_remap_sort_by_controller_enable;
-      bool input_remap_ports_on_button_press;
       bool input_autodetect_enable;
       bool input_sensors_enable;
       bool input_overlay_enable;

input/input_driver.c

@@ -6126,8 +6126,8 @@ void input_driver_poll(void)
       *sec_joypad                 = NULL;
 #endif
    bool input_remap_binds_enable  = settings->bools.input_remap_binds_enable;
-   bool input_remap_ports_on_button_press
-                                  = settings->bools.input_remap_ports_on_button_press;
+   bool input_assign_ports_on_button_press
+                                  = settings->bools.input_assign_ports_on_button_press;
    float input_axis_threshold     = settings->floats.input_axis_threshold;
    uint8_t max_users              = (uint8_t)settings->uints.input_max_users;
 
@@ -6142,8 +6142,8 @@ void input_driver_poll(void)
    }
 
 #ifdef HAVE_MENU
-   input_remap_ports_on_button_press =
-            input_remap_ports_on_button_press
+   input_assign_ports_on_button_press =
+            input_assign_ports_on_button_press
          && !(menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE);
 #endif
 
@@ -6155,7 +6155,7 @@ void input_driver_poll(void)
          && input_st->current_driver->poll)
       input_st->current_driver->poll(input_st->current_data);
 
-   if (input_remap_ports_on_button_press)
+   if (input_assign_ports_on_button_press)
    {
       for (i = 0; i < max_users; i++)
       {
@@ -6189,7 +6189,7 @@ void input_driver_poll(void)
 
       /* If user 0 is not mapped yet, use the port they would be mapped
        * to on overlay button press to get the input_analog_dpad_mode. */
-      if (!first_user_is_mapped && input_remap_ports_on_button_press)
+      if (!first_user_is_mapped && input_assign_ports_on_button_press)
          mapped_port = get_first_free_core_port(settings);
 
       switch (input_analog_dpad_mode)
@@ -6220,7 +6220,7 @@ void input_driver_poll(void)
             input_analog_dpad_mode,
             settings->floats.input_axis_threshold);
 
-      if (!first_user_is_mapped && input_remap_ports_on_button_press)
+      if (!first_user_is_mapped && input_assign_ports_on_button_press)
       {
          if (input_st->overlay_ptr->overlay_state.buttons.data[0])
             map_user_to_first_free_core_port(0, settings);
@@ -6875,17 +6875,17 @@ void input_remapping_set_remap_ports_defaults(void)
 {
    unsigned i;
    settings_t *settings = config_get_ptr();
-   bool remap_on_button_press = settings->bools.input_remap_ports_on_button_press;
+   bool assign_ports_on_button_press = settings->bools.input_assign_ports_on_button_press;
 
    for (i = 0; i < MAX_USERS; i++)
    {
       configuration_set_uint(settings,
          settings->uints.input_remap_ports[i],
-         remap_on_button_press ? MAX_USERS : i);
+         assign_ports_on_button_press ? MAX_USERS : i);
 
       configuration_set_uint(settings,
          settings->uints.input_libretro_device[i],
-         remap_on_button_press ? RETRO_DEVICE_NONE : RETRO_DEVICE_JOYPAD);
+         assign_ports_on_button_press ? RETRO_DEVICE_NONE : RETRO_DEVICE_JOYPAD);
    }
 
    /* Need to call 'input_remapping_update_port_map()'

intl/msg_hash_lbl.h

@@ -2162,6 +2162,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH,
    "input_prefer_front_touch"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+   "input_assign_ports_on_button_press"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY,
    "input_remapping_directory"
@@ -2170,10 +2174,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
    "input_remap_binds_enable"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
-   "input_assign_ports_on_button_press"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE,
    "input_remap_sort_by_controller_enable"

intl/msg_hash_us.h

@@ -3339,11 +3339,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
-   "Remap Ports on Button Press"
+   "Assign Ports on Button Press"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
-   "First user to press a button becomes player 1, second becomes player 2, etc."
+   "Core input ports are mapped sequentially when input is received from a physical input device. The first person to press a button becomes player 1, the second becomes player 2, etc."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE,

menu/cbs/menu_cbs_sublabel.c

@@ -824,8 +824,8 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_autosave_interval,             MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_max_keep,               MENU_ENUM_SUBLABEL_REPLAY_MAX_KEEP)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_checkpoint_interval,    MENU_ENUM_SUBLABEL_REPLAY_CHECKPOINT_INTERVAL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_checkpoint_deserialize, MENU_ENUM_SUBLABEL_REPLAY_CHECKPOINT_DESERIALIZE)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_assign_ports_on_button_press, MENU_ENUM_SUBLABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_remap_binds_enable,      MENU_ENUM_SUBLABEL_INPUT_REMAP_BINDS_ENABLE)
-DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_remap_ports_on_button_press, MENU_ENUM_SUBLABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_remap_sort_by_controller_enable,      MENU_ENUM_SUBLABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_autodetect_enable,       MENU_ENUM_SUBLABEL_INPUT_AUTODETECT_ENABLE)
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
@@ -4140,6 +4140,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_sensors_enable);
             break;
+         case MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_assign_ports_on_button_press);
+            break;
          case MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_auto_mouse_grab);
             break;
@@ -4149,9 +4152,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remap_binds_enable);
             break;
-         case MENU_ENUM_LABEL_INPUT_REMAP_PORTS_ON_BUTTON_PRESS:
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remap_ports_on_button_press);
-            break;
          case MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remap_sort_by_controller_enable);
             break;

menu/menu_displaylist.c

@@ -8270,6 +8270,7 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_INPUT_MENU_SETTINGS,                   PARSE_ACTION,     true},
                {MENU_ENUM_LABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS,        PARSE_ACTION,     true},
                {MENU_ENUM_LABEL_INPUT_MAX_USERS,                       PARSE_ONLY_UINT,  true},
+               {MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,    PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_AUTO_MOUSE_GRAB,                 PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS,                 PARSE_ONLY_UINT,  true},
                {MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT,                   PARSE_ONLY_BOOL,  true},
@@ -8278,7 +8279,6 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_INPUT_BIND_HOLD,                       PARSE_ONLY_UINT,  true},
                {MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,               PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,              PARSE_ONLY_BOOL,  true},
-               {MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,     PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE, PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,                    PARSE_ONLY_BOOL,  true},
                {MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,           PARSE_ONLY_BOOL,  true},

menu/menu_setting.c

@@ -15617,10 +15617,10 @@ static bool setting_append_list(
 
             CONFIG_BOOL(
                   list, list_info,
-                  &settings->bools.input_remap_binds_enable,
-                  MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
-                  MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
-                  true,
+                  &settings->bools.input_assign_ports_on_button_press,
+                  MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+                  MENU_ENUM_LABEL_VALUE_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+                  DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,
@@ -15630,13 +15630,13 @@ static bool setting_append_list(
                   general_read_handler,
                   SD_FLAG_ADVANCED
                   );
-            
+
             CONFIG_BOOL(
                   list, list_info,
-                  &settings->bools.input_assign_ports_on_button_press,
-                  MENU_ENUM_LABEL_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
-                  MENU_ENUM_LABEL_VALUE_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
-                  DEFAULT_INPUT_ASSIGN_PORTS_ON_BUTTON_PRESS,
+                  &settings->bools.input_remap_binds_enable,
+                  MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
+                  MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
+                  true,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,