ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input_config_parse_key - unroll

This commit is contained in:
twinaphex 2021-03-23 01:10:14 +01:00
parent 49dc7e6c66
commit fdc184c60c
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
retroarch.c
View File

@ -25854,28 +25854,6 @@ uint8_t input_config_bind_map_get_retro_key(unsigned i)
return keybind->retro_key; return keybind->retro_key;
} }
static void input_config_parse_key(
char *s,
struct rarch_state *p_rarch,
config_file_t *conf,
const char *prefix, const char *btn,
struct retro_keybind *bind)
{
struct config_entry_list *entry = NULL;
/* Clear old mapping bit */
BIT512_CLEAR_PTR(&p_rarch->keyboard_mapping_bits, bind->key);
if (
(entry = config_get_entry(conf, s))
&& (!string_is_empty(entry->value))
)
bind->key = input_config_translate_str_to_rk(entry->value);
/* Store mapping bit */
BIT512_SET_PTR(&p_rarch->keyboard_mapping_bits, bind->key);
}
static const char *input_config_get_prefix(unsigned user, bool meta) static const char *input_config_get_prefix(unsigned user, bool meta)
{ {
static const char *bind_user_prefix[MAX_USERS] = { static const char *bind_user_prefix[MAX_USERS] = {
@ -26731,6 +26709,9 @@ void config_read_keybinds_conf(void *data)
bool meta = false; bool meta = false;
const char *prefix = NULL; const char *prefix = NULL;
const char *btn = NULL; const char *btn = NULL;
struct config_entry_list
*entry = NULL;
if (!bind || !bind->valid || !keybind) if (!bind || !bind->valid || !keybind)
continue; continue;
@ -26746,7 +26727,16 @@ void config_read_keybinds_conf(void *data)
fill_pathname_join_delim(str, prefix, btn, '_', sizeof(str)); fill_pathname_join_delim(str, prefix, btn, '_', sizeof(str));
input_config_parse_key (str, p_rarch, conf, prefix, btn, bind); /* Clear old mapping bit */
BIT512_CLEAR_PTR(&p_rarch->keyboard_mapping_bits, bind->key);
entry = config_get_entry(conf, str);
if (entry && !string_is_empty(entry->value))
bind->key = input_config_translate_str_to_rk(
entry->value);
/* Store mapping bit */
BIT512_SET_PTR(&p_rarch->keyboard_mapping_bits, bind->key);
input_config_parse_joy_button (str, conf, prefix, btn, bind); input_config_parse_joy_button (str, conf, prefix, btn, bind);
input_config_parse_joy_axis (str, conf, prefix, btn, bind); input_config_parse_joy_axis (str, conf, prefix, btn, bind);
input_config_parse_mouse_button(str, conf, prefix, btn, bind); input_config_parse_mouse_button(str, conf, prefix, btn, bind);