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

Rename input_find_sk_key.

Browse Source 
Matches up better with the conventions in input_common.
The sk-prefix was from SSNES days (how things linger on ... D:)
This commit is contained in:
Themaister 2014-01-08 18:23:58 +01:00
parent c786483635
commit 67e7628568
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/input_common.c
View File

@ -992,7 +992,7 @@ const struct input_key_map input_config_key_map[] = {
{ NULL, RETROK_UNKNOWN }, { NULL, RETROK_UNKNOWN },
}; };
static enum retro_key find_sk_bind(const char *str) static enum retro_key find_rk_bind(const char *str)
{ {
size_t i; size_t i;
for (i = 0; input_config_key_map[i].str; i++) for (i = 0; input_config_key_map[i].str; i++)
@ -1005,12 +1005,12 @@ static enum retro_key find_sk_bind(const char *str)
return RETROK_UNKNOWN; return RETROK_UNKNOWN;
} }
enum retro_key input_find_sk_key(const char *str) enum retro_key input_translate_str_to_rk(const char *str)
{ {
if (strlen(str) == 1 && isalpha(*str)) if (strlen(str) == 1 && isalpha(*str))
return (enum retro_key)(RETROK_a + (tolower(*str) - (int)'a')); return (enum retro_key)(RETROK_a + (tolower(*str) - (int)'a'));
else else
return find_sk_bind(str); return find_rk_bind(str);
} }
void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn, void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn,
@ -1021,7 +1021,7 @@ void input_config_parse_key(config_file_t *conf, const char *prefix, const char
snprintf(key, sizeof(key), "%s_%s", prefix, btn); snprintf(key, sizeof(key), "%s_%s", prefix, btn);
if (config_get_array(conf, key, tmp, sizeof(tmp))) if (config_get_array(conf, key, tmp, sizeof(tmp)))
bind->key = input_find_sk_key(tmp); bind->key = input_translate_str_to_rk(tmp);
} }
const char *input_config_get_prefix(unsigned player, bool meta) const char *input_config_get_prefix(unsigned player, bool meta)

2
input/input_common.h
View File

@ -150,12 +150,12 @@ struct input_key_map
}; };
extern const struct input_key_map input_config_key_map[]; extern const struct input_key_map input_config_key_map[];
void input_translate_rk_to_str(enum retro_key key, char *buf, size_t size); void input_translate_rk_to_str(enum retro_key key, char *buf, size_t size);
enum retro_key input_translate_str_to_rk(const char *str);
extern const char* const input_builtin_autoconfs[]; extern const char* const input_builtin_autoconfs[];
const char *input_config_get_prefix(unsigned player, bool meta); const char *input_config_get_prefix(unsigned player, bool meta);
unsigned input_translate_str_to_bind_id(const char *str); // Returns RARCH_BIND_LIST_END on not found. unsigned input_translate_str_to_bind_id(const char *str); // Returns RARCH_BIND_LIST_END on not found.
enum retro_key input_find_sk_key(const char *str);
void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn, void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn,

2
input/overlay.c
View File

@ -249,7 +249,7 @@ static bool input_overlay_load_desc(input_overlay_t *ol, config_file_t *conf, st
else if (strstr(key, "retrok_") == key) else if (strstr(key, "retrok_") == key)
{ {
desc->type = OVERLAY_TYPE_KEYBOARD; desc->type = OVERLAY_TYPE_KEYBOARD;
desc->key_mask = input_find_sk_key(key + 7); desc->key_mask = input_translate_str_to_rk(key + 7);
} }
else else
{ {