diff --git a/input/input_config.c b/input/input_config.c index 34428a5a22..48de5146fd 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -48,7 +48,7 @@ struct input_bind_map unsigned meta; const char *base; - const char *desc; + enum msg_hash_enums desc; unsigned retro_key; }; @@ -75,66 +75,66 @@ static const char *bind_user_prefix[MAX_USERS] = { #define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind } const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = { - DECLARE_BIND(b, RETRO_DEVICE_ID_JOYPAD_B, "B button (down)"), - DECLARE_BIND(y, RETRO_DEVICE_ID_JOYPAD_Y, "Y button (left)"), - DECLARE_BIND(select, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select button"), - DECLARE_BIND(start, RETRO_DEVICE_ID_JOYPAD_START, "Start button"), - DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, "Up D-pad"), - DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down D-pad"), - DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left D-pad"), - DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right D-pad"), - DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, "A button (right)"), - DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, "X button (top)"), - DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, "L button (shoulder)"), - DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, "R button (shoulder)"), - DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, "L2 button (trigger)"), - DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, "R2 button (trigger)"), - DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, "L3 button (thumb)"), - DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, "R3 button (thumb)"), - DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, "Left analog X+ (right)"), - DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, "Left analog X- (left)"), - DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, "Left analog Y+ (down)"), - DECLARE_BIND(l_y_minus, RARCH_ANALOG_LEFT_Y_MINUS, "Left analog Y- (up)"), - DECLARE_BIND(r_x_plus, RARCH_ANALOG_RIGHT_X_PLUS, "Right analog X+ (right)"), - DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, "Right analog X- (left)"), - DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, "Right analog Y+ (down)"), - DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, "Right analog Y- (up)"), + DECLARE_BIND(b, RETRO_DEVICE_ID_JOYPAD_B, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B), + DECLARE_BIND(y, RETRO_DEVICE_ID_JOYPAD_Y, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y), + DECLARE_BIND(select, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT), + DECLARE_BIND(start, RETRO_DEVICE_ID_JOYPAD_START, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START), + DECLARE_BIND(up, RETRO_DEVICE_ID_JOYPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP), + DECLARE_BIND(down, RETRO_DEVICE_ID_JOYPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN), + DECLARE_BIND(left, RETRO_DEVICE_ID_JOYPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT), + DECLARE_BIND(right, RETRO_DEVICE_ID_JOYPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT), + DECLARE_BIND(a, RETRO_DEVICE_ID_JOYPAD_A, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A), + DECLARE_BIND(x, RETRO_DEVICE_ID_JOYPAD_X, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X), + DECLARE_BIND(l, RETRO_DEVICE_ID_JOYPAD_L, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L), + DECLARE_BIND(r, RETRO_DEVICE_ID_JOYPAD_R, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R), + DECLARE_BIND(l2, RETRO_DEVICE_ID_JOYPAD_L2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2), + DECLARE_BIND(r2, RETRO_DEVICE_ID_JOYPAD_R2, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2), + DECLARE_BIND(l3, RETRO_DEVICE_ID_JOYPAD_L3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3), + DECLARE_BIND(r3, RETRO_DEVICE_ID_JOYPAD_R3, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3), + DECLARE_BIND(l_x_plus, RARCH_ANALOG_LEFT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS), + DECLARE_BIND(l_x_minus, RARCH_ANALOG_LEFT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS), + DECLARE_BIND(l_y_plus, RARCH_ANALOG_LEFT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS), + DECLARE_BIND(l_y_minus, RARCH_ANALOG_LEFT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS), + DECLARE_BIND(r_x_plus, RARCH_ANALOG_RIGHT_X_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS), + DECLARE_BIND(r_x_minus, RARCH_ANALOG_RIGHT_X_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS), + DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS), + DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS), - DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, "Turbo enable"), + DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE), - DECLARE_META_BIND(1, toggle_fast_forward, RARCH_FAST_FORWARD_KEY, "Fast forward toggle"), - DECLARE_META_BIND(2, hold_fast_forward, RARCH_FAST_FORWARD_HOLD_KEY, "Fast forward hold"), - DECLARE_META_BIND(1, load_state, RARCH_LOAD_STATE_KEY, "Load state"), - DECLARE_META_BIND(1, save_state, RARCH_SAVE_STATE_KEY, "Save state"), - DECLARE_META_BIND(2, toggle_fullscreen, RARCH_FULLSCREEN_TOGGLE_KEY, "Fullscreen toggle"), - DECLARE_META_BIND(2, exit_emulator, RARCH_QUIT_KEY, "Quit RetroArch"), - DECLARE_META_BIND(2, state_slot_increase, RARCH_STATE_SLOT_PLUS, "Savestate slot +"), - DECLARE_META_BIND(2, state_slot_decrease, RARCH_STATE_SLOT_MINUS, "Savestate slot -"), - DECLARE_META_BIND(1, rewind, RARCH_REWIND, "Rewind"), - DECLARE_META_BIND(2, movie_record_toggle, RARCH_MOVIE_RECORD_TOGGLE, "Movie record toggle"), - DECLARE_META_BIND(2, pause_toggle, RARCH_PAUSE_TOGGLE, "Pause toggle"), - DECLARE_META_BIND(2, frame_advance, RARCH_FRAMEADVANCE, "Frameadvance"), - DECLARE_META_BIND(2, reset, RARCH_RESET, "Reset game"), - DECLARE_META_BIND(2, shader_next, RARCH_SHADER_NEXT, "Next shader"), - DECLARE_META_BIND(2, shader_prev, RARCH_SHADER_PREV, "Previous shader"), - DECLARE_META_BIND(2, cheat_index_plus, RARCH_CHEAT_INDEX_PLUS, "Cheat index +"), - DECLARE_META_BIND(2, cheat_index_minus, RARCH_CHEAT_INDEX_MINUS, "Cheat index -"), - DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, "Cheat toggle"), - DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, "Take screenshot"), - DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, "Audio mute toggle"), - DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, "On-screen keyboard toggle"), - DECLARE_META_BIND(2, netplay_flip_players, RARCH_NETPLAY_FLIP, "Netplay flip users"), - DECLARE_META_BIND(2, slowmotion, RARCH_SLOWMOTION, "Slow motion"), - DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, "Enable hotkeys"), - DECLARE_META_BIND(2, volume_up, RARCH_VOLUME_UP, "Volume +"), - DECLARE_META_BIND(2, volume_down, RARCH_VOLUME_DOWN, "Volume -"), - DECLARE_META_BIND(2, overlay_next, RARCH_OVERLAY_NEXT, "Overlay next"), - DECLARE_META_BIND(2, disk_eject_toggle, RARCH_DISK_EJECT_TOGGLE, "Disk eject toggle"), - DECLARE_META_BIND(2, disk_next, RARCH_DISK_NEXT, "Disk next"), - DECLARE_META_BIND(2, disk_prev, RARCH_DISK_PREV, "Disk prev"), - DECLARE_META_BIND(2, grab_mouse_toggle, RARCH_GRAB_MOUSE_TOGGLE, "Grab mouse toggle"), + DECLARE_META_BIND(1, toggle_fast_forward, RARCH_FAST_FORWARD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY), + DECLARE_META_BIND(2, hold_fast_forward, RARCH_FAST_FORWARD_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY), + DECLARE_META_BIND(1, load_state, RARCH_LOAD_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY), + DECLARE_META_BIND(1, save_state, RARCH_SAVE_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY), + DECLARE_META_BIND(2, toggle_fullscreen, RARCH_FULLSCREEN_TOGGLE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY), + DECLARE_META_BIND(2, exit_emulator, RARCH_QUIT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY), + DECLARE_META_BIND(2, state_slot_increase, RARCH_STATE_SLOT_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS), + DECLARE_META_BIND(2, state_slot_decrease, RARCH_STATE_SLOT_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS), + DECLARE_META_BIND(1, rewind, RARCH_REWIND, MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND), + DECLARE_META_BIND(2, movie_record_toggle, RARCH_MOVIE_RECORD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE), + DECLARE_META_BIND(2, pause_toggle, RARCH_PAUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE), + DECLARE_META_BIND(2, frame_advance, RARCH_FRAMEADVANCE, MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE), + DECLARE_META_BIND(2, reset, RARCH_RESET, MENU_ENUM_LABEL_VALUE_INPUT_META_RESET), + DECLARE_META_BIND(2, shader_next, RARCH_SHADER_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT), + DECLARE_META_BIND(2, shader_prev, RARCH_SHADER_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV), + DECLARE_META_BIND(2, cheat_index_plus, RARCH_CHEAT_INDEX_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS), + DECLARE_META_BIND(2, cheat_index_minus, RARCH_CHEAT_INDEX_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS), + DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE), + DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT), + DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE), + DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK), + DECLARE_META_BIND(2, netplay_flip_players, RARCH_NETPLAY_FLIP, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP), + DECLARE_META_BIND(2, slowmotion, RARCH_SLOWMOTION, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION), + DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY), + DECLARE_META_BIND(2, volume_up, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP), + DECLARE_META_BIND(2, volume_down, RARCH_VOLUME_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN), + DECLARE_META_BIND(2, overlay_next, RARCH_OVERLAY_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT), + DECLARE_META_BIND(2, disk_eject_toggle, RARCH_DISK_EJECT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE), + DECLARE_META_BIND(2, disk_next, RARCH_DISK_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT), + DECLARE_META_BIND(2, disk_prev, RARCH_DISK_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV), + DECLARE_META_BIND(2, grab_mouse_toggle, RARCH_GRAB_MOUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE), #ifdef HAVE_MENU - DECLARE_META_BIND(1, menu_toggle, RARCH_MENU_TOGGLE, "Menu toggle"), + DECLARE_META_BIND(1, menu_toggle, RARCH_MENU_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE), #endif }; @@ -176,7 +176,7 @@ const char *input_config_bind_map_get_desc(unsigned i) (const struct input_bind_map*)input_config_bind_map_get(i); if (!keybind) return NULL; - return keybind->desc; + return msg_hash_to_str(keybind->desc); } void input_config_parse_key(config_file_t *conf, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 008c94c3f7..8a13589f6b 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -4664,6 +4664,120 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Boxarts"; case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY: return "Wallpaper opacity"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B: + return "B button (down)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y: + return "Y button (left)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT: + return "Select button"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START: + return "Start button"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP: + return "Up D-pad"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN: + return "Down D-pad"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT: + return "Left D-pad"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT: + return "Right D-pad"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A: + return "A button (right)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X: + return "X button (top)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L: + return "L button (shoulder)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R: + return "R button (shoulder)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2: + return "L2 button (trigger)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2: + return "R2 button (trigger)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3: + return "L3 button (thumb)"; + case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3: + return "R3 button (thumb)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS: + return "Left analog X+ (right)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS: + return "Left analog X- (left)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS: + return "Left analog Y+ (down)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS: + return "Left analog Y- (up)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS: + return "Right analog X+ (right)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS: + return "Right analog X- (left)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS: + return "Right analog Y+ (down)"; + case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS: + return "Right analog Y- (up)"; + case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE: + return "Turbo enable"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY: + return "Fast forward toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY: + return "Fast forward hold"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY: + return "Load state"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY: + return "Save state"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY: + return "Fullscreen toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY: + return "Quit RetroArch"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS: + return "Savestate slot +"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS: + return "Savestate slot -"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND: + return "Rewind"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE: + return "Movie record toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE: + return "Pause toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE: + return "Frameadvance"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_RESET: + return "Reset game"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT: + return "Next shader"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV: + return "Previous shader"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS: + return "Cheat index +"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS: + return "Cheat index -"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE: + return "Cheat toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT: + return "Take screenshot"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE: + return "Audio mute toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_OSK: + return "On-screen keyboard toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP: + return "Netplay flip users"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION: + return "Slow motion"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY: + return "Enable hotkeys"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP: + return "Volume +"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN: + return "Volume -"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT: + return "Overlay next"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE: + return "Disk eject toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT: + return "Disk next"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV: + return "Disk prev"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE: + return "Grab mouse toggle"; + case MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE: + return "Menu toggle"; default: #if 0 RARCH_LOG("Unimplemented: [%d]\n", msg); diff --git a/msg_hash.h b/msg_hash.h index 23cc34c458..734fb4b984 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -473,6 +473,65 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_OVERLAY, MENU_ENUM_LABEL_INPUT_OSK_OVERLAY, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3, + MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE, + + MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND, + MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE, + MENU_ENUM_LABEL_VALUE_INPUT_META_RESET, + MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT, + MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV, + MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS, + MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS, + MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, + MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, + MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, + MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP, + MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION, + MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, + MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, + MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN, + MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, + MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT, + MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV, + MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE, + MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,