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

Added "nul" binds.

This commit is contained in:
Themaister 2011-02-26 18:47:32 +01:00
parent f75c6df270
commit 13f8ec6f3b
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
settings.c
View File

@ -545,6 +545,7 @@ static const struct key_map sdlk_map[] = {
{ "f10", SDLK_F10 }, { "f10", SDLK_F10 },
{ "f11", SDLK_F11 }, { "f11", SDLK_F11 },
{ "f12", SDLK_F12 }, { "f12", SDLK_F12 },
{ "nul", SDLK_UNKNOWN },
}; };
static struct snes_keybind *find_snes_bind(unsigned port, int id) static struct snes_keybind *find_snes_bind(unsigned port, int id)
@ -578,6 +579,7 @@ static int find_sdlk_key(const char *str)
return find_sdlk_bind(str); return find_sdlk_bind(str);
} }
// Yes, this function needs a good refactor :)
static void read_keybinds(config_file_t *conf) static void read_keybinds(config_file_t *conf)
{ {
char *tmp_key = NULL; char *tmp_key = NULL;
@ -606,6 +608,12 @@ static void read_keybinds(config_file_t *conf)
if (bind_maps[j][i].btn && config_get_string(conf, bind_maps[j][i].btn, &tmp_btn)) if (bind_maps[j][i].btn && config_get_string(conf, bind_maps[j][i].btn, &tmp_btn))
{ {
const char *btn = tmp_btn; const char *btn = tmp_btn;
if (strcmp(tmp_btn, "nul") == 0)
{
bind->joykey = NO_BTN;
}
else
{
if (*btn++ == 'h') if (*btn++ == 'h')
{ {
if (isdigit(*btn)) if (isdigit(*btn))
@ -631,12 +639,17 @@ static void read_keybinds(config_file_t *conf)
} }
else else
bind->joykey = strtol(tmp_btn, NULL, 0); bind->joykey = strtol(tmp_btn, NULL, 0);
}
free(tmp_btn); free(tmp_btn);
} }
if (bind_maps[j][i].axis && config_get_string(conf, bind_maps[j][i].axis, &tmp_axis)) if (bind_maps[j][i].axis && config_get_string(conf, bind_maps[j][i].axis, &tmp_axis))
{ {
if (strlen(tmp_axis) >= 2 && (*tmp_axis == '+' || *tmp_axis == '-')) if (strcmp(tmp_axis, "nul") == 0)
{
bind->joyaxis = AXIS_NONE;
}
else if (strlen(tmp_axis) >= 2 && (*tmp_axis == '+' || *tmp_axis == '-'))
{ {
int axis = strtol(tmp_axis + 1, NULL, 0); int axis = strtol(tmp_axis + 1, NULL, 0);
if (*tmp_axis == '+') if (*tmp_axis == '+')

2
ssnes.cfg
View File

@ -90,6 +90,8 @@
# input_axis_threshold = 0.5 # input_axis_threshold = 0.5
# Keyboard input. Will recognize normal keypresses and special keys like "left", "right", and so on. # Keyboard input. Will recognize normal keypresses and special keys like "left", "right", and so on.
# Keyboard input, Joypad and Joyaxis will all obey the "nul" bind, which disables the bind completely,
# rather than relying on a default.
# input_player1_a = x # input_player1_a = x
# input_player1_b = z # input_player1_b = z
# input_player1_y = a # input_player1_y = a