mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Able to bind both keyboard and joypad keys now

Browse Source
This commit is contained in:
twinaphex 2015-11-07 14:33:18 +01:00
parent ac155dc8fc
commit 61623dcdce
1 changed files with 31 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
menu/menu_input.c
View File

@ -102,8 +102,6 @@ typedef struct menu_input
{ {
struct menu_bind_state binds; struct menu_bind_state binds;
bool bind_mode_keyboard;
uint64_t devices_mask; uint64_t devices_mask;
menu_input_mouse_t mouse; menu_input_mouse_t mouse;
@ -665,17 +663,10 @@ static int menu_input_key_bind_set_mode_common(rarch_setting_t *setting,
return 0; return 0;
} }
static void menu_input_key_bind_set_timeout(void)
{
menu_input_t *menu_input = menu_input_get_ptr();
menu_input->binds.timeout_end = retro_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
}
int menu_input_key_bind_set_mode(void *data, int menu_input_key_bind_set_mode(void *data,
enum menu_input_bind_mode type) enum menu_input_bind_mode type)
{ {
unsigned index_offset;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
@ -687,35 +678,15 @@ int menu_input_key_bind_set_mode(void *data,
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 -1;
switch (settings->input.bind_mode) index_offset = menu_setting_get_index_offset(setting);
{ bind_port = settings->input.joypad_map[index_offset];
case 0:
break;
case 1:
joypad_pressed = false;
break;
case 2:
joypad_pressed = true;
break;
}
if (joypad_pressed) menu_input_key_bind_poll_bind_get_rested_axes(&menu_input->binds, bind_port);
{ menu_input_key_bind_poll_bind_state(&menu_input->binds, bind_port, false);
unsigned index_offset = menu_setting_get_index_offset(setting);
bind_port = settings->input.joypad_map[index_offset];
menu_input_key_bind_poll_bind_get_rested_axes(&menu_input->binds, bind_port); menu_input->binds.timeout_end = retro_get_time_usec() +
menu_input_key_bind_poll_bind_state(&menu_input->binds, bind_port, false); MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
menu_input_key_bind_set_timeout();
menu_input->bind_mode_keyboard = false;
return 0;
}
menu_input->bind_mode_keyboard = true;
menu_input_key_bind_set_timeout();
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 0;
@ -732,13 +703,32 @@ void menu_input_key_bind_set_min_max(unsigned min, unsigned max)
menu_input->binds.last = max; menu_input->binds.last = max;
} }
static int menu_input_key_bind_iterate_keyboard(int64_t current, int timeout, bool timed_out) int menu_input_key_bind_iterate(char *s, size_t len)
{ {
menu_input_t *menu_input = menu_input_get_ptr(); struct menu_bind_state binds;
driver_t *driver = driver_get_ptr(); bool timed_out = false;
menu_input_t *menu_input = menu_input_get_ptr();
driver_t *driver = driver_get_ptr();
int64_t current = retro_get_time_usec();
int timeout = (menu_input->binds.timeout_end - current) / 1000000;
if (!menu_input) if (timeout <= 0)
return -1; {
input_driver_keyboard_mapping_set_block(false);
menu_input->binds.begin++;
menu_input->binds.target++;
menu_input->binds.timeout_end = retro_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
timed_out = true;
}
snprintf(s, len,
"[%s]\npress keyboard or joypad\n(timeout %d %s)",
input_config_bind_map[
menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
timeout,
menu_hash_to_str(MENU_VALUE_SECONDS));
/* binds.begin is updated in keyboard_press callback. */ /* binds.begin is updated in keyboard_press callback. */
if (menu_input->binds.begin > menu_input->binds.last) if (menu_input->binds.begin > menu_input->binds.last)
@ -753,49 +743,6 @@ static int menu_input_key_bind_iterate_keyboard(int64_t current, int timeout, bo
return 1; return 1;
} }
return 0;
}
int menu_input_key_bind_iterate(char *s, size_t len)
{
struct menu_bind_state binds;
bool timed_out = false;
menu_input_t *menu_input = menu_input_get_ptr();
driver_t *driver = driver_get_ptr();
bool bind_mode_kb = menu_input->bind_mode_keyboard;
int64_t current = retro_get_time_usec();
int timeout = (menu_input->binds.timeout_end - current) / 1000000;
if (timeout <= 0)
{
if (!bind_mode_kb)
input_driver_keyboard_mapping_set_block(false);
menu_input->binds.begin++;
menu_input->binds.target++;
menu_input->binds.timeout_end = retro_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
timed_out = true;
}
if (bind_mode_kb)
{
snprintf(s, len,
"[%s]\npress keyboard\n(timeout %d %s)",
input_config_bind_map[
menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
timeout,
menu_hash_to_str(MENU_VALUE_SECONDS));
return menu_input_key_bind_iterate_keyboard(current, timeout, timed_out);
}
else
snprintf(s, len,
"[%s]\npress joypad\n(timeout %d %s)",
input_config_bind_map[
menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
timeout,
menu_hash_to_str(MENU_VALUE_SECONDS));
binds = menu_input->binds; binds = menu_input->binds;
input_driver_keyboard_mapping_set_block(true); input_driver_keyboard_mapping_set_block(true);