mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid having to redefine all binds.

Browse Source
This commit is contained in:
Themaister 2014-06-01 20:53:36 +02:00
parent 80f5167bd9
commit 51a3de5120
2 changed files with 42 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
frontend/menu/backend/menu_common_backend.c
View File

@ -391,7 +391,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
#ifdef HAVE_OSK #ifdef HAVE_OSK
file_list_push(rgui->selection_buf, "Onscreen Keyboard Enable", RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, 0); file_list_push(rgui->selection_buf, "Onscreen Keyboard Enable", RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, 0);
#endif #endif
last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_ALL_LAST; last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? (RGUI_SETTINGS_BIND_BEGIN + RETRO_DEVICE_ID_JOYPAD_R3) : RGUI_SETTINGS_BIND_ALL_LAST;
for (i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++) for (i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++)
file_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0); file_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0);
break; break;
@ -1034,16 +1034,16 @@ static int menu_info_screen_iterate(unsigned action)
"This will be overridden by explicit command line\n" "This will be overridden by explicit command line\n"
"options."); "options.");
break; break;
case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_X_PLUS:
case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_X_MINUS:
case RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_Y_PLUS:
case RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_LEFT_Y_MINUS:
case RGUI_SETTINGS_BIND_ANALOG_RIGHT_X_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_X_PLUS:
case RGUI_SETTINGS_BIND_ANALOG_RIGHT_X_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_X_MINUS:
case RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_PLUS:
case RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Axis for analog stick (DualShock-esque.\n" " -- Axis for analog stick (DualShock-esque).\n"
" \n" " \n"
"Bound as usual, however, if a real analog \n" "Bound as usual, however, if a real analog \n"
"axis is bound, it can be read as a true analog.\n" "axis is bound, it can be read as a true analog.\n"
@ -1051,24 +1051,24 @@ static int menu_info_screen_iterate(unsigned action)
"Positive X axis is right. \n" "Positive X axis is right. \n"
"Positive Y axis is down."); "Positive Y axis is down.");
break; break;
case RGUI_SETTINGS_BIND_SHADER_NEXT: case RGUI_SETTINGS_BIND_BEGIN + RARCH_SHADER_NEXT:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Applies next shader in directory."); " -- Applies next shader in directory.");
break; break;
case RGUI_SETTINGS_BIND_SHADER_PREV: case RGUI_SETTINGS_BIND_BEGIN + RARCH_SHADER_PREV:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Applies previous shader in directory."); " -- Applies previous shader in directory.");
break; break;
case RGUI_SETTINGS_BIND_LOAD_STATE_KEY: case RGUI_SETTINGS_BIND_BEGIN + RARCH_LOAD_STATE_KEY:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Loads state."); " -- Loads state.");
break; break;
case RGUI_SETTINGS_BIND_SAVE_STATE_KEY: case RGUI_SETTINGS_BIND_BEGIN + RARCH_SAVE_STATE_KEY:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Saves state."); " -- Saves state.");
break; break;
case RGUI_SETTINGS_BIND_STATE_SLOT_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_STATE_SLOT_PLUS:
case RGUI_SETTINGS_BIND_STATE_SLOT_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_STATE_SLOT_MINUS:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- State slots.\n" " -- State slots.\n"
" \n" " \n"
@ -1077,7 +1077,7 @@ static int menu_info_screen_iterate(unsigned action)
"When slot is != 0, path will be (path)(d), \n" "When slot is != 0, path will be (path)(d), \n"
"where (d) is slot number."); "where (d) is slot number.");
break; break;
case RGUI_SETTINGS_BIND_TURBO_ENABLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_TURBO_ENABLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Turbo enable.\n" " -- Turbo enable.\n"
" \n" " \n"
@ -1089,12 +1089,12 @@ static int menu_info_screen_iterate(unsigned action)
"The modulation stops when the button \n" "The modulation stops when the button \n"
"itself (not turbo button) is released."); "itself (not turbo button) is released.");
break; break;
case RGUI_SETTINGS_BIND_FAST_FORWARD_HOLD_KEY: case RGUI_SETTINGS_BIND_BEGIN + RARCH_FAST_FORWARD_HOLD_KEY:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Hold for fast-forward. Releasing button \n" " -- Hold for fast-forward. Releasing button \n"
"disables fast-forward."); "disables fast-forward.");
break; break;
case RGUI_SETTINGS_BIND_QUIT_KEY: case RGUI_SETTINGS_BIND_BEGIN + RARCH_QUIT_KEY:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Key to exit RetroArch cleanly." " -- Key to exit RetroArch cleanly."
#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE) #if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
@ -1106,57 +1106,57 @@ static int menu_info_screen_iterate(unsigned action)
#endif #endif
); );
break; break;
case RGUI_SETTINGS_BIND_REWIND: case RGUI_SETTINGS_BIND_BEGIN + RARCH_REWIND:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Hold button down to rewind.\n" " -- Hold button down to rewind.\n"
" \n" " \n"
"Rewind must be enabled."); "Rewind must be enabled.");
break; break;
case RGUI_SETTINGS_BIND_MOVIE_RECORD_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_MOVIE_RECORD_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggle between recording and not."); " -- Toggle between recording and not.");
break; break;
case RGUI_SETTINGS_BIND_PAUSE_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_PAUSE_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggle between paused and non-paused state."); " -- Toggle between paused and non-paused state.");
break; break;
case RGUI_SETTINGS_BIND_FRAMEADVANCE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_FRAMEADVANCE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Frame advance when content is paused."); " -- Frame advance when content is paused.");
break; break;
case RGUI_SETTINGS_BIND_RESET: case RGUI_SETTINGS_BIND_BEGIN + RARCH_RESET:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Reset the content.\n"); " -- Reset the content.\n");
break; break;
case RGUI_SETTINGS_BIND_CHEAT_INDEX_PLUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_CHEAT_INDEX_PLUS:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Increment cheat index.\n"); " -- Increment cheat index.\n");
break; break;
case RGUI_SETTINGS_BIND_CHEAT_INDEX_MINUS: case RGUI_SETTINGS_BIND_BEGIN + RARCH_CHEAT_INDEX_MINUS:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Decrement cheat index.\n"); " -- Decrement cheat index.\n");
break; break;
case RGUI_SETTINGS_BIND_CHEAT_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_CHEAT_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggle cheat index.\n"); " -- Toggle cheat index.\n");
break; break;
case RGUI_SETTINGS_BIND_SCREENSHOT: case RGUI_SETTINGS_BIND_BEGIN + RARCH_SCREENSHOT:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Take screenshot."); " -- Take screenshot.");
break; break;
case RGUI_SETTINGS_BIND_MUTE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_MUTE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Mute/unmute audio."); " -- Mute/unmute audio.");
break; break;
case RGUI_SETTINGS_BIND_NETPLAY_FLIP: case RGUI_SETTINGS_BIND_BEGIN + RARCH_NETPLAY_FLIP:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Netplay flip players."); " -- Netplay flip players.");
break; break;
case RGUI_SETTINGS_BIND_SLOWMOTION: case RGUI_SETTINGS_BIND_BEGIN + RARCH_SLOWMOTION:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Hold for slowmotion."); " -- Hold for slowmotion.");
break; break;
case RGUI_SETTINGS_BIND_ENABLE_HOTKEY: case RGUI_SETTINGS_BIND_BEGIN + RARCH_ENABLE_HOTKEY:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Enable other hotkeys.\n" " -- Enable other hotkeys.\n"
" \n" " \n"
@ -1170,34 +1170,34 @@ static int menu_info_screen_iterate(unsigned action)
"the keyboard, where it is not desirable that \n" "the keyboard, where it is not desirable that \n"
"hotkeys get in the way."); "hotkeys get in the way.");
break; break;
case RGUI_SETTINGS_BIND_VOLUME_UP: case RGUI_SETTINGS_BIND_BEGIN + RARCH_VOLUME_UP:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Increases audio volume."); " -- Increases audio volume.");
break; break;
case RGUI_SETTINGS_BIND_VOLUME_DOWN: case RGUI_SETTINGS_BIND_BEGIN + RARCH_VOLUME_DOWN:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Decreases audio volume."); " -- Decreases audio volume.");
break; break;
case RGUI_SETTINGS_BIND_OVERLAY_NEXT: case RGUI_SETTINGS_BIND_BEGIN + RARCH_OVERLAY_NEXT:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggles to next overlay.\n" " -- Toggles to next overlay.\n"
" \n" " \n"
"Wraps around."); "Wraps around.");
break; break;
case RGUI_SETTINGS_BIND_DISK_EJECT_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_DISK_EJECT_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggles eject for disks.\n" " -- Toggles eject for disks.\n"
" \n" " \n"
"Used for multiple-disk content."); "Used for multiple-disk content.");
break; break;
case RGUI_SETTINGS_BIND_DISK_NEXT: case RGUI_SETTINGS_BIND_BEGIN + RARCH_DISK_NEXT:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Cycles through disk images. Use after \n" " -- Cycles through disk images. Use after \n"
"ejecting. \n" "ejecting. \n"
" \n" " \n"
" Complete by toggling eject again."); " Complete by toggling eject again.");
break; break;
case RGUI_SETTINGS_BIND_GRAB_MOUSE_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_GRAB_MOUSE_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggles mouse grab.\n" " -- Toggles mouse grab.\n"
" \n" " \n"
@ -1206,7 +1206,7 @@ static int menu_info_screen_iterate(unsigned action)
"the window to allow relative mouse input to \n" "the window to allow relative mouse input to \n"
"work better."); "work better.");
break; break;
case RGUI_SETTINGS_BIND_MENU_TOGGLE: case RGUI_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE:
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
" -- Toggles menu."); " -- Toggles menu.");
break; break;

