mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic configuration seems to work.

Browse Source
This commit is contained in:
Themaister 2013-09-29 19:09:33 +02:00
parent dad5e347d8
commit c5a033f7e1
3 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/menu/menu_common.c
View File

@ -787,10 +787,28 @@ void menu_poll_bind_state(struct rgui_bind_state *state)
} }
} }
static bool menu_poll_find_trigger_pad(struct rgui_bind_state *state, const struct rgui_bind_state *new_state, unsigned p) void menu_poll_bind_get_rested_axes(struct rgui_bind_state *state)
{
const rarch_joypad_driver_t *joypad = NULL;
if (driver.input && driver.input_data && driver.input->get_joypad_driver)
joypad = driver.input->get_joypad_driver(driver.input_data);
if (!joypad)
{
RARCH_ERR("Cannot poll raw joypad state.");
return;
}
for (unsigned p = 0; p < MAX_PLAYERS; p++)
for (unsigned a = 0; a < RGUI_MAX_AXES; a++)
state->axis_state[p].rested_axes[a] = input_joypad_axis_raw(joypad, p, a);
}
static bool menu_poll_find_trigger_pad(struct rgui_bind_state *state, struct rgui_bind_state *new_state, unsigned p)
{ {
const struct rgui_bind_state_port *n = &new_state->state[p]; const struct rgui_bind_state_port *n = &new_state->state[p];
const struct rgui_bind_state_port *o = &state->state[p]; const struct rgui_bind_state_port *o = &state->state[p];
for (unsigned b = 0; b < RGUI_MAX_BUTTONS; b++) for (unsigned b = 0; b < RGUI_MAX_BUTTONS; b++)
{ {
if (n->buttons[b] && !o->buttons[b]) if (n->buttons[b] && !o->buttons[b])
@ -801,15 +819,26 @@ static bool menu_poll_find_trigger_pad(struct rgui_bind_state *state, const stru
} }
} }
// Axes are a bit tricky ...
for (unsigned a = 0; a < RGUI_MAX_AXES; a++) for (unsigned a = 0; a < RGUI_MAX_AXES; a++)
{ {
int axis_distance = abs(n->axes[a] - o->axes[a]); int locked_distance = abs(n->axes[a] - new_state->axis_state[p].locked_axes[a]);
if (abs(n->axes[a]) >= 20000 && axis_distance >= 20000) // Take care of case where axis rests on +/- 0x7fff (e.g. 360 controller on Linux) int rested_distance = abs(n->axes[a] - new_state->axis_state[p].rested_axes[a]);
if (abs(n->axes[a]) >= 20000 &&
locked_distance >= 20000 &&
rested_distance >= 20000) // Take care of case where axis rests on +/- 0x7fff (e.g. 360 controller on Linux)
{ {
state->target->joyaxis = n->axes[a] > 0 ? AXIS_POS(a) : AXIS_NEG(a); state->target->joyaxis = n->axes[a] > 0 ? AXIS_POS(a) : AXIS_NEG(a);
state->target->joykey = NO_BTN; state->target->joykey = NO_BTN;
// Lock the current axis.
new_state->axis_state[p].locked_axes[a] = n->axes[a] > 0 ? 0x7fff : -0x7fff;
return true; return true;
} }
if (locked_distance >= 20000) // Unlock the axis.
new_state->axis_state[p].locked_axes[a] = 0;
} }
for (unsigned h = 0; h < RGUI_MAX_HATS; h++) for (unsigned h = 0; h < RGUI_MAX_HATS; h++)
@ -836,7 +865,7 @@ static bool menu_poll_find_trigger_pad(struct rgui_bind_state *state, const stru
return false; return false;
} }
bool menu_poll_find_trigger(struct rgui_bind_state *state, const struct rgui_bind_state *new_state) bool menu_poll_find_trigger(struct rgui_bind_state *state, struct rgui_bind_state *new_state)
{ {
for (unsigned p = 0; p < MAX_PLAYERS; p++) for (unsigned p = 0; p < MAX_PLAYERS; p++)
{ {

13
frontend/menu/menu_common.h
View File

@ -197,6 +197,15 @@ struct rgui_bind_state_port
bool buttons[RGUI_MAX_BUTTONS]; bool buttons[RGUI_MAX_BUTTONS];
int16_t axes[RGUI_MAX_AXES]; int16_t axes[RGUI_MAX_AXES];
uint16_t hats[RGUI_MAX_HATS]; uint16_t hats[RGUI_MAX_HATS];
};
struct rgui_bind_axis_state
{
// Default axis state.
int16_t rested_axes[RGUI_MAX_AXES];
// Locked axis state. If we configured an axis, avoid having the same axis state trigger something again right away.
int16_t locked_axes[RGUI_MAX_AXES];
}; };
struct rgui_bind_state struct rgui_bind_state
@ -204,11 +213,13 @@ struct rgui_bind_state
struct retro_keybind *target; struct retro_keybind *target;
unsigned player; unsigned player;
struct rgui_bind_state_port state[MAX_PLAYERS]; struct rgui_bind_state_port state[MAX_PLAYERS];
struct rgui_bind_axis_state axis_state[MAX_PLAYERS];
bool skip; bool skip;
}; };
void menu_poll_bind_get_rested_axes(struct rgui_bind_state *state);
void menu_poll_bind_state(struct rgui_bind_state *state); void menu_poll_bind_state(struct rgui_bind_state *state);
bool menu_poll_find_trigger(struct rgui_bind_state *state, const struct rgui_bind_state *new_state); bool menu_poll_find_trigger(struct rgui_bind_state *state, struct rgui_bind_state *new_state);
typedef struct typedef struct
{ {

1
frontend/menu/rgui.c
View File

@ -720,6 +720,7 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
rgui->binds.target = bind; rgui->binds.target = bind;
rgui->binds.player = port; rgui->binds.player = port;
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND, rgui->selection_ptr); rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND, rgui->selection_ptr);
menu_poll_bind_get_rested_axes(&rgui->binds);
menu_poll_bind_state(&rgui->binds); menu_poll_bind_state(&rgui->binds);
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)