mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create MENU_INPUT_CTL_BIND_SET_MIN_MAX

Browse Source
This commit is contained in:
twinaphex 2016-02-25 19:01:51 +01:00
parent 00a958edc2
commit 37d895d77b
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/menu_input.c
View File

@ -654,6 +654,16 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
switch (state) switch (state)
{ {
case MENU_INPUT_CTL_BIND_SET_MIN_MAX:
{
menu_input_ctx_bind_limits_t *lim = (menu_input_ctx_bind_limits_t*)data;
if (!lim || !menu_input)
return false;
menu_input->binds.begin = lim->min;
menu_input->binds.last = lim->max;
}
break;
case MENU_INPUT_CTL_CHECK_INSIDE_HITBOX: case MENU_INPUT_CTL_CHECK_INSIDE_HITBOX:
{ {
menu_input_ctx_hitbox_t *hitbox = (menu_input_ctx_hitbox_t*)data; menu_input_ctx_hitbox_t *hitbox = (menu_input_ctx_hitbox_t*)data;
@ -814,13 +824,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
void menu_input_key_bind_set_min_max(unsigned min, unsigned max) void menu_input_key_bind_set_min_max(unsigned min, unsigned max)
{ {
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return;
menu_input->binds.begin = min;
menu_input->binds.last = max;
} }
static int menu_input_mouse(unsigned *action) static int menu_input_mouse(unsigned *action)

9
menu/menu_input.h
View File

@ -94,6 +94,7 @@ enum menu_input_ctl_state
MENU_INPUT_CTL_BIND_SINGLE, MENU_INPUT_CTL_BIND_SINGLE,
MENU_INPUT_CTL_BIND_ALL, MENU_INPUT_CTL_BIND_ALL,
MENU_INPUT_CTL_BIND_ITERATE, MENU_INPUT_CTL_BIND_ITERATE,
MENU_INPUT_CTL_BIND_SET_MIN_MAX,
MENU_INPUT_CTL_START_LINE MENU_INPUT_CTL_START_LINE
}; };
@ -120,14 +121,18 @@ typedef struct menu_input_ctx_line
input_keyboard_line_complete_t cb; input_keyboard_line_complete_t cb;
} menu_input_ctx_line_t; } menu_input_ctx_line_t;
typedef struct menu_input_ctx_bind_limits
{
unsigned min;
unsigned max;
} menu_input_ctx_bind_limits_t;
/* Keyboard input callbacks */ /* Keyboard input callbacks */
void menu_input_st_uint_cb (void *userdata, const char *str); void menu_input_st_uint_cb (void *userdata, const char *str);
void menu_input_st_hex_cb (void *userdata, const char *str); void menu_input_st_hex_cb (void *userdata, const char *str);
void menu_input_st_string_cb(void *userdata, const char *str); void menu_input_st_string_cb(void *userdata, const char *str);
void menu_input_st_cheat_cb (void *userdata, const char *str); void menu_input_st_cheat_cb (void *userdata, const char *str);
void menu_input_key_bind_set_min_max(unsigned min, unsigned max);
unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state); unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state);
void menu_input_post_iterate(int *ret, unsigned action); void menu_input_post_iterate(int *ret, unsigned action);

7
menu/menu_setting.c
View File

@ -2572,6 +2572,7 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun
static int setting_action_ok_bind_defaults(void *data, bool wraparound) static int setting_action_ok_bind_defaults(void *data, bool wraparound)
{ {
unsigned i; unsigned i;
menu_input_ctx_bind_limits_t lim;
struct retro_keybind *target = NULL; struct retro_keybind *target = NULL;
const struct retro_keybind *def_binds = NULL; const struct retro_keybind *def_binds = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
@ -2590,8 +2591,10 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
if (!target) if (!target)
return -1; return -1;
menu_input_key_bind_set_min_max( lim.min = MENU_SETTINGS_BIND_BEGIN;
MENU_SETTINGS_BIND_BEGIN, MENU_SETTINGS_BIND_LAST); lim.max = MENU_SETTINGS_BIND_LAST;
menu_input_ctl(MENU_INPUT_CTL_BIND_SET_MIN_MAX, &lim);
for (i = MENU_SETTINGS_BIND_BEGIN; for (i = MENU_SETTINGS_BIND_BEGIN;
i <= MENU_SETTINGS_BIND_LAST; i++, target++) i <= MENU_SETTINGS_BIND_LAST; i++, target++)