62
frontend/menu/backend/menu_common_backend.h
View File

@ -178,63 +178,8 @@ typedef enum
// Match up with libretro order for simplicity. // Match up with libretro order for simplicity.
RGUI_SETTINGS_BIND_BEGIN, RGUI_SETTINGS_BIND_BEGIN,
RGUI_SETTINGS_BIND_B = RGUI_SETTINGS_BIND_BEGIN, RGUI_SETTINGS_BIND_LAST = RGUI_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS,
RGUI_SETTINGS_BIND_Y, RGUI_SETTINGS_BIND_ALL_LAST = RGUI_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE,
RGUI_SETTINGS_BIND_SELECT,
RGUI_SETTINGS_BIND_START,
RGUI_SETTINGS_BIND_UP,
RGUI_SETTINGS_BIND_DOWN,
RGUI_SETTINGS_BIND_LEFT,
RGUI_SETTINGS_BIND_RIGHT,
RGUI_SETTINGS_BIND_A,
RGUI_SETTINGS_BIND_X,
RGUI_SETTINGS_BIND_L,
RGUI_SETTINGS_BIND_R,
RGUI_SETTINGS_BIND_L2,
RGUI_SETTINGS_BIND_R2,
RGUI_SETTINGS_BIND_L3,
RGUI_SETTINGS_BIND_R3,
RGUI_SETTINGS_BIND_ANALOG_LEFT_X_PLUS,
RGUI_SETTINGS_BIND_ANALOG_LEFT_X_MINUS,
RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_PLUS,
RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_MINUS,
RGUI_SETTINGS_BIND_ANALOG_RIGHT_X_PLUS,
RGUI_SETTINGS_BIND_ANALOG_RIGHT_X_MINUS,
RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_PLUS,
RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_MINUS,
RGUI_SETTINGS_BIND_TURBO_ENABLE,
RGUI_SETTINGS_BIND_FAST_FORWARD_KEY,
RGUI_SETTINGS_BIND_FAST_FORWARD_HOLD_KEY,
RGUI_SETTINGS_BIND_LOAD_STATE_KEY,
RGUI_SETTINGS_BIND_SAVE_STATE_KEY,
RGUI_SETTINGS_BIND_FULLSCREEN_TOGGLE_KEY,
RGUI_SETTINGS_BIND_QUIT_KEY,
RGUI_SETTINGS_BIND_STATE_SLOT_PLUS,
RGUI_SETTINGS_BIND_STATE_SLOT_MINUS,
RGUI_SETTINGS_BIND_REWIND,
RGUI_SETTINGS_BIND_MOVIE_RECORD_TOGGLE,
RGUI_SETTINGS_BIND_PAUSE_TOGGLE,
RGUI_SETTINGS_BIND_FRAMEADVANCE,
RGUI_SETTINGS_BIND_RESET,
RGUI_SETTINGS_BIND_SHADER_NEXT,
RGUI_SETTINGS_BIND_SHADER_PREV,
RGUI_SETTINGS_BIND_CHEAT_INDEX_PLUS,
RGUI_SETTINGS_BIND_CHEAT_INDEX_MINUS,
RGUI_SETTINGS_BIND_CHEAT_TOGGLE,
RGUI_SETTINGS_BIND_SCREENSHOT,
RGUI_SETTINGS_BIND_MUTE,
RGUI_SETTINGS_BIND_NETPLAY_FLIP,
RGUI_SETTINGS_BIND_SLOWMOTION,
RGUI_SETTINGS_BIND_ENABLE_HOTKEY,
RGUI_SETTINGS_BIND_VOLUME_UP,
RGUI_SETTINGS_BIND_VOLUME_DOWN,
RGUI_SETTINGS_BIND_OVERLAY_NEXT,
RGUI_SETTINGS_BIND_DISK_EJECT_TOGGLE,
RGUI_SETTINGS_BIND_DISK_NEXT,
RGUI_SETTINGS_BIND_GRAB_MOUSE_TOGGLE,
RGUI_SETTINGS_BIND_MENU_TOGGLE,
RGUI_SETTINGS_BIND_ALL_LAST = RGUI_SETTINGS_BIND_MENU_TOGGLE,
RGUI_SETTINGS_CUSTOM_BIND_MODE, RGUI_SETTINGS_CUSTOM_BIND_MODE,
RGUI_SETTINGS_CUSTOM_BIND, RGUI_SETTINGS_CUSTOM_BIND,
@ -243,8 +188,7 @@ typedef enum
RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL,
RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE, RGUI_SETTINGS_ONSCREEN_KEYBOARD_ENABLE,
RGUI_SETTINGS_PERF_COUNTERS_BEGIN, RGUI_SETTINGS_PERF_COUNTERS_BEGIN,
RGUI_SETTINGS_PERF_COUNTERS_END = RGUI_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS-1), RGUI_SETTINGS_PERF_COUNTERS_END = RGUI_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS - 1)
RGUI_SETTINGS_BIND_LAST = RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_MINUS,
} rgui_settings_t; } rgui_settings_t;
#ifdef GEKKO #ifdef GEKKO