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

Merge pull request #12617 from markwkidd/input-cleanup

Browse Source 
consolidate 'input define' enums to input_defines.h
This commit is contained in:
Autechre 2021-07-09 15:30:02 +02:00 committed by GitHub
commit 7b55b03c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
input/input_defines.h
View File

@ -135,6 +135,52 @@ enum analog_dpad_mode
ANALOG_DPAD_LAST
};
enum input_toggle_type
{
INPUT_TOGGLE_NONE = 0,
INPUT_TOGGLE_DOWN_Y_L_R,
INPUT_TOGGLE_L3_R3,
INPUT_TOGGLE_L1_R1_START_SELECT,
INPUT_TOGGLE_START_SELECT,
INPUT_TOGGLE_L3_R,
INPUT_TOGGLE_L_R,
INPUT_TOGGLE_HOLD_START,
INPUT_TOGGLE_HOLD_SELECT,
INPUT_TOGGLE_DOWN_SELECT,
INPUT_TOGGLE_L2_R2,
INPUT_TOGGLE_LAST
};
enum input_turbo_mode
{
INPUT_TURBO_MODE_CLASSIC = 0,
INPUT_TURBO_MODE_SINGLEBUTTON,
INPUT_TURBO_MODE_SINGLEBUTTON_HOLD,
INPUT_TURBO_MODE_LAST
};
enum input_turbo_default_button
{
INPUT_TURBO_DEFAULT_BUTTON_B = 0,
INPUT_TURBO_DEFAULT_BUTTON_Y,
INPUT_TURBO_DEFAULT_BUTTON_A,
INPUT_TURBO_DEFAULT_BUTTON_X,
INPUT_TURBO_DEFAULT_BUTTON_L,
INPUT_TURBO_DEFAULT_BUTTON_R,
INPUT_TURBO_DEFAULT_BUTTON_L2,
INPUT_TURBO_DEFAULT_BUTTON_R2,
INPUT_TURBO_DEFAULT_BUTTON_L3,
INPUT_TURBO_DEFAULT_BUTTON_R3,
INPUT_TURBO_DEFAULT_BUTTON_LAST
};
enum input_action
{
INPUT_ACTION_NONE = 0,
INPUT_ACTION_AXIS_THRESHOLD,
INPUT_ACTION_MAX_USERS
};
/* Specialized _MOUSE that targets the full screen regardless of viewport.
*/
#define RARCH_DEVICE_MOUSE_SCREEN (RETRO_DEVICE_MOUSE | 0x10000)

46
input/input_driver.h
View File

@ -43,52 +43,6 @@
RETRO_BEGIN_DECLS
enum input_toggle_type
{
INPUT_TOGGLE_NONE = 0,
INPUT_TOGGLE_DOWN_Y_L_R,
INPUT_TOGGLE_L3_R3,
INPUT_TOGGLE_L1_R1_START_SELECT,
INPUT_TOGGLE_START_SELECT,
INPUT_TOGGLE_L3_R,
INPUT_TOGGLE_L_R,
INPUT_TOGGLE_HOLD_START,
INPUT_TOGGLE_HOLD_SELECT,
INPUT_TOGGLE_DOWN_SELECT,
INPUT_TOGGLE_L2_R2,
INPUT_TOGGLE_LAST
};
enum input_turbo_mode
{
INPUT_TURBO_MODE_CLASSIC = 0,
INPUT_TURBO_MODE_SINGLEBUTTON,
INPUT_TURBO_MODE_SINGLEBUTTON_HOLD,
INPUT_TURBO_MODE_LAST
};
enum input_turbo_default_button
{
INPUT_TURBO_DEFAULT_BUTTON_B = 0,
INPUT_TURBO_DEFAULT_BUTTON_Y,
INPUT_TURBO_DEFAULT_BUTTON_A,
INPUT_TURBO_DEFAULT_BUTTON_X,
INPUT_TURBO_DEFAULT_BUTTON_L,
INPUT_TURBO_DEFAULT_BUTTON_R,
INPUT_TURBO_DEFAULT_BUTTON_L2,
INPUT_TURBO_DEFAULT_BUTTON_R2,
INPUT_TURBO_DEFAULT_BUTTON_L3,
INPUT_TURBO_DEFAULT_BUTTON_R3,
INPUT_TURBO_DEFAULT_BUTTON_LAST
};
enum input_action
{
INPUT_ACTION_NONE = 0,
INPUT_ACTION_AXIS_THRESHOLD,
INPUT_ACTION_MAX_USERS
};
struct retro_keybind
{
char *joykey_label;