mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move struct and macros for input to input_types.h

Browse Source
This commit is contained in:
libretroadmin 2022-05-29 21:58:39 +02:00
parent ccdda219b8
commit 96a485f885
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configuration.h
View File

@ -30,7 +30,6 @@
#endif #endif
#include "gfx/video_defines.h" #include "gfx/video_defines.h"
#include "input/input_defines.h"
#include "led/led_defines.h" #include "led/led_defines.h"
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
@ -69,8 +68,6 @@
strlcpy(var, newvar, sizeof(var)); \ strlcpy(var, newvar, sizeof(var)); \
} }
#define INPUT_CONFIG_BIND_MAP_GET(i) ((const struct input_bind_map*)&input_config_bind_map[(i)])
enum crt_switch_type enum crt_switch_type
{ {
CRT_SWITCH_NONE = 0, CRT_SWITCH_NONE = 0,
@ -90,25 +87,6 @@ enum override_type
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
/* Input config. */
struct input_bind_map
{
const char *base;
enum msg_hash_enums desc;
/* Meta binds get input as prefix, not input_playerN".
* 0 = libretro related.
* 1 = Common hotkey.
* 2 = Uncommon/obscure hotkey.
*/
uint8_t meta;
uint8_t retro_key;
bool valid;
};
typedef struct settings typedef struct settings
{ {
struct struct
@ -1161,8 +1139,6 @@ void input_config_parse_mouse_button(
const char *input_config_get_prefix(unsigned user, bool meta); const char *input_config_get_prefix(unsigned user, bool meta);
extern const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL];
RETRO_END_DECLS RETRO_END_DECLS
#endif #endif

20
input/input_types.h
View File

@ -35,6 +35,22 @@ enum input_game_focus_cmd_type
GAME_FOCUS_CMD_REAPPLY GAME_FOCUS_CMD_REAPPLY
}; };
/* Input config. */
struct input_bind_map
{
const char *base;
enum msg_hash_enums desc;
/* Meta binds get input as prefix, not input_playerN".
* 0 = libretro related.
* 1 = Common hotkey.
* 2 = Uncommon/obscure hotkey.
*/
uint8_t meta;
uint8_t retro_key;
bool valid;
};
/* Turbo support. */ /* Turbo support. */
struct turbo_buttons struct turbo_buttons
{ {
@ -103,6 +119,10 @@ typedef struct input_game_focus_state
bool core_requested; bool core_requested;
} input_game_focus_state_t; } input_game_focus_state_t;
#define INPUT_CONFIG_BIND_MAP_GET(i) ((const struct input_bind_map*)&input_config_bind_map[(i)])
extern const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL];
typedef struct rarch_joypad_driver input_device_driver_t; typedef struct rarch_joypad_driver input_device_driver_t;
typedef struct input_keyboard_line input_keyboard_line_t; typedef struct input_keyboard_line input_keyboard_line_t;
typedef struct rarch_joypad_info rarch_joypad_info_t; typedef struct rarch_joypad_info rarch_joypad_info_t;