CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-22 02:44:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2014 from fr500/master

Browse Source 
Make "Bind All" more predictable
This commit is contained in:
Twinaphex 2015-07-27 04:11:04 +02:00
commit f5f8e07d59
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
menu/menu_input.c
View File

@ -39,6 +39,8 @@
#include "../input/input_remapping.h"
#include "../input/input_common.h"
unsigned bind_port;
menu_input_t *menu_input_get_ptr(void)
{
menu_handle_t *menu = menu_driver_get_ptr();
@ -216,7 +218,7 @@ void menu_input_key_event(bool down, unsigned keycode,
menu_entry_action(NULL, 0, MENU_ACTION_SEARCH);
}
static void menu_input_poll_bind_state(struct menu_bind_state *state)
static void menu_input_poll_bind_state(struct menu_bind_state *state, unsigned port)
{
unsigned i, b, a, h;
const input_device_driver_t *joypad = input_driver_get_joypad_driver();
@ -238,29 +240,28 @@ static void menu_input_poll_bind_state(struct menu_bind_state *state)
if (joypad->poll)
joypad->poll();
for (i = 0; i < settings->input.max_users; i++)
/* poll only the relevant port */
/* for (i = 0; i < settings->input.max_users; i++) */
for (b = 0; b < MENU_MAX_BUTTONS; b++)
state->state[port].buttons[b] = input_joypad_button_raw(joypad, port, b);
for (a = 0; a < MENU_MAX_AXES; a++)
state->state[port].axes[a] = input_joypad_axis_raw(joypad, port, a);
for (h = 0; h < MENU_MAX_HATS; h++)
{
for (b = 0; b < MENU_MAX_BUTTONS; b++)
state->state[i].buttons[b] = input_joypad_button_raw(joypad, i, b);
for (a = 0; a < MENU_MAX_AXES; a++)
state->state[i].axes[a] = input_joypad_axis_raw(joypad, i, a);
for (h = 0; h < MENU_MAX_HATS; h++)
{
if (input_joypad_hat_raw(joypad, i, HAT_UP_MASK, h))
state->state[i].hats[h] |= HAT_UP_MASK;
if (input_joypad_hat_raw(joypad, i, HAT_DOWN_MASK, h))
state->state[i].hats[h] |= HAT_DOWN_MASK;
if (input_joypad_hat_raw(joypad, i, HAT_LEFT_MASK, h))
state->state[i].hats[h] |= HAT_LEFT_MASK;
if (input_joypad_hat_raw(joypad, i, HAT_RIGHT_MASK, h))
state->state[i].hats[h] |= HAT_RIGHT_MASK;
}
if (input_joypad_hat_raw(joypad, port, HAT_UP_MASK, h))
state->state[port].hats[h] |= HAT_UP_MASK;
if (input_joypad_hat_raw(joypad, port, HAT_DOWN_MASK, h))
state->state[port].hats[h] |= HAT_DOWN_MASK;
if (input_joypad_hat_raw(joypad, port, HAT_LEFT_MASK, h))
state->state[port].hats[h] |= HAT_LEFT_MASK;
if (input_joypad_hat_raw(joypad, port, HAT_RIGHT_MASK, h))
state->state[port].hats[h] |= HAT_RIGHT_MASK;
}
}
static void menu_input_poll_bind_get_rested_axes(struct menu_bind_state *state)
static void menu_input_poll_bind_get_rested_axes(struct menu_bind_state *state, unsigned port)
{
unsigned i, a;
const input_device_driver_t *joypad = input_driver_get_joypad_driver();
@ -275,10 +276,11 @@ static void menu_input_poll_bind_get_rested_axes(struct menu_bind_state *state)
return;
}
for (i = 0; i < settings->input.max_users; i++)
for (a = 0; a < MENU_MAX_AXES; a++)
state->axis_state[i].rested_axes[a] =
input_joypad_axis_raw(joypad, i, a);
/* poll only the relevant port */
/*for (i = 0; i < settings->input.max_users; i++)*/
for (a = 0; a < MENU_MAX_AXES; a++)
state->axis_state[port].rested_axes[a] =
input_joypad_axis_raw(joypad, port, a);
}
static bool menu_input_poll_find_trigger_pad(struct menu_bind_state *state,
@ -369,7 +371,7 @@ static bool menu_input_poll_find_trigger(struct menu_bind_state *state,
/* Update the joypad mapping automatically.
* More friendly that way. */
settings->input.joypad_map[state->user] = i;
//settings->input.joypad_map[state->user] = i;
return true;
}
return false;
@ -477,14 +479,17 @@ int menu_input_set_input_device_bind_mode(void *data,
{
menu_input_t *menu_input = menu_input_get_ptr();
rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr();
bind_port = settings->input.joypad_map[setting->index_offset];
if (!setting)
return -1;
if (menu_input_set_bind_mode_common(setting, type) == -1)
return -1;
menu_input_poll_bind_get_rested_axes(&menu_input->binds);
menu_input_poll_bind_state(&menu_input->binds);
menu_input_poll_bind_get_rested_axes(&menu_input->binds, bind_port);
menu_input_poll_bind_state(&menu_input->binds, bind_port);
return 0;
}
@ -563,7 +568,7 @@ int menu_input_bind_iterate(void)
binds = menu_input->binds;
input_driver_keyboard_mapping_set_block(true);
menu_input_poll_bind_state(&binds);
menu_input_poll_bind_state(&binds, bind_port);
if ((binds.skip && !menu_input->binds.skip) ||
menu_input_poll_find_trigger(&menu_input->binds, &binds))

1
menu/menu_setting.c
View File

@ -1116,7 +1116,6 @@ static int core_list_action_toggle(void *data, bool wraparound)
static int setting_action_ok_bind_all(void *data, bool wraparound)
{
global_t *global = global_get_ptr();
(void)wraparound;
if (!global)