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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-25 17:26:55 +01:00
parent b1a3d5bb25
commit 60c551fe75
5 changed files with 124 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_ok.c
View File

@ -938,7 +938,7 @@ static int action_ok_cheat(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_input_key_start_line("Input Cheat",
label, type, idx, menu_input_st_cheat_callback);
label, type, idx, menu_input_st_cheat_cb);
return 0;
}
@ -946,7 +946,7 @@ static int action_ok_shader_preset_save_as(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_input_key_start_line("Preset Filename",
label, type, idx, menu_input_st_string_callback);
label, type, idx, menu_input_st_string_cb);
return 0;
}
@ -954,7 +954,7 @@ static int action_ok_cheat_file_save_as(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_input_key_start_line("Cheat Filename",
label, type, idx, menu_input_st_string_callback);
label, type, idx, menu_input_st_string_cb);
return 0;
}

1
menu/menu_display.h
View File

@ -169,7 +169,6 @@ typedef struct menu_display_ctx_font
float size;
} menu_display_ctx_font_t;
bool menu_display_ctl(enum menu_display_ctl_state state, void *data);
void menu_display_handle_wallpaper_upload(void *task_data,

226
menu/menu_input.c
View File

@ -152,10 +152,6 @@ static menu_input_t *menu_input_get_ptr(void)
return &menu_input_state;
}
void menu_input_free(void)
{
}
static void menu_input_key_end_line(void)
{
bool keyboard_display = false;
@ -168,7 +164,7 @@ static void menu_input_key_end_line(void)
input_driver_ctl(RARCH_INPUT_CTL_SET_FLUSHING_INPUT, NULL);
}
static void menu_input_search_callback(void *userdata, const char *str)
static void menu_input_search_cb(void *userdata, const char *str)
{
size_t idx = 0;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
@ -186,6 +182,116 @@ static void menu_input_search_callback(void *userdata, const char *str)
menu_input_key_end_line();
}
void menu_input_st_uint_cb(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
menu_setting_set_with_string_representation(setting, str);
}
menu_input_key_end_line();
}
void menu_input_st_hex_cb(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
if (setting)
{
unsigned *ptr = (unsigned*)setting_get_ptr(setting);
if (str[0] == '#')
str++;
*ptr = strtoul(str, NULL, 16);
}
}
menu_input_key_end_line();
}
void menu_input_st_string_cb(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
if (setting)
{
menu_setting_set_with_string_representation(setting, str);
menu_setting_generic(setting, false);
}
else
{
uint32_t hash_label = menu_hash_calculate(label);
switch (hash_label)
{
case MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
menu_shader_manager_save_preset(str, false);
break;
case MENU_LABEL_CHEAT_FILE_SAVE_AS:
cheat_manager_save(str);
break;
}
}
}
menu_input_key_end_line();
}
void menu_input_st_cheat_cb(void *userdata, const char *str)
{
menu_input_t *menu_input = menu_input_get_ptr();
(void)userdata;
if (!menu_input)
return;
if (str && *str)
{
unsigned cheat_index = menu_input->keyboard.type - MENU_SETTINGS_CHEAT_BEGIN;
cheat_manager_set_code(cheat_index, str);
}
menu_input_key_end_line();
}
static bool menu_input_key_bind_custom_bind_keyboard_cb(
void *data, unsigned code)
{
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return false;
menu_input->binds.target->key = (enum retro_key)code;
menu_input->binds.begin++;
menu_input->binds.target++;
menu_input->binds.timeout_end = retro_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
return (menu_input->binds.begin <= menu_input->binds.last);
}
bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
{
menu_input_t *menu_input = menu_input_get_ptr();
@ -222,7 +328,7 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
menu_input->keyboard.display = true;
menu_input->keyboard.label = menu_hash_to_str(MENU_VALUE_SEARCH);
menu_input->keyboard.buffer =
input_keyboard_start_line(menu, menu_input_search_callback);
input_keyboard_start_line(menu, menu_input_search_cb);
break;
case MENU_INPUT_CTL_MOUSE_SCROLL_DOWN:
{
@ -344,98 +450,6 @@ void menu_input_key_start_line(const char *label,
menu_input->keyboard.buffer = input_keyboard_start_line(menu, cb);
}
void menu_input_st_uint_callback(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
menu_setting_set_with_string_representation(setting, str);
}
menu_input_key_end_line();
}
void menu_input_st_hex_callback(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
if (setting)
{
unsigned *ptr = (unsigned*)setting_get_ptr(setting);
if (str[0] == '#')
str++;
*ptr = strtoul(str, NULL, 16);
}
}
menu_input_key_end_line();
}
void menu_input_st_string_callback(void *userdata, const char *str)
{
if (str && *str)
{
rarch_setting_t *setting = NULL;
const char *label = NULL;
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING, &label);
setting = menu_setting_find(label);
if (setting)
{
menu_setting_set_with_string_representation(setting, str);
menu_setting_generic(setting, false);
}
else
{
uint32_t hash_label = menu_hash_calculate(label);
switch (hash_label)
{
case MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
menu_shader_manager_save_preset(str, false);
break;
case MENU_LABEL_CHEAT_FILE_SAVE_AS:
cheat_manager_save(str);
break;
}
}
}
menu_input_key_end_line();
}
void menu_input_st_cheat_callback(void *userdata, const char *str)
{
menu_input_t *menu_input = menu_input_get_ptr();
(void)userdata;
if (!menu_input)
return;
if (str && *str)
{
unsigned cheat_index = menu_input->keyboard.type - MENU_SETTINGS_CHEAT_BEGIN;
cheat_manager_set_code(cheat_index, str);
}
menu_input_key_end_line();
}
static void menu_input_key_bind_poll_bind_state_internal(
const input_device_driver_t *joypad,
@ -619,22 +633,6 @@ static bool menu_input_key_bind_poll_find_trigger(
return false;
}
static bool menu_input_key_bind_custom_bind_keyboard_cb(
void *data, unsigned code)
{
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return false;
menu_input->binds.target->key = (enum retro_key)code;
menu_input->binds.begin++;
menu_input->binds.target++;
menu_input->binds.timeout_end = retro_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
return (menu_input->binds.begin <= menu_input->binds.last);
}
static int menu_input_key_bind_set_mode_common(
rarch_setting_t *setting,

13
menu/menu_input.h
View File

@ -107,6 +107,12 @@ typedef struct menu_input_ctx_hitbox
int32_t y2;
} menu_input_ctx_hitbox_t;
/* Keyboard input callbacks */
void menu_input_st_uint_cb (void *userdata, const char *str);
void menu_input_st_hex_cb (void *userdata, const char *str);
void menu_input_st_string_cb(void *userdata, const char *str);
void menu_input_st_cheat_cb (void *userdata, const char *str);
void menu_input_key_start_line(const char *label,
const char *label_setting, unsigned type, unsigned idx,
input_keyboard_line_complete_t cb);
@ -117,13 +123,6 @@ int menu_input_key_bind_set_mode(void *data, enum menu_input_bind_mode type);
void menu_input_key_bind_set_min_max(unsigned min, unsigned max);
void menu_input_st_uint_callback(void *userdata, const char *str);
void menu_input_st_hex_callback(void *userdata, const char *str);
void menu_input_st_string_callback(void *userdata, const char *str);
void menu_input_st_cheat_callback(void *userdata, const char *str);
unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state);
void menu_input_post_iterate(int *ret, unsigned action);

6
menu/menu_setting.c
View File

@ -2649,14 +2649,14 @@ static int setting_generic_action_ok_linefeed(void *data, bool wraparound)
switch (menu_setting_get_type(setting))
{
case ST_UINT:
cb = menu_input_st_uint_callback;
cb = menu_input_st_uint_cb;
break;
case ST_HEX:
cb = menu_input_st_hex_callback;
cb = menu_input_st_hex_cb;
break;
case ST_STRING:
case ST_STRING_OPTIONS:
cb = menu_input_st_string_callback;
cb = menu_input_st_string_cb;
break;
default:
break;