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

Create RARCH_INPUT_KEYBOARD_CTL_LINE_FREE

This commit is contained in:
twinaphex 2016-03-24 03:36:38 +01:00
parent 870bce981d
commit ce9573e4c3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/input_keyboard.c
View File

@ -188,8 +188,7 @@ const char **input_keyboard_line_get_buffer(
const char **input_keyboard_start_line(void *userdata, const char **input_keyboard_start_line(void *userdata,
input_keyboard_line_complete_t cb) input_keyboard_line_complete_t cb)
{ {
if (g_keyboard_line) input_keyboard_ctl(RARCH_INPUT_KEYBOARD_CTL_LINE_FREE, NULL);
input_keyboard_line_free(g_keyboard_line);
g_keyboard_line = input_keyboard_line_new(userdata, cb); g_keyboard_line = input_keyboard_line_new(userdata, cb);
@ -249,8 +248,7 @@ void input_keyboard_event(bool down, unsigned code,
} }
/* Line is complete, can free it now. */ /* Line is complete, can free it now. */
input_keyboard_line_free(g_keyboard_line); input_keyboard_ctl(RARCH_INPUT_KEYBOARD_CTL_LINE_FREE, NULL);
g_keyboard_line = NULL;
/* Unblock all hotkeys. */ /* Unblock all hotkeys. */
input_driver_keyboard_mapping_set_block(false); input_driver_keyboard_mapping_set_block(false);
@ -271,6 +269,11 @@ bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data)
switch (state) switch (state)
{ {
case RARCH_INPUT_KEYBOARD_CTL_LINE_FREE:
if (g_keyboard_line)
input_keyboard_line_free(g_keyboard_line);
g_keyboard_line = NULL;
break;
case RARCH_INPUT_KEYBOARD_CTL_START_WAIT_KEYS: case RARCH_INPUT_KEYBOARD_CTL_START_WAIT_KEYS:
{ {
input_keyboard_ctx_wait_t *keys = (input_keyboard_ctx_wait_t*)data; input_keyboard_ctx_wait_t *keys = (input_keyboard_ctx_wait_t*)data;

2
input/input_keyboard.h
View File

@ -35,6 +35,8 @@ enum rarch_input_keyboard_ctl_state
RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED, RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED,
RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED,
RARCH_INPUT_KEYBOARD_CTL_LINE_FREE,
/* /*
* Waits for keys to be pressed (used for binding * Waits for keys to be pressed (used for binding
* keys in the menu). * keys in the menu).