mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10942 from hhromic/menu-cursor

Browse Source 
(Menu) Fix cursor forced to first entry after displaying lists
This commit is contained in:
Autechre 2020-06-30 15:55:16 +02:00 committed by GitHub
commit 2de83ceb54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 135 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
managers/cheat_manager.c
View File

@ -773,7 +773,7 @@ bool cheat_manager_alloc_if_empty(void)
return true; return true;
} }
int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound) int cheat_manager_initialize_memory(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned i; unsigned i;
retro_ctx_memory_info_t meminfo; retro_ctx_memory_info_t meminfo;
@ -1132,47 +1132,47 @@ static int cheat_manager_search(enum cheat_search_type search_type)
return 0; return 0;
} }
int cheat_manager_search_exact(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_exact(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT); return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT);
} }
int cheat_manager_search_lt(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_lt(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_LT); return cheat_manager_search(CHEAT_SEARCH_TYPE_LT);
} }
int cheat_manager_search_gt(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_gt(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_GT); return cheat_manager_search(CHEAT_SEARCH_TYPE_GT);
} }
int cheat_manager_search_lte(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_lte(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE); return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE);
} }
int cheat_manager_search_gte(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_gte(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE); return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE);
} }
int cheat_manager_search_eq(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_eq(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ); return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ);
} }
int cheat_manager_search_neq(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_neq(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ); return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ);
} }
int cheat_manager_search_eqplus(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_eqplus(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS); return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS);
} }
int cheat_manager_search_eqminus(rarch_setting_t *setting, bool wraparound) int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS); return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
} }
@ -1401,7 +1401,7 @@ void cheat_manager_apply_retro_cheats(void)
if (cheat_st->cheats[i].handler != CHEAT_HANDLER_TYPE_RETRO || !cheat_st->cheats[i].state) if (cheat_st->cheats[i].handler != CHEAT_HANDLER_TYPE_RETRO || !cheat_st->cheats[i].state)
continue; continue;
if (!cheat_st->memory_initialized) if (!cheat_st->memory_initialized)
cheat_manager_initialize_memory(NULL, false); cheat_manager_initialize_memory(NULL, 0, false);
/* If we're still not initialized, something /* If we're still not initialized, something
* must have gone wrong - just bail */ * must have gone wrong - just bail */
@ -1735,7 +1735,7 @@ void cheat_manager_match_action(enum cheat_match_action_type match_action, unsig
} }
} }
int cheat_manager_copy_match(rarch_setting_t *setting, bool wraparound) int cheat_manager_copy_match(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
cheat_manager_t *cheat_st = &cheat_manager_state; cheat_manager_t *cheat_st = &cheat_manager_state;
cheat_manager_match_action(CHEAT_MATCH_ACTION_TYPE_COPY, cheat_manager_match_action(CHEAT_MATCH_ACTION_TYPE_COPY,
@ -1743,7 +1743,7 @@ int cheat_manager_copy_match(rarch_setting_t *setting, bool wraparound)
return 0; return 0;
} }
int cheat_manager_delete_match(rarch_setting_t *setting, bool wraparound) int cheat_manager_delete_match(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
bool refresh = false; bool refresh = false;
cheat_manager_t *cheat_st = &cheat_manager_state; cheat_manager_t *cheat_st = &cheat_manager_state;

24
managers/cheat_manager.h
View File

@ -240,25 +240,25 @@ void cheat_manager_load_game_specific_cheats(const char *path_cheat_database);
void cheat_manager_save_game_specific_cheats(const char *path_cheat_database); void cheat_manager_save_game_specific_cheats(const char *path_cheat_database);
int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound); int cheat_manager_initialize_memory(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_exact(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_exact(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_lt(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_lt(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_gt(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_gt(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_lte(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_lte(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_gte(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_gte(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_eq(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_eq(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_neq(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_neq(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_eqplus(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_eqplus(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_search_eqminus(rarch_setting_t *setting, bool wraparound); int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_add_matches(const char *path, int cheat_manager_add_matches(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx); const char *label, unsigned type, size_t idx, size_t entry_idx);
@ -271,9 +271,9 @@ void cheat_manager_match_action(
unsigned int *address, unsigned int *address_mask, unsigned int *address, unsigned int *address_mask,
unsigned int *prev_value, unsigned int *curr_value); unsigned int *prev_value, unsigned int *curr_value);
int cheat_manager_copy_match(rarch_setting_t *setting, bool wraparound); int cheat_manager_copy_match(rarch_setting_t *setting, size_t idx, bool wraparound);
int cheat_manager_delete_match(rarch_setting_t *setting, bool wraparound); int cheat_manager_delete_match(rarch_setting_t *setting, size_t idx, bool wraparound);
RETRO_END_DECLS RETRO_END_DECLS

6
menu/cbs/menu_cbs_ok.c
View File

@ -1561,7 +1561,7 @@ static int set_path_generic(const char *label, const char *action_path)
{ {
setting_set_with_string_representation( setting_set_with_string_representation(
setting, action_path); setting, action_path);
return menu_setting_generic(setting, false); return menu_setting_generic(setting, 0, false);
} }
return 0; return 0;
@ -2695,7 +2695,7 @@ static void menu_input_st_string_cb_save_preset(void *userdata,
if (setting) if (setting)
{ {
setting_set_with_string_representation(setting, str); setting_set_with_string_representation(setting, str);
menu_setting_generic(setting, false); menu_setting_generic(setting, 0, false);
} }
else if (!string_is_empty(label)) else if (!string_is_empty(label))
ret = menu_shader_manager_save_preset( ret = menu_shader_manager_save_preset(
@ -2737,7 +2737,7 @@ static void menu_input_st_string_cb_cheat_file_save_as(
if (setting) if (setting)
{ {
setting_set_with_string_representation(setting, str); setting_set_with_string_representation(setting, str);
menu_setting_generic(setting, false); menu_setting_generic(setting, 0, false);
} }
else if (!string_is_empty(label)) else if (!string_is_empty(label))
cheat_manager_save(str, path_cheat_database, cheat_manager_save(str, path_cheat_database,

2
menu/menu_displaylist.c
View File

@ -6589,7 +6589,7 @@ unsigned menu_displaylist_build_list(
case DISPLAYLIST_CHEAT_DETAILS_SETTINGS_LIST: case DISPLAYLIST_CHEAT_DETAILS_SETTINGS_LIST:
{ {
if (!cheat_manager_state.memory_initialized) if (!cheat_manager_state.memory_initialized)
cheat_manager_initialize_memory(NULL,true) ; cheat_manager_initialize_memory(NULL, 0, true);
{ {
rarch_setting_t *setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS); rarch_setting_t *setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_ADDRESS);

163
menu/menu_setting.c
View File

@ -390,7 +390,7 @@ static void menu_input_st_string_cb(void *userdata, const char *str)
if (setting) if (setting)
{ {
setting_set_with_string_representation(setting, str); setting_set_with_string_representation(setting, str);
menu_setting_generic(setting, false); menu_setting_generic(setting, 0, false);
} }
} }
@ -398,7 +398,8 @@ static void menu_input_st_string_cb(void *userdata, const char *str)
} }
static int setting_generic_action_ok_linefeed(rarch_setting_t *setting, bool wraparound) static int setting_generic_action_ok_linefeed(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
menu_input_ctx_line_t line; menu_input_ctx_line_t line;
input_keyboard_line_complete_t cb = NULL; input_keyboard_line_complete_t cb = NULL;
@ -490,7 +491,8 @@ unsigned setting_get_bind_type(rarch_setting_t *setting)
return setting->bind_type; return setting->bind_type;
} }
static int setting_bind_action_ok(rarch_setting_t *setting, bool wraparound) static int setting_bind_action_ok(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
(void)wraparound; /* TODO/FIXME - handle this */ (void)wraparound; /* TODO/FIXME - handle this */
@ -499,7 +501,8 @@ static int setting_bind_action_ok(rarch_setting_t *setting, bool wraparound)
return 0; return 0;
} }
static int setting_int_action_right_default(rarch_setting_t *setting, bool wraparound) static int setting_int_action_right_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double max = 0.0f; double max = 0.0f;
@ -638,7 +641,7 @@ static float recalc_step_based_on_length_of_action(rarch_setting_t *setting)
} }
int setting_uint_action_left_default( int setting_uint_action_left_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double min = 0.0f; double min = 0.0f;
bool overflowed = false; bool overflowed = false;
@ -676,7 +679,7 @@ int setting_uint_action_left_default(
} }
int setting_uint_action_right_default( int setting_uint_action_right_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double max = 0.0f; double max = 0.0f;
float step = 0.0f; float step = 0.0f;
@ -709,7 +712,7 @@ int setting_uint_action_right_default(
} }
int setting_bool_action_right_with_refresh( int setting_bool_action_right_with_refresh(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
bool refresh = false; bool refresh = false;
@ -723,9 +726,9 @@ int setting_bool_action_right_with_refresh(
} }
int setting_uint_action_right_with_refresh( int setting_uint_action_right_with_refresh(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
int retval = setting_uint_action_right_default(setting, wraparound); int retval = setting_uint_action_right_default(setting, idx, wraparound);
bool refresh = false; bool refresh = false;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
@ -734,7 +737,8 @@ int setting_uint_action_right_with_refresh(
return retval; return retval;
} }
int setting_bool_action_left_with_refresh(rarch_setting_t *setting, bool wraparound) int setting_bool_action_left_with_refresh(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
bool refresh = false; bool refresh = false;
@ -747,9 +751,10 @@ int setting_bool_action_left_with_refresh(rarch_setting_t *setting, bool wraparo
return 0; return 0;
} }
int setting_uint_action_left_with_refresh(rarch_setting_t *setting, bool wraparound) int setting_uint_action_left_with_refresh(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
int retval = setting_uint_action_left_default(setting, wraparound); int retval = setting_uint_action_left_default(setting, idx, wraparound);
bool refresh = false; bool refresh = false;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
@ -760,7 +765,7 @@ int setting_uint_action_left_with_refresh(rarch_setting_t *setting, bool wraparo
} }
static int setting_size_action_left_default( static int setting_size_action_left_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double min = 0.0f; double min = 0.0f;
bool overflowed = false; bool overflowed = false;
@ -797,7 +802,7 @@ static int setting_size_action_left_default(
} }
static int setting_size_action_right_default( static int setting_size_action_right_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double max = 0.0f; double max = 0.0f;
float step = 0.0f; float step = 0.0f;
@ -831,7 +836,8 @@ static int setting_size_action_right_default(
return 0; return 0;
} }
int setting_generic_action_ok_default(rarch_setting_t *setting, bool wraparound) int setting_generic_action_ok_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -989,7 +995,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
} }
static int setting_fraction_action_left_default( static int setting_fraction_action_left_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double min = 0.0f; double min = 0.0f;
@ -1020,7 +1026,7 @@ static int setting_fraction_action_left_default(
} }
static int setting_fraction_action_right_default( static int setting_fraction_action_right_default(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double max = 0.0f; double max = 0.0f;
@ -1198,7 +1204,8 @@ static void setting_get_string_representation_st_bind(rarch_setting_t *setting,
input_config_get_bind_string(s, keybind, auto_bind, len); input_config_get_bind_string(s, keybind, auto_bind, len);
} }
static int setting_action_action_ok(rarch_setting_t *setting, bool wraparound) static int setting_action_action_ok(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -1733,7 +1740,8 @@ static rarch_setting_t setting_bind_setting(const char* name,
return result; return result;
} }
static int setting_int_action_left_default(rarch_setting_t *setting, bool wraparound) static int setting_int_action_left_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double min = 0.0f; double min = 0.0f;
@ -1763,7 +1771,8 @@ static int setting_int_action_left_default(rarch_setting_t *setting, bool wrapar
return 0; return 0;
} }
static int setting_bool_action_ok_default(rarch_setting_t *setting, bool wraparound) static int setting_bool_action_ok_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -1776,7 +1785,8 @@ static int setting_bool_action_ok_default(rarch_setting_t *setting, bool wraparo
return 0; return 0;
} }
static int setting_bool_action_toggle_default(rarch_setting_t *setting, bool wraparound) static int setting_bool_action_toggle_default(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -2577,7 +2587,8 @@ static void end_sub_group(
/* MENU SETTINGS */ /* MENU SETTINGS */
static int setting_action_ok_bind_all(rarch_setting_t *setting, bool wraparound) static int setting_action_ok_bind_all(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
(void)wraparound; (void)wraparound;
if (!menu_input_key_bind_set_mode(MENU_INPUT_BINDS_CTL_BIND_ALL, setting)) if (!menu_input_key_bind_set_mode(MENU_INPUT_BINDS_CTL_BIND_ALL, setting))
@ -2586,8 +2597,8 @@ static int setting_action_ok_bind_all(rarch_setting_t *setting, bool wraparound)
} }
#ifdef HAVE_CONFIGFILE #ifdef HAVE_CONFIGFILE
static int setting_action_ok_bind_all_save_autoconfig(rarch_setting_t *setting, static int setting_action_ok_bind_all_save_autoconfig(
bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned index_offset = 0; unsigned index_offset = 0;
const char *name = NULL; const char *name = NULL;
@ -2614,7 +2625,8 @@ static int setting_action_ok_bind_all_save_autoconfig(rarch_setting_t *setting,
} }
#endif #endif
static int setting_action_ok_bind_defaults(rarch_setting_t *setting, bool wraparound) static int setting_action_ok_bind_defaults(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned i; unsigned i;
menu_input_ctx_bind_limits_t lim; menu_input_ctx_bind_limits_t lim;
@ -2648,7 +2660,7 @@ static int setting_action_ok_bind_defaults(rarch_setting_t *setting, bool wrapar
} }
static int setting_action_ok_video_refresh_rate_auto( static int setting_action_ok_video_refresh_rate_auto(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
double video_refresh_rate = 0.0; double video_refresh_rate = 0.0;
double deviation = 0.0; double deviation = 0.0;
@ -2666,14 +2678,14 @@ static int setting_action_ok_video_refresh_rate_auto(
command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL); command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL);
} }
if (setting_generic_action_ok_default(setting, wraparound) != 0) if (setting_generic_action_ok_default(setting, idx, wraparound) != 0)
return -1; return -1;
return 0; return 0;
} }
static int setting_action_ok_video_refresh_rate_polled(rarch_setting_t *setting, static int setting_action_ok_video_refresh_rate_polled(
bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
float refresh_rate = 0.0; float refresh_rate = 0.0;
@ -2687,13 +2699,14 @@ static int setting_action_ok_video_refresh_rate_polled(rarch_setting_t *setting,
/* Incase refresh rate update forced non-block video. */ /* Incase refresh rate update forced non-block video. */
command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL); command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL);
if (setting_generic_action_ok_default(setting, wraparound) != 0) if (setting_generic_action_ok_default(setting, idx, wraparound) != 0)
return -1; return -1;
return 0; return 0;
} }
static int setting_action_ok_uint_special(rarch_setting_t *setting, bool wraparound) static int setting_action_ok_uint_special(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
char enum_idx[16]; char enum_idx[16];
if (!setting) if (!setting)
@ -2703,12 +2716,13 @@ static int setting_action_ok_uint_special(rarch_setting_t *setting, bool wraparo
generic_action_ok_displaylist_push( generic_action_ok_displaylist_push(
enum_idx, /* we will pass the enumeration index of the string as a path */ enum_idx, /* we will pass the enumeration index of the string as a path */
NULL, NULL, 0, 0, 0, NULL, NULL, 0, idx, 0,
ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL); ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL);
return 0; return 0;
} }
static int setting_action_ok_uint(rarch_setting_t *setting, bool wraparound) static int setting_action_ok_uint(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
char enum_idx[16]; char enum_idx[16];
if (!setting) if (!setting)
@ -2718,7 +2732,7 @@ static int setting_action_ok_uint(rarch_setting_t *setting, bool wraparound)
generic_action_ok_displaylist_push( generic_action_ok_displaylist_push(
enum_idx, /* we will pass the enumeration index of the string as a path */ enum_idx, /* we will pass the enumeration index of the string as a path */
NULL, NULL, 0, 0, 0, NULL, NULL, 0, idx, 0,
ACTION_OK_DL_DROPDOWN_BOX_LIST); ACTION_OK_DL_DROPDOWN_BOX_LIST);
return 0; return 0;
} }
@ -4852,7 +4866,8 @@ static void setting_get_string_representation_uint_video_3ds_display_mode(
} }
#endif #endif
static int setting_action_left_analog_dpad_mode(rarch_setting_t *setting, bool wraparound) static int setting_action_left_analog_dpad_mode(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned port = 0; unsigned port = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -4906,7 +4921,7 @@ static unsigned libretro_device_get_size(unsigned *devices, size_t devices_size,
} }
static int setting_action_left_libretro_device_type( static int setting_action_left_libretro_device_type(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
retro_ctx_controller_info_t pad; retro_ctx_controller_info_t pad;
unsigned current_device, current_idx, i, devices[128], unsigned current_device, current_idx, i, devices[128],
@ -4942,7 +4957,7 @@ static int setting_action_left_libretro_device_type(
} }
static int setting_uint_action_left_crt_switch_resolution_super( static int setting_uint_action_left_crt_switch_resolution_super(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -4969,7 +4984,8 @@ static int setting_uint_action_left_crt_switch_resolution_super(
return 0; return 0;
} }
static int setting_action_left_bind_device(rarch_setting_t *setting, bool wraparound) static int setting_action_left_bind_device(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned *p = NULL; unsigned *p = NULL;
unsigned index_offset = 0; unsigned index_offset = 0;
@ -4991,7 +5007,8 @@ static int setting_action_left_bind_device(rarch_setting_t *setting, bool wrapar
return 0; return 0;
} }
static int setting_action_left_mouse_index(rarch_setting_t *setting, bool wraparound) static int setting_action_left_mouse_index(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -5008,7 +5025,7 @@ static int setting_action_left_mouse_index(rarch_setting_t *setting, bool wrapar
} }
static int setting_uint_action_left_custom_viewport_width( static int setting_uint_action_left_custom_viewport_width(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
video_viewport_t vp; video_viewport_t vp;
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
@ -5048,7 +5065,7 @@ static int setting_uint_action_left_custom_viewport_width(
} }
static int setting_uint_action_left_custom_viewport_height( static int setting_uint_action_left_custom_viewport_height(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
video_viewport_t vp; video_viewport_t vp;
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
@ -5089,7 +5106,7 @@ static int setting_uint_action_left_custom_viewport_height(
#if !defined(RARCH_CONSOLE) #if !defined(RARCH_CONSOLE)
static int setting_string_action_left_audio_device( static int setting_string_action_left_audio_device(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
int audio_device_index; int audio_device_index;
struct string_list *ptr = NULL; struct string_list *ptr = NULL;
@ -5115,8 +5132,8 @@ static int setting_string_action_left_audio_device(
} }
#endif #endif
static int setting_string_action_left_driver(rarch_setting_t *setting, static int setting_string_action_left_driver(
bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
driver_ctx_info_t drv; driver_ctx_info_t drv;
@ -5149,7 +5166,7 @@ static int setting_string_action_left_driver(rarch_setting_t *setting,
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
static int setting_string_action_left_netplay_mitm_server( static int setting_string_action_left_netplay_mitm_server(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned i; unsigned i;
int offset = 0; int offset = 0;
@ -5192,7 +5209,7 @@ static int setting_string_action_left_netplay_mitm_server(
} }
static int setting_string_action_right_netplay_mitm_server( static int setting_string_action_right_netplay_mitm_server(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned i; unsigned i;
int offset = 0; int offset = 0;
@ -5232,7 +5249,7 @@ static int setting_string_action_right_netplay_mitm_server(
#endif #endif
static int setting_uint_action_right_crt_switch_resolution_super( static int setting_uint_action_right_crt_switch_resolution_super(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
if (!setting) if (!setting)
return -1; return -1;
@ -5260,7 +5277,7 @@ static int setting_uint_action_right_crt_switch_resolution_super(
} }
static int setting_uint_action_right_custom_viewport_width( static int setting_uint_action_right_custom_viewport_width(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
video_viewport_t vp; video_viewport_t vp;
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
@ -5292,7 +5309,7 @@ static int setting_uint_action_right_custom_viewport_width(
} }
static int setting_uint_action_right_custom_viewport_height( static int setting_uint_action_right_custom_viewport_height(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
video_viewport_t vp; video_viewport_t vp;
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
@ -5325,7 +5342,7 @@ static int setting_uint_action_right_custom_viewport_height(
#if !defined(RARCH_CONSOLE) #if !defined(RARCH_CONSOLE)
static int setting_string_action_right_audio_device( static int setting_string_action_right_audio_device(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
int audio_device_index; int audio_device_index;
struct string_list *ptr = NULL; struct string_list *ptr = NULL;
@ -5351,8 +5368,8 @@ static int setting_string_action_right_audio_device(
} }
#endif #endif
static int setting_string_action_right_driver(rarch_setting_t *setting, static int setting_string_action_right_driver(
bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
driver_ctx_info_t drv; driver_ctx_info_t drv;
@ -5383,7 +5400,8 @@ static int setting_string_action_right_driver(rarch_setting_t *setting,
return 0; return 0;
} }
static int setting_string_action_left_midi_input(rarch_setting_t *setting, bool wraparound) static int setting_string_action_left_midi_input(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
struct string_list *list = midi_driver_get_avail_inputs(); struct string_list *list = midi_driver_get_avail_inputs();
@ -5404,7 +5422,8 @@ static int setting_string_action_left_midi_input(rarch_setting_t *setting, bool
return -1; return -1;
} }
static int setting_string_action_right_midi_input(rarch_setting_t *setting, bool wraparound) static int setting_string_action_right_midi_input(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
struct string_list *list = midi_driver_get_avail_inputs(); struct string_list *list = midi_driver_get_avail_inputs();
@ -5425,7 +5444,8 @@ static int setting_string_action_right_midi_input(rarch_setting_t *setting, bool
return -1; return -1;
} }
static int setting_string_action_left_midi_output(rarch_setting_t *setting, bool wraparound) static int setting_string_action_left_midi_output(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
struct string_list *list = midi_driver_get_avail_outputs(); struct string_list *list = midi_driver_get_avail_outputs();
@ -5446,7 +5466,8 @@ static int setting_string_action_left_midi_output(rarch_setting_t *setting, bool
return -1; return -1;
} }
static int setting_string_action_right_midi_output(rarch_setting_t *setting, bool wraparound) static int setting_string_action_right_midi_output(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
struct string_list *list = midi_driver_get_avail_outputs(); struct string_list *list = midi_driver_get_avail_outputs();
@ -6010,10 +6031,10 @@ static void menu_settings_list_current_add_range(
(*list)[list_info->index - 1].flags |= SD_FLAG_HAS_RANGE; (*list)[list_info->index - 1].flags |= SD_FLAG_HAS_RANGE;
} }
int menu_setting_generic(rarch_setting_t *setting, bool wraparound) int menu_setting_generic(rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
uint64_t flags = setting->flags; uint64_t flags = setting->flags;
if (setting_generic_action_ok_default(setting, wraparound) != 0) if (setting_generic_action_ok_default(setting, idx, wraparound) != 0)
return -1; return -1;
if (setting->change_handler) if (setting->change_handler)
@ -6070,7 +6091,8 @@ int menu_action_handle_setting(rarch_setting_t *setting,
case ST_BIND: case ST_BIND:
case ST_ACTION: case ST_ACTION:
{ {
int ret = -1; int ret = -1;
size_t selection = menu_navigation_get_selection();
switch (action) switch (action)
{ {
case MENU_ACTION_UP: case MENU_ACTION_UP:
@ -6084,7 +6106,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
if (setting->action_left) if (setting->action_left)
{ {
ret = setting->action_left(setting, false); ret = setting->action_left(setting, selection, false);
menu_driver_ctl( menu_driver_ctl(
RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH, RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH,
NULL); NULL);
@ -6096,7 +6118,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT:
if (setting->action_right) if (setting->action_right)
{ {
ret = setting->action_right(setting, false); ret = setting->action_right(setting, selection, false);
menu_driver_ctl( menu_driver_ctl(
RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH, RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH,
NULL); NULL);
@ -6107,11 +6129,11 @@ int menu_action_handle_setting(rarch_setting_t *setting,
break; break;
case MENU_ACTION_SELECT: case MENU_ACTION_SELECT:
if (setting->action_select) if (setting->action_select)
ret = setting->action_select(setting, true); ret = setting->action_select(setting, selection, true);
break; break;
case MENU_ACTION_OK: case MENU_ACTION_OK:
if (setting->action_ok) if (setting->action_ok)
ret = setting->action_ok(setting, false); ret = setting->action_ok(setting, selection, false);
break; break;
case MENU_ACTION_CANCEL: case MENU_ACTION_CANCEL:
if (setting->action_cancel) if (setting->action_cancel)
@ -6124,7 +6146,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
} }
if (ret == 0) if (ret == 0)
return menu_setting_generic(setting, wraparound); return menu_setting_generic(setting, selection, wraparound);
} }
break; break;
default: default:
@ -6360,7 +6382,8 @@ static int setting_action_start_video_refresh_rate_auto(
******* ACTION TOGGLE CALLBACK FUNCTIONS ******* ******* ACTION TOGGLE CALLBACK FUNCTIONS *******
**/ **/
static int setting_action_right_analog_dpad_mode(rarch_setting_t *setting, bool wraparound) static int setting_action_right_analog_dpad_mode(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned port = 0; unsigned port = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -6379,7 +6402,7 @@ static int setting_action_right_analog_dpad_mode(rarch_setting_t *setting, bool
} }
static int setting_action_right_libretro_device_type( static int setting_action_right_libretro_device_type(
rarch_setting_t *setting, bool wraparound) rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
retro_ctx_controller_info_t pad; retro_ctx_controller_info_t pad;
unsigned current_device, current_idx, i, devices[128], unsigned current_device, current_idx, i, devices[128],
@ -6414,7 +6437,8 @@ static int setting_action_right_libretro_device_type(
return 0; return 0;
} }
static int setting_action_right_bind_device(rarch_setting_t *setting, bool wraparound) static int setting_action_right_bind_device(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
unsigned index_offset; unsigned index_offset;
unsigned *p = NULL; unsigned *p = NULL;
@ -6434,7 +6458,8 @@ static int setting_action_right_bind_device(rarch_setting_t *setting, bool wrapa
return 0; return 0;
} }
static int setting_action_right_mouse_index(rarch_setting_t *setting, bool wraparound) static int setting_action_right_mouse_index(
rarch_setting_t *setting, size_t idx, bool wraparound)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -17883,7 +17908,7 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data)
if (setting->action_right) if (setting->action_right)
{ {
int ret = setting->action_right(setting, false); int ret = setting->action_right(setting, 0, false);
menu_driver_ctl( menu_driver_ctl(
RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH, NULL); RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH, NULL);
menu_driver_ctl( menu_driver_ctl(

2
menu/menu_setting.h
View File

@ -74,7 +74,7 @@ enum setting_list_flags
#define SL_FLAG_SETTINGS_GROUP_ALL (SL_FLAG_SETTINGS_ALL - SL_FLAG_MAIN_MENU) #define SL_FLAG_SETTINGS_GROUP_ALL (SL_FLAG_SETTINGS_ALL - SL_FLAG_MAIN_MENU)
int menu_setting_generic(rarch_setting_t *setting, bool wraparound); int menu_setting_generic(rarch_setting_t *setting, size_t idx, bool wraparound);
int menu_setting_set(unsigned type, unsigned action, bool wraparound); int menu_setting_set(unsigned type, unsigned action, bool wraparound);

21
setting_list.h
View File

@ -95,15 +95,15 @@ typedef struct rarch_setting rarch_setting_t;
typedef struct rarch_setting_info rarch_setting_info_t; typedef struct rarch_setting_info rarch_setting_info_t;
typedef struct rarch_setting_group_info rarch_setting_group_info_t; typedef struct rarch_setting_group_info rarch_setting_group_info_t;
typedef void (*change_handler_t )(rarch_setting_t *data); typedef void (*change_handler_t )(rarch_setting_t *setting);
typedef int (*action_left_handler_t )(rarch_setting_t *data, bool wraparound); typedef int (*action_left_handler_t )(rarch_setting_t *setting, size_t idx, bool wraparound);
typedef int (*action_right_handler_t )(rarch_setting_t *setting, bool wraparound); typedef int (*action_right_handler_t )(rarch_setting_t *setting, size_t idx, bool wraparound);
typedef int (*action_up_handler_t )(rarch_setting_t *setting); typedef int (*action_up_handler_t )(rarch_setting_t *setting);
typedef int (*action_down_handler_t )(rarch_setting_t *setting); typedef int (*action_down_handler_t )(rarch_setting_t *setting);
typedef int (*action_start_handler_t )(rarch_setting_t *setting); typedef int (*action_start_handler_t )(rarch_setting_t *setting);
typedef int (*action_cancel_handler_t )(rarch_setting_t *setting); typedef int (*action_cancel_handler_t )(rarch_setting_t *setting);
typedef int (*action_ok_handler_t )(rarch_setting_t *setting, bool wraparound); typedef int (*action_ok_handler_t )(rarch_setting_t *setting, size_t idx, bool wraparound);
typedef int (*action_select_handler_t )(rarch_setting_t *setting, bool wraparound); typedef int (*action_select_handler_t )(rarch_setting_t *setting, size_t idx, bool wraparound);
typedef void (*get_string_representation_t )(rarch_setting_t *setting, char *s, size_t len); typedef void (*get_string_representation_t )(rarch_setting_t *setting, char *s, size_t len);
struct rarch_setting_group_info struct rarch_setting_group_info
@ -237,7 +237,7 @@ unsigned setting_get_bind_type(rarch_setting_t *setting);
int setting_string_action_start_generic(rarch_setting_t *setting); int setting_string_action_start_generic(rarch_setting_t *setting);
int setting_generic_action_ok_default(rarch_setting_t *setting, bool wraparound); int setting_generic_action_ok_default(rarch_setting_t *setting, size_t idx, bool wraparound);
int setting_generic_action_start_default(rarch_setting_t *setting); int setting_generic_action_start_default(rarch_setting_t *setting);
@ -254,12 +254,11 @@ void settings_data_list_current_add_free_flags(
void setting_get_string_representation_size_in_mb(rarch_setting_t *setting, void setting_get_string_representation_size_in_mb(rarch_setting_t *setting,
char *s, size_t len); char *s, size_t len);
int setting_uint_action_right_with_refresh(rarch_setting_t *setting, bool wraparound); int setting_uint_action_left_with_refresh(rarch_setting_t *setting, size_t idx, bool wraparound);
int setting_uint_action_right_with_refresh(rarch_setting_t *setting, size_t idx, bool wraparound);
int setting_uint_action_left_default(rarch_setting_t *setting, size_t idx, bool wraparound);
int setting_uint_action_right_default(rarch_setting_t *setting, size_t idx, bool wraparound);
int setting_uint_action_left_with_refresh(rarch_setting_t *setting, bool wraparound) ;
int setting_uint_action_left_default(rarch_setting_t *setting, bool wraparound);
int setting_uint_action_right_default(rarch_setting_t *setting, bool wraparound);
void setting_get_string_representation_uint(rarch_setting_t *setting, char *s, size_t len); void setting_get_string_representation_uint(rarch_setting_t *setting, char *s, size_t len);
void setting_get_string_representation_hex_and_uint(rarch_setting_t *setting, char *s, size_t len); void setting_get_string_representation_hex_and_uint(rarch_setting_t *setting, char *s, size_t len);

2
ui/drivers/qt/settingswidgets.cpp
View File

@ -1037,7 +1037,7 @@ void BindButton::onClicked(bool checked)
{ {
Q_UNUSED(checked); Q_UNUSED(checked);
m_setting->action_ok(m_setting, false); m_setting->action_ok(m_setting, 0, false);
} }
ColorButton::ColorButton(rarch_setting_t *red, rarch_setting_t *green, rarch_setting_t *blue, QWidget *parent) : ColorButton::ColorButton(rarch_setting_t *red, rarch_setting_t *green, rarch_setting_t *blue, QWidget *parent) :