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

Add MENU_INPUT_CTL_UNSET_KEYBOARD_*

This commit is contained in:
twinaphex 2015-10-03 22:09:12 +02:00
parent 3fb709ef4c
commit 864a93def9
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu_input.c
View File

@ -169,8 +169,8 @@ static void menu_input_key_end_line(void)
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_input_ctl(MENU_INPUT_CTL_SET_KEYBOARD_DISPLAY, &keyboard_display); menu_input_ctl(MENU_INPUT_CTL_SET_KEYBOARD_DISPLAY, &keyboard_display);
menu_input_ctl(MENU_INPUT_CTL_SET_KEYBOARD_LABEL, NULL); menu_input_ctl(MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL, NULL);
menu_input_ctl(MENU_INPUT_CTL_SET_KEYBOARD_LABEL_SETTING, NULL); menu_input_ctl(MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL_SETTING, NULL);
/* Avoid triggering states on pressing return. */ /* Avoid triggering states on pressing return. */
driver->flushing_input = true; driver->flushing_input = true;
@ -282,6 +282,12 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
menu_input->keyboard.label = ptr; menu_input->keyboard.label = ptr;
} }
return true; return true;
case MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL:
{
const char *ptr = (const char*)data;
menu_input->keyboard.label = NULL;
}
return true;
case MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING: case MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING:
{ {
const char **ptr = (const char**)data; const char **ptr = (const char**)data;
@ -294,6 +300,12 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
menu_input->keyboard.label_setting = ptr; menu_input->keyboard.label_setting = ptr;
} }
return true; return true;
case MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL_SETTING:
{
const char *ptr = (const char*)data;
menu_input->keyboard.label_setting = NULL;
}
return true;
} }
return false; return false;

2
menu/menu_input.h
View File

@ -72,8 +72,10 @@ enum menu_input_ctl_state
MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, MENU_INPUT_CTL_KEYBOARD_BUFF_PTR,
MENU_INPUT_CTL_KEYBOARD_LABEL, MENU_INPUT_CTL_KEYBOARD_LABEL,
MENU_INPUT_CTL_SET_KEYBOARD_LABEL, MENU_INPUT_CTL_SET_KEYBOARD_LABEL,
MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL,
MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING,
MENU_INPUT_CTL_SET_KEYBOARD_LABEL_SETTING, MENU_INPUT_CTL_SET_KEYBOARD_LABEL_SETTING,
MENU_INPUT_CTL_UNSET_KEYBOARD_LABEL_SETTING,
MENU_INPUT_CTL_SEARCH_START MENU_INPUT_CTL_SEARCH_START
}; };