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

Create menu_input_dialog_get_buffer

This commit is contained in:
twinaphex 2016-09-15 18:56:51 +02:00
parent bb5543c2a1
commit 982a818b48
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/materialui.c
View File

@ -1205,8 +1205,9 @@ static void mui_frame(void *data)
if (menu_input_dialog_get_display_kb())
{
const char *str = NULL, *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
const char *label = NULL;
const char *str = menu_input_dialog_get_buffer();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL, &label);
if (!str)

4
menu/drivers/rgui.c
View File

@ -611,9 +611,9 @@ static void rgui_render(void *data)
if (menu_input_dialog_get_display_kb())
{
const char *str = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
const char *str = menu_input_dialog_get_buffer();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL, &label);
if (!str)

4
menu/drivers/xmb.c
View File

@ -2366,9 +2366,9 @@ static void xmb_frame(void *data)
if (menu_input_dialog_get_display_kb())
{
const char *str = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
const char *str = menu_input_dialog_get_buffer();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL, &label);
if (!str)

7
menu/drivers/xui.cpp
View File

@ -592,9 +592,10 @@ static void xui_render(void *data)
if (display_kb)
{
char msg[1024] = {0};
const char *str = NULL, *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
char msg[1024] = {0};
const char *label = NULL;
const char *str = menu_input_dialog_get_buffer();
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL, &label);
if (!str)

10
menu/menu_input.c
View File

@ -635,6 +635,10 @@ bool menu_input_mouse_check_vector_inside_hitbox(menu_input_ctx_hitbox_t *hitbox
return inside_hitbox;
}
const char *menu_input_dialog_get_buffer(void)
{
return *menu_input_keyboard_buffer;
}
bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
{
@ -693,12 +697,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
case MENU_INPUT_CTL_UNSET_POINTER_DRAGGED:
pointer_dragging = false;
break;
case MENU_INPUT_CTL_KEYBOARD_BUFF_PTR:
{
const char **ptr = (const char**)data;
*ptr = *menu_input_keyboard_buffer;
}
break;
case MENU_INPUT_CTL_KEYBOARD_LABEL:
{
const char **ptr = (const char**)data;

3
menu/menu_input.h
View File

@ -76,7 +76,6 @@ enum menu_input_ctl_state
MENU_INPUT_CTL_IS_POINTER_DRAGGED,
MENU_INPUT_CTL_SET_POINTER_DRAGGED,
MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
MENU_INPUT_CTL_KEYBOARD_BUFF_PTR,
MENU_INPUT_CTL_KEYBOARD_LABEL,
MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING,
MENU_INPUT_CTL_DEINIT,
@ -110,6 +109,8 @@ typedef struct menu_input_ctx_line
input_keyboard_line_complete_t cb;
} menu_input_ctx_line_t;
const char *menu_input_dialog_get_buffer(void);
bool menu_input_dialog_start_search(void);
void menu_input_dialog_hide_kb(void);