CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 14:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-25 17:32:12 +01:00
parent 60c551fe75
commit 22f6d1ce1d
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/menu_input.c
View File

@ -701,8 +701,7 @@ static int menu_input_key_bind_set_mode_common(
return 0; return 0;
} }
int menu_input_key_bind_set_mode(void *data, bool menu_input_key_bind_set_mode(enum menu_input_bind_mode type, void *data)
enum menu_input_bind_mode type)
{ {
unsigned index_offset; unsigned index_offset;
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
@ -711,11 +710,11 @@ int menu_input_key_bind_set_mode(void *data,
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting) if (!setting)
return -1; return false;
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return -1; return false;
if (menu_input_key_bind_set_mode_common(setting, type) == -1) if (menu_input_key_bind_set_mode_common(setting, type) == -1)
return -1; return false;
index_offset = menu_setting_get_index_offset(setting); index_offset = menu_setting_get_index_offset(setting);
bind_port = settings->input.joypad_map[index_offset]; bind_port = settings->input.joypad_map[index_offset];
@ -730,7 +729,7 @@ int menu_input_key_bind_set_mode(void *data,
input_keyboard_wait_keys(menu, input_keyboard_wait_keys(menu,
menu_input_key_bind_custom_bind_keyboard_cb); menu_input_key_bind_custom_bind_keyboard_cb);
return 0; return true;
} }
void menu_input_key_bind_set_min_max(unsigned min, unsigned max) void menu_input_key_bind_set_min_max(unsigned min, unsigned max)
@ -744,7 +743,7 @@ void menu_input_key_bind_set_min_max(unsigned min, unsigned max)
menu_input->binds.last = max; menu_input->binds.last = max;
} }
int menu_input_key_bind_iterate(char *s, size_t len) bool menu_input_key_bind_iterate(char *s, size_t len)
{ {
struct menu_bind_state binds; struct menu_bind_state binds;
bool timed_out = false; bool timed_out = false;
@ -780,7 +779,7 @@ int menu_input_key_bind_iterate(char *s, size_t len)
if (timed_out) if (timed_out)
input_keyboard_wait_keys_cancel(); input_keyboard_wait_keys_cancel();
return 1; return true;
} }
binds = menu_input->binds; binds = menu_input->binds;
@ -799,7 +798,7 @@ int menu_input_key_bind_iterate(char *s, size_t len)
binds.begin++; binds.begin++;
if (binds.begin > binds.last) if (binds.begin > binds.last)
return 1; return true;
binds.target++; binds.target++;
binds.timeout_end = retro_get_time_usec() + binds.timeout_end = retro_get_time_usec() +
@ -807,7 +806,7 @@ int menu_input_key_bind_iterate(char *s, size_t len)
} }
menu_input->binds = binds; menu_input->binds = binds;
return 0; return false;
} }
static int menu_input_mouse(unsigned *action) static int menu_input_mouse(unsigned *action)

11
menu/menu_input.h
View File

@ -107,6 +107,12 @@ typedef struct menu_input_ctx_hitbox
int32_t y2; int32_t y2;
} menu_input_ctx_hitbox_t; } menu_input_ctx_hitbox_t;
typedef struct menu_input_ctx_bind
{
char *s;
size_t len;
} menu_input_ctx_bind_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);
@ -117,9 +123,10 @@ void menu_input_key_start_line(const char *label,
const char *label_setting, unsigned type, unsigned idx, const char *label_setting, unsigned type, unsigned idx,
input_keyboard_line_complete_t cb); input_keyboard_line_complete_t cb);
int menu_input_key_bind_iterate(char *s, size_t len); bool menu_input_key_bind_iterate(char *s, size_t len);
int menu_input_key_bind_set_mode(void *data, enum menu_input_bind_mode type); bool menu_input_key_bind_set_mode(enum menu_input_bind_mode type,
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);

4
menu/menu_setting.c
View File

@ -2548,7 +2548,7 @@ static int setting_action_ok_bind_all(void *data, bool wraparound)
if (!global) if (!global)
return -1; return -1;
menu_input_key_bind_set_mode(data, MENU_INPUT_BIND_ALL); menu_input_key_bind_set_mode(MENU_INPUT_BIND_ALL, data);
return 0; return 0;
} }
@ -2687,7 +2687,7 @@ static int setting_bind_action_ok(void *data, bool wraparound)
{ {
(void)wraparound; (void)wraparound;
menu_input_key_bind_set_mode(data, MENU_INPUT_BIND_SINGLE); menu_input_key_bind_set_mode(MENU_INPUT_BIND_SINGLE, data);
return 0; return 0;
} }