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

remap-redux: try to fix more warnings

Browse Source
This commit is contained in:
radius 2018-04-12 14:20:38 -05:00
parent c5c41efc0f
commit 9a355b8f2e
4 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
input/input_remapping.c
View File

@ -39,7 +39,7 @@ static unsigned old_libretro_device[MAX_USERS];
**/ **/
bool input_remapping_load_file(void *data, const char *path) bool input_remapping_load_file(void *data, const char *path)
{ {
unsigned i, j; unsigned i, j, k;
config_file_t *conf = (config_file_t*)data; config_file_t *conf = (config_file_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
@ -54,9 +54,9 @@ bool input_remapping_load_file(void *data, const char *path)
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
char s1[64], s2[64], s3[64]; char s1[64], s2[64], s3[64];
char btn_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char btn_ident[RARCH_FIRST_CUSTOM_BIND][128] = {{0}};
char key_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char key_ident[RARCH_FIRST_CUSTOM_BIND][128] = {{0}};
char stk_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char stk_ident[8][128] = {{0}};
char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][128] = { char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][128] = {
"b", "y", "select", "start", "b", "y", "select", "start",
@ -75,52 +75,55 @@ bool input_remapping_load_file(void *data, const char *path)
snprintf(s2, sizeof(s2), "input_player%u_key", i + 1); snprintf(s2, sizeof(s2), "input_player%u_key", i + 1);
snprintf(s3, sizeof(s3), "input_player%u_stk", i + 1); snprintf(s3, sizeof(s3), "input_player%u_stk", i + 1);
for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++) for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
{ {
int btn_remap = -1; if (j < RARCH_FIRST_CUSTOM_BIND)
int key_remap = -1; {
int btn_remap = -1;
int key_remap = -1;
fill_pathname_join_delim(btn_ident[j], s1, fill_pathname_join_delim(btn_ident[j], s1,
key_strings[j], '_', sizeof(btn_ident[j])); key_strings[j], '_', sizeof(btn_ident[j]));
fill_pathname_join_delim(key_ident[j], s2, fill_pathname_join_delim(key_ident[j], s2,
key_strings[j], '_', sizeof(btn_ident[j])); key_strings[j], '_', sizeof(btn_ident[j]));
if (config_get_int(conf, btn_ident[j], &btn_remap) if (config_get_int(conf, btn_ident[j], &btn_remap)
&& btn_remap != -1) && btn_remap != -1)
settings->uints.input_remap_ids[i][j] = btn_remap; settings->uints.input_remap_ids[i][j] = btn_remap;
else if (config_get_int(conf, btn_ident[j], &btn_remap) else if (config_get_int(conf, btn_ident[j], &btn_remap)
&& btn_remap == -1) && btn_remap == -1)
settings->uints.input_remap_ids[i][j] = RARCH_UNMAPPED; settings->uints.input_remap_ids[i][j] = RARCH_UNMAPPED;
/* else do nothing, important */ /* else do nothing, important */
if (config_get_int(conf, key_ident[j], &key_remap)) if (config_get_int(conf, key_ident[j], &key_remap))
settings->uints.input_keymapper_ids[i][j] = key_remap; settings->uints.input_keymapper_ids[i][j] = key_remap;
else
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
}
else else
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN; {
} int stk_remap = -1;
k = j - RARCH_FIRST_CUSTOM_BIND;
for (j = RARCH_FIRST_CUSTOM_BIND; j < RARCH_FIRST_CUSTOM_BIND + 8; j++) fill_pathname_join_delim(stk_ident[k], s3,
{ key_strings[j], '$', sizeof(stk_ident[k]));
int stk_remap = -1;
fill_pathname_join_delim(stk_ident[j], s3, snprintf(stk_ident[k],
key_strings[j], '$', sizeof(stk_ident[j])); sizeof(stk_ident[k]),
"%s_%s",
s3,
key_strings[j]);
snprintf(stk_ident[j], /* RARCH_LOG("pre_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]); */
sizeof(stk_ident[j]),
"%s_%s",
s3,
key_strings[j]);
/* RARCH_LOG("pre_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]); */ if (config_get_int(conf, stk_ident[k], &stk_remap) && stk_remap != -1)
settings->uints.input_remap_ids[i][j] = stk_remap;
else if (config_get_int(conf, stk_ident[k], &stk_remap) && stk_remap == -1)
settings->uints.input_remap_ids[i][j] = RARCH_UNMAPPED;
/* else do nothing, important */
if (config_get_int(conf, stk_ident[j], &stk_remap) && stk_remap != -1) /*RARCH_LOG("stk_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]);*/
settings->uints.input_remap_ids[i][j] = stk_remap; }
else if (config_get_int(conf, stk_ident[j], &stk_remap) && stk_remap == -1)
settings->uints.input_remap_ids[i][j] = RARCH_UNMAPPED;
/* else do nothing, important */
/*RARCH_LOG("stk_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]);*/
} }
snprintf(s1, sizeof(s1), "input_player%u_analog_dpad_mode", i + 1); snprintf(s1, sizeof(s1), "input_player%u_analog_dpad_mode", i + 1);
@ -146,7 +149,7 @@ bool input_remapping_load_file(void *data, const char *path)
bool input_remapping_save_file(const char *path) bool input_remapping_save_file(const char *path)
{ {
bool ret; bool ret;
unsigned i, j; unsigned i, j, k;
size_t path_size = PATH_MAX_LENGTH * sizeof(char); size_t path_size = PATH_MAX_LENGTH * sizeof(char);
char *buf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *buf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *remap_file = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *remap_file = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
@ -178,9 +181,9 @@ bool input_remapping_save_file(const char *path)
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
char s1[64], s2[64], s3[64]; char s1[64], s2[64], s3[64];
char btn_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char btn_ident[RARCH_FIRST_CUSTOM_BIND][128] = {{0}};
char key_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char key_ident[RARCH_FIRST_CUSTOM_BIND][128] = {{0}};
char stk_ident[RARCH_FIRST_CUSTOM_BIND + 4][128] = {{0}}; char stk_ident[8][128] = {{0}};
char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][128] = { char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][128] = {
"b", "y", "select", "start", "b", "y", "select", "start",
@ -197,14 +200,15 @@ bool input_remapping_save_file(const char *path)
for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++) for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
{ {
fill_pathname_join_delim(btn_ident[j], s1,
key_strings[j], '_', sizeof(btn_ident[j]));
fill_pathname_join_delim(key_ident[j], s2,
key_strings[j], '_', sizeof(btn_ident[j]));
/* only save values that have been modified */
if(j < RARCH_FIRST_CUSTOM_BIND) if(j < RARCH_FIRST_CUSTOM_BIND)
{ {
fill_pathname_join_delim(btn_ident[j], s1,
key_strings[j], '_', sizeof(btn_ident[j]));
fill_pathname_join_delim(key_ident[j], s2,
key_strings[j], '_', sizeof(btn_ident[j]));
/* only save values that have been modified */
if(settings->uints.input_remap_ids[i][j] != j && if(settings->uints.input_remap_ids[i][j] != j &&
settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED) settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED)
config_set_int(conf, btn_ident[j], settings->uints.input_remap_ids[i][j]); config_set_int(conf, btn_ident[j], settings->uints.input_remap_ids[i][j]);
@ -221,15 +225,16 @@ bool input_remapping_save_file(const char *path)
} }
else else
{ {
fill_pathname_join_delim(stk_ident[j], s3, k = j - RARCH_FIRST_CUSTOM_BIND;
key_strings[j], '_', sizeof(stk_ident[j])); fill_pathname_join_delim(stk_ident[k], s3,
key_strings[j], '_', sizeof(stk_ident[k]));
if(settings->uints.input_remap_ids[i][j] != j && if(settings->uints.input_remap_ids[i][j] != j &&
settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED) settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED)
config_set_int(conf, stk_ident[j], config_set_int(conf, stk_ident[k],
settings->uints.input_remap_ids[i][j]); settings->uints.input_remap_ids[i][j]);
else if(settings->uints.input_remap_ids[i][j] != j && else if(settings->uints.input_remap_ids[i][j] != j &&
settings->uints.input_remap_ids[i][j] == RARCH_UNMAPPED) settings->uints.input_remap_ids[i][j] == RARCH_UNMAPPED)
config_set_int(conf, stk_ident[j], config_set_int(conf, stk_ident[k],
-1); -1);
else else
config_unset(conf,btn_ident[j]); config_unset(conf,btn_ident[j]);
@ -289,16 +294,17 @@ void input_remapping_set_defaults(bool deinit)
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++) for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
{ {
const struct retro_keybind *keybind = &input_config_binds[i][j]; if (j < RARCH_FIRST_CUSTOM_BIND)
if (keybind) {
settings->uints.input_remap_ids[i][j] = keybind->id; const struct retro_keybind *keybind = &input_config_binds[i][j];
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN; if (keybind)
} settings->uints.input_remap_ids[i][j] = keybind->id;
for (j = RARCH_FIRST_CUSTOM_BIND; j < RARCH_FIRST_CUSTOM_BIND + 8; j++) settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
{ }
settings->uints.input_remap_ids[i][j] = j; else
settings->uints.input_remap_ids[i][j] = j;
} }
if (old_analog_dpad_mode[i]) if (old_analog_dpad_mode[i])

2
menu/cbs/menu_cbs_get_value.c
View File

@ -618,7 +618,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd(
remap_id = remap_id =
settings->uints.input_keymapper_ids[offset][id]; settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < RARCH_MAX_KEYS; key_id++) for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
{ {
if(remap_id == key_descriptors[key_id].key) if(remap_id == key_descriptors[key_id].key)
break; break;

3
menu/cbs/menu_cbs_left.c
View File

@ -394,8 +394,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
remap_id = remap_id =
settings->uints.input_keymapper_ids[offset][id]; settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < RARCH_MAX_KEYS + for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
{ {
if(remap_id == key_descriptors[key_id].key) if(remap_id == key_descriptors[key_id].key)
break; break;

3
menu/cbs/menu_cbs_right.c
View File

@ -120,8 +120,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
remap_id = remap_id =
settings->uints.input_keymapper_ids[offset][id]; settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - for (key_id = 0; key_id < RARCH_MAX_KEYS - 1; key_id++)
MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
{ {
if(remap_id == key_descriptors[key_id].key) if(remap_id == key_descriptors[key_id].key)
break; break;