mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 06:44:27 +00:00
(RARCH_CONSOLE) Reduce code duplication for default input binds
This commit is contained in:
parent
618bbf5aae
commit
cf3fa07c4a
@ -65,12 +65,46 @@ static bool libretro_install_core(const char *path_prefix,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void input_defaults_console(void)
|
||||||
|
{
|
||||||
|
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
||||||
|
if (driver.input->set_keybinds)
|
||||||
|
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
||||||
|
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
||||||
|
|
||||||
|
for(unsigned i = 0; i < MAX_PADS; i++)
|
||||||
|
{
|
||||||
|
unsigned keybind_action = 0;
|
||||||
|
|
||||||
|
switch (g_settings.input.dpad_emulation[i])
|
||||||
|
{
|
||||||
|
case ANALOG_DPAD_LSTICK:
|
||||||
|
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
||||||
|
break;
|
||||||
|
case ANALOG_DPAD_RSTICK:
|
||||||
|
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
||||||
|
break;
|
||||||
|
case ANALOG_DPAD_NONE:
|
||||||
|
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keybind_action)
|
||||||
|
if (driver.input->set_keybinds)
|
||||||
|
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
||||||
|
keybind_action);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void rarch_get_environment_console(void)
|
static void rarch_get_environment_console(void)
|
||||||
{
|
{
|
||||||
init_libretro_sym(false);
|
init_libretro_sym(false);
|
||||||
rarch_init_system_info();
|
rarch_init_system_info();
|
||||||
|
|
||||||
global_init_drivers();
|
global_init_drivers();
|
||||||
|
input_defaults_console();
|
||||||
|
|
||||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||||
char path_prefix[PATH_MAX];
|
char path_prefix[PATH_MAX];
|
||||||
|
@ -471,37 +471,6 @@ static void *gx_input_init(void)
|
|||||||
SYS_SetPowerCallback(power_callback);
|
SYS_SetPowerCallback(power_callback);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PADS; i++)
|
|
||||||
{
|
|
||||||
unsigned keybind_action = 0;
|
|
||||||
|
|
||||||
switch (g_settings.input.dpad_emulation[i])
|
|
||||||
{
|
|
||||||
case ANALOG_DPAD_LSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_RSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_NONE:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keybind_action)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
keybind_action);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return (void*)-1;
|
return (void*)-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -503,36 +503,6 @@ static void* ps3_input_init(void)
|
|||||||
cellMouseInit(MAX_MICE);
|
cellMouseInit(MAX_MICE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PADS; i++)
|
|
||||||
{
|
|
||||||
unsigned keybind_action = 0;
|
|
||||||
|
|
||||||
switch (g_settings.input.dpad_emulation[i])
|
|
||||||
{
|
|
||||||
case ANALOG_DPAD_LSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_RSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_NONE:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keybind_action)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
keybind_action);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (void*)-1;
|
return (void*)-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,36 +169,6 @@ static void* psp_input_initialize(void)
|
|||||||
#endif
|
#endif
|
||||||
sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
|
sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PADS; i++)
|
|
||||||
{
|
|
||||||
unsigned keybind_action = 0;
|
|
||||||
|
|
||||||
switch (g_settings.input.dpad_emulation[i])
|
|
||||||
{
|
|
||||||
case ANALOG_DPAD_LSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_RSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_NONE:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keybind_action)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
action);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (void*)-1;
|
return (void*)-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -391,36 +391,6 @@ static void *xdk_input_init(void)
|
|||||||
while(XGetDeviceEnumerationStatus() == XDEVICE_ENUMERATION_BUSY) {}
|
while(XGetDeviceEnumerationStatus() == XDEVICE_ENUMERATION_BUSY) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PADS; i++)
|
|
||||||
{
|
|
||||||
unsigned keybind_action = 0;
|
|
||||||
|
|
||||||
switch (g_settings.input.dpad_emulation[i])
|
|
||||||
{
|
|
||||||
case ANALOG_DPAD_LSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_RSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_NONE:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keybind_action)
|
|
||||||
if (driver.input->set_keybinds)
|
|
||||||
driver.input->set_keybinds(driver.input_data, 0, i, 0,
|
|
||||||
keybind_action);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (void*)-1;
|
return (void*)-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,32 +102,6 @@ static void xenon360_input_set_keybinds(void *data, unsigned device,
|
|||||||
|
|
||||||
static void* xenon360_input_init(void)
|
static void* xenon360_input_init(void)
|
||||||
{
|
{
|
||||||
for(unsigned i = 0; i < MAX_PLAYERS; i++)
|
|
||||||
xenon360_input_set_keybinds(driver.input_data, 0, i,
|
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
|
||||||
|
|
||||||
for(unsigned i = 0; i < MAX_PADS; i++)
|
|
||||||
{
|
|
||||||
unsigned keybind_action = 0;
|
|
||||||
|
|
||||||
switch (g_settings.input.dpad_emulation[i])
|
|
||||||
{
|
|
||||||
case ANALOG_DPAD_LSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_RSTICK:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
|
|
||||||
break;
|
|
||||||
case ANALOG_DPAD_NONE:
|
|
||||||
keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keybind_action)
|
|
||||||
xenon360_input_set_keybinds(driver.input_data, 0, i, keybind_action);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (void*)-1;
|
return (void*)-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user