mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed new settings to match change & cleaned code

Browse Source
This commit is contained in:
Romain Graillot 2016-10-15 13:38:42 +02:00
parent ade4e7857b
commit a64e497189
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/drivers_joypad/psp_joypad.c
View File

@ -238,11 +238,11 @@ static void psp_joypad_poll(void)
if (psp2_model == SCE_KERNEL_MODEL_VITA if (psp2_model == SCE_KERNEL_MODEL_VITA
&& !menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) && !menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)
&& settings->input.backtouch_enable) { && settings->input.backtouch_enable) {
SceTouchData back = {0}; SceTouchData touch_surface = {0};
sceTouchPeek(settings->input.backtouch_toggle ? SCE_TOUCH_PORT_FRONT : SCE_TOUCH_PORT_BACK, &back, 1); sceTouchPeek(settings->input.backtouch_toggle ? SCE_TOUCH_PORT_FRONT : SCE_TOUCH_PORT_BACK, &touch_surface, 1);
for (int i = 0; i < back.reportNum; i++) { for (int i = 0; i < touch_surface.reportNum; i++) {
int x = LERP(back.report[i].x, TOUCH_MAX_WIDTH, SCREEN_WIDTH); int x = LERP(touch_surface.report[i].x, TOUCH_MAX_WIDTH, SCREEN_WIDTH);
int y = LERP(back.report[i].y, TOUCH_MAX_HEIGHT, SCREEN_HEIGHT); int y = LERP(touch_surface.report[i].y, TOUCH_MAX_HEIGHT, SCREEN_HEIGHT);
if (NW_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_L2; if (NW_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_L2;
if (NE_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_R2; if (NE_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_R2;
if (SW_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_L3; if (SW_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_L3;

16
intl/msg_hash_jp.c
View File

@ -1508,11 +1508,11 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
"Numbers are described in frames." "Numbers are described in frames."
); );
break; break;
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE: case MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE:
snprintf(s, len, "Enable back touch support"); snprintf(s, len, "Enable touch support");
break; break;
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE: case MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH:
snprintf(s, len, "Switch back with front touch"); snprintf(s, len, "Use front instead of back touch");
break; break;
case MENU_ENUM_LABEL_MOUSE_ENABLE: case MENU_ENUM_LABEL_MOUSE_ENABLE:
snprintf(s, len, "Enable mouse input inside the menu."); snprintf(s, len, "Enable mouse input inside the menu.");
@ -2042,10 +2042,10 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
return "cheevos_test_unofficial"; return "cheevos_test_unofficial";
case MENU_ENUM_LABEL_CHEEVOS_ENABLE: case MENU_ENUM_LABEL_CHEEVOS_ENABLE:
return "cheevos_enable"; return "cheevos_enable";
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE: case MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE:
return "input_backtouch_enable"; return "input_touch_enable";
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE: case MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH:
return "input_backtouch_toggle"; return "input_prefer_front_touch";
case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE: case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE:
return "input_icade_enable"; return "input_icade_enable";
case MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: case MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:

8
intl/msg_hash_us.c
View File

@ -2098,10 +2098,10 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "cheevos_test_unofficial"; return "cheevos_test_unofficial";
case MENU_ENUM_LABEL_CHEEVOS_ENABLE: case MENU_ENUM_LABEL_CHEEVOS_ENABLE:
return "cheevos_enable"; return "cheevos_enable";
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE: case MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE:
return "input_backtouch_enable"; return "input_touch_enable";
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE: case MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH:
return "input_backtouch_toggle"; return "input_prefer_front_touch";
case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE: case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE:
return "input_icade_enable"; return "input_icade_enable";
case MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: case MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:

4
intl/msg_hash_uspseudo.c
View File

@ -2041,8 +2041,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
return "cheëvòs_tëst_ünõffìçial"; return "cheëvòs_tëst_ünõffìçial";
case MENU_ENUM_LABEL_CHEEVOS_ENABLE: case MENU_ENUM_LABEL_CHEEVOS_ENABLE:
return "çheévós_enable"; return "çheévós_enable";
case MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE: case MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE:
return "iñput_bâçktõüçh_ènable"; return "iñput_tõüçh_ènable";
case MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_TOGGLE_ENABLE: case MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_TOGGLE_ENABLE:
return "iñput_bâçktõüçh_toggle"; return "iñput_bâçktõüçh_toggle";
case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE: case MENU_ENUM_LABEL_INPUT_ICADE_ENABLE:

4
menu/menu_displaylist.c
View File

@ -5230,10 +5230,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
#endif #endif
#ifdef VITA #ifdef VITA
ret = menu_displaylist_parse_settings_enum(menu, info, ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE, MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
ret = menu_displaylist_parse_settings_enum(menu, info, ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE, MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#endif #endif
ret = menu_displaylist_parse_settings_enum(menu, info, ret = menu_displaylist_parse_settings_enum(menu, info,

8
menu/menu_setting.c
View File

@ -4095,7 +4095,7 @@ static bool setting_append_list(
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->input.backtouch_enable, &settings->input.backtouch_enable,
msg_hash_to_str(MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_ENABLE),
input_backtouch_enable, input_backtouch_enable,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
@ -4107,12 +4107,12 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_NONE SD_FLAG_NONE
); );
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE);
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->input.backtouch_toggle, &settings->input.backtouch_toggle,
msg_hash_to_str(MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_TOGGLE_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BACKTOUCH_TOGGLE_ENABLE),
input_backtouch_toggle, input_backtouch_toggle,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
@ -4124,7 +4124,7 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_NONE SD_FLAG_NONE
); );
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH);
#endif #endif
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE

4
msg_hash.h
View File

@ -434,8 +434,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE, MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD, MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD,
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,
MENU_ENUM_LABEL_INPUT_BACKTOUCH_ENABLE, MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE,
MENU_ENUM_LABEL_INPUT_BACKTOUCH_TOGGLE_ENABLE, MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH,
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE, MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,
MENU_ENUM_LABEL_INPUT_USER_1_BINDS, MENU_ENUM_LABEL_INPUT_USER_1_BINDS,
MENU_ENUM_LABEL_INPUT_USER_2_BINDS, MENU_ENUM_LABEL_INPUT_USER_2_BINDS,