mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix joypad A button in OSK

Browse Source
This commit is contained in:
Brad Parker 2016-10-28 23:44:42 -04:00
parent 763a925a17
commit 3354c07810
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_keyboard.c
View File

@ -46,6 +46,13 @@ static input_keyboard_press_t g_keyboard_press_cb;
static void *g_keyboard_press_data; static void *g_keyboard_press_data;
static bool return_pressed;
bool input_keyboard_return_pressed()
{
return return_pressed;
}
static void input_keyboard_line_toggle_osk(bool enable) static void input_keyboard_line_toggle_osk(bool enable)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -200,6 +207,9 @@ void input_keyboard_event(bool down, unsigned code,
{ {
static bool deferred_wait_keys; static bool deferred_wait_keys;
if (code == RETROK_RETURN || code == RETROK_UNKNOWN)
return_pressed = down;
if (deferred_wait_keys) if (deferred_wait_keys)
{ {
if (down) if (down)

2
input/input_keyboard.h
View File

@ -96,6 +96,8 @@ const char **input_keyboard_start_line(void *userdata,
bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data); bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data);
bool input_keyboard_return_pressed();
RETRO_END_DECLS RETRO_END_DECLS
#endif #endif

2
runloop.c
View File

@ -885,7 +885,7 @@ static enum runloop_state runloop_check_state(
menu_ctx_iterate_t iter; menu_ctx_iterate_t iter;
bool skip = false; bool skip = false;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
skip = osk_enable && BIT64_GET(trigger_input, settings->menu_ok_btn); skip = osk_enable && input_keyboard_return_pressed();
#endif #endif
if (!skip) if (!skip)