mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 15:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

'Analog to Digital Type' usability improvements

Browse Source
This commit is contained in:
jdgleaver 2021-06-23 14:27:26 +01:00
parent 7b47f5f49a
commit 3a82cf980d
8 changed files with 264 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_defines.h
View File

@ -130,6 +130,8 @@ enum analog_dpad_mode
ANALOG_DPAD_NONE = 0, ANALOG_DPAD_NONE = 0,
ANALOG_DPAD_LSTICK, ANALOG_DPAD_LSTICK,
ANALOG_DPAD_RSTICK, ANALOG_DPAD_RSTICK,
ANALOG_DPAD_LSTICK_FORCED,
ANALOG_DPAD_RSTICK_FORCED,
ANALOG_DPAD_LAST ANALOG_DPAD_LAST
}; };

12
intl/msg_hash_us.h
View File

@ -2664,6 +2664,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE, MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE,
"Analog to Digital Type" "Analog to Digital Type"
) )
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE,
"Use specified analog stick for D-Pad input. If core has native analog support, D-Pad mapping will be disabled unless a '(Forced)' option is selected. If D-Pad mapping is forced, core will receive no analog input from specified stick."
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX, MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX,
"Device Index" "Device Index"
@ -8055,6 +8059,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG, MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
"Right Analog" "Right Analog"
) )
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_ANALOG_FORCED,
"Left Analog (Forced)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG_FORCED,
"Right Analog (Forced)"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_KEY,
"(Key: %s)" "(Key: %s)"

28
menu/cbs/menu_cbs_sublabel.c
View File

@ -292,6 +292,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_runahead_toggle, ME
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ai_service, MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ai_service, MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_menu_toggle, MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_menu_toggle, MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_block_delay, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_block_delay, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_adc_type, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE)
#ifdef HAVE_MATERIALUI #ifdef HAVE_MATERIALUI
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_materialui_icons_enable, MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_materialui_icons_enable, MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_materialui_playlist_icons_enable, MENU_ENUM_SUBLABEL_MATERIALUI_PLAYLIST_ICONS_ENABLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_materialui_playlist_icons_enable, MENU_ENUM_SUBLABEL_MATERIALUI_PLAYLIST_ICONS_ENABLE)
@ -4308,10 +4309,35 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_backup_entry); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_backup_entry);
break; break;
default: default:
case MSG_UNKNOWN:
return -1; return -1;
} }
} }
else
{
/* Per-port 'Analog to Digital Type' entries
* require special handling */
if (string_starts_with_size(label, "input_player",
STRLEN_CONST("input_player")) &&
string_ends_with_size(label, "_analog_dpad_mode",
strlen(label), STRLEN_CONST("_analog_dpad_mode")))
{
unsigned i;
for (i = 0; i < MAX_USERS; i++)
{
char key_input_adc_type[64];
key_input_adc_type[0] = '\0';
snprintf(key_input_adc_type, sizeof(key_input_adc_type),
"input_player%u_analog_dpad_mode", i + 1);
if (!string_is_equal(label, key_input_adc_type))
continue;
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_adc_type);
return 0;
}
}
}
return 0; return 0;
} }

6
menu/menu_setting.c
View File

@ -6265,11 +6265,13 @@ static void setting_get_string_representation_uint_analog_dpad_mode(
rarch_setting_t *setting, rarch_setting_t *setting,
char *s, size_t len) char *s, size_t len)
{ {
const char *modes[3]; const char *modes[5];
modes[0] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE); modes[0] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE);
modes[1] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG); modes[1] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG);
modes[2] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG); modes[2] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG);
modes[3] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG_FORCED);
modes[4] = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG_FORCED);
strlcpy(s, modes[*setting->value.target.unsigned_integer % ANALOG_DPAD_LAST], len); strlcpy(s, modes[*setting->value.target.unsigned_integer % ANALOG_DPAD_LAST], len);
} }
@ -8342,7 +8344,7 @@ static bool setting_append_list_input_player_options(
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
(*list)[list_info->index - 1].get_string_representation = (*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_analog_dpad_mode; &setting_get_string_representation_uint_analog_dpad_mode;
menu_settings_list_current_add_range(list, list_info, 0, 2, 1.0, true, true); menu_settings_list_current_add_range(list, list_info, 0, ANALOG_DPAD_LAST-1, 1.0, true, true);
MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info,
(enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + user)); (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + user));

4
msg_hash.h
View File

@ -893,6 +893,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG, MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX, MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX,
MENU_ENUM_LABEL_VALUE_INPUT_REMAP_PORT, MENU_ENUM_LABEL_VALUE_INPUT_REMAP_PORT,
MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE,
MENU_ENUM_SUBLABEL_INPUT_REMAP_PORT, MENU_ENUM_SUBLABEL_INPUT_REMAP_PORT,
MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY,
@ -2600,6 +2602,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_LEFT_ANALOG, MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG, MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
MENU_ENUM_LABEL_VALUE_LEFT_ANALOG_FORCED,
MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG_FORCED,
MENU_ENUM_LABEL_VALUE_LANG_ENGLISH, MENU_ENUM_LABEL_VALUE_LANG_ENGLISH,
MENU_ENUM_LABEL_VALUE_LANG_JAPANESE, MENU_ENUM_LABEL_VALUE_LANG_JAPANESE,

267
retroarch.c
View File

@ -19105,6 +19105,11 @@ static void uninit_libretro_symbols(
p_rarch->camera_driver_active = false; p_rarch->camera_driver_active = false;
p_rarch->location_driver_active = false; p_rarch->location_driver_active = false;
/* Core has finished utilising the input driver;
* reset 'analog input requested' flags */
memset(&p_rarch->input_driver_analog_requested, 0,
sizeof(p_rarch->input_driver_analog_requested));
/* Performance counters no longer valid. */ /* Performance counters no longer valid. */
p_rarch->perf_ptr_libretro = 0; p_rarch->perf_ptr_libretro = 0;
memset(p_rarch->perf_counters_libretro, 0, memset(p_rarch->perf_counters_libretro, 0,
@ -21160,7 +21165,7 @@ static bool input_overlay_add_inputs_inner(overlay_desc_t *desc,
/* Light up the button if pressed */ /* Light up the button if pressed */
if (ol_state ? if (ol_state ?
!BIT256_GET(ol_state->buttons, id) : !BIT256_GET(ol_state->buttons, id) :
!input_state(port, RETRO_DEVICE_JOYPAD, 0, id)) !input_state_internal(port, RETRO_DEVICE_JOYPAD, 0, id))
{ {
/* We need ALL of the inputs to be active, /* We need ALL of the inputs to be active,
* abort. */ * abort. */
@ -21199,9 +21204,9 @@ static bool input_overlay_add_inputs_inner(overlay_desc_t *desc,
unsigned index = (desc->type == OVERLAY_TYPE_ANALOG_RIGHT) ? unsigned index = (desc->type == OVERLAY_TYPE_ANALOG_RIGHT) ?
RETRO_DEVICE_INDEX_ANALOG_RIGHT : RETRO_DEVICE_INDEX_ANALOG_LEFT; RETRO_DEVICE_INDEX_ANALOG_RIGHT : RETRO_DEVICE_INDEX_ANALOG_LEFT;
analog_x = input_state(port, RETRO_DEVICE_ANALOG, analog_x = input_state_internal(port, RETRO_DEVICE_ANALOG,
index, RETRO_DEVICE_ID_ANALOG_X); index, RETRO_DEVICE_ID_ANALOG_X);
analog_y = input_state(port, RETRO_DEVICE_ANALOG, analog_y = input_state_internal(port, RETRO_DEVICE_ANALOG,
index, RETRO_DEVICE_ID_ANALOG_Y); index, RETRO_DEVICE_ID_ANALOG_Y);
} }
@ -21210,9 +21215,7 @@ static bool input_overlay_add_inputs_inner(overlay_desc_t *desc,
/* Only modify overlay delta_x/delta_y values /* Only modify overlay delta_x/delta_y values
* if we are monitoring input from a physical * if we are monitoring input from a physical
* controller (breaks analog touchscreen input, * controller */
* but it is the only way to show analog stick
* motion) */
if (!ol_state) if (!ol_state)
{ {
desc->delta_x = dx; desc->delta_x = dx;
@ -21229,7 +21232,7 @@ static bool input_overlay_add_inputs_inner(overlay_desc_t *desc,
case OVERLAY_TYPE_KEYBOARD: case OVERLAY_TYPE_KEYBOARD:
if (ol_state ? if (ol_state ?
OVERLAY_GET_KEY(ol_state, desc->retro_key_idx) : OVERLAY_GET_KEY(ol_state, desc->retro_key_idx) :
input_state(port, RETRO_DEVICE_KEYBOARD, 0, desc->retro_key_idx)) input_state_internal(port, RETRO_DEVICE_KEYBOARD, 0, desc->retro_key_idx))
{ {
desc->updated = true; desc->updated = true;
return true; return true;
@ -22613,12 +22616,37 @@ static void input_driver_poll(void)
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (p_rarch->overlay_ptr && p_rarch->overlay_ptr->alive) if (p_rarch->overlay_ptr && p_rarch->overlay_ptr->alive)
{
unsigned input_analog_dpad_mode = settings->uints.input_analog_dpad_mode[0];
switch (input_analog_dpad_mode)
{
case ANALOG_DPAD_LSTICK:
case ANALOG_DPAD_RSTICK:
{
unsigned mapped_port = settings->uints.input_remap_ports[0];
if (p_rarch->input_driver_analog_requested[mapped_port])
input_analog_dpad_mode = ANALOG_DPAD_NONE;
}
break;
case ANALOG_DPAD_LSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_LSTICK;
break;
case ANALOG_DPAD_RSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_RSTICK;
break;
default:
break;
}
input_poll_overlay(p_rarch, input_poll_overlay(p_rarch,
settings, settings,
p_rarch->overlay_ptr, p_rarch->overlay_ptr,
input_overlay_opacity, input_overlay_opacity,
settings->uints.input_analog_dpad_mode[0], input_analog_dpad_mode,
p_rarch->input_driver_axis_threshold); p_rarch->input_driver_axis_threshold);
}
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -22645,6 +22673,23 @@ static void input_driver_poll(void)
input_bits_t *p_new_state = (input_bits_t*)&current_inputs; input_bits_t *p_new_state = (input_bits_t*)&current_inputs;
unsigned input_analog_dpad_mode = settings->uints.input_analog_dpad_mode[i]; unsigned input_analog_dpad_mode = settings->uints.input_analog_dpad_mode[i];
switch (input_analog_dpad_mode)
{
case ANALOG_DPAD_LSTICK:
case ANALOG_DPAD_RSTICK:
if (p_rarch->input_driver_analog_requested[mapped_port])
input_analog_dpad_mode = ANALOG_DPAD_NONE;
break;
case ANALOG_DPAD_LSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_LSTICK;
break;
case ANALOG_DPAD_RSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_RSTICK;
break;
default:
break;
}
switch (device) switch (device)
{ {
case RETRO_DEVICE_KEYBOARD: case RETRO_DEVICE_KEYBOARD:
@ -22962,6 +23007,7 @@ static int16_t input_state_device(
struct rarch_state *p_rarch, struct rarch_state *p_rarch,
settings_t *settings, settings_t *settings,
input_mapper_t *handle, input_mapper_t *handle,
unsigned input_analog_dpad_mode,
int16_t ret, int16_t ret,
unsigned port, unsigned device, unsigned port, unsigned device,
unsigned idx, unsigned id, unsigned idx, unsigned id,
@ -23219,13 +23265,38 @@ static int16_t input_state_device(
res = ret; res = ret;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if ( p_rarch->overlay_ptr && if (p_rarch->overlay_ptr &&
p_rarch->overlay_ptr->alive && port == 0) p_rarch->overlay_ptr->alive &&
(port == 0) &&
!(((input_analog_dpad_mode == ANALOG_DPAD_LSTICK) &&
(idx == RETRO_DEVICE_INDEX_ANALOG_LEFT)) ||
((input_analog_dpad_mode == ANALOG_DPAD_RSTICK) &&
(idx == RETRO_DEVICE_INDEX_ANALOG_RIGHT))))
{ {
input_overlay_state_t *ol_state = input_overlay_state_t *ol_state =
&p_rarch->overlay_ptr->overlay_state; &p_rarch->overlay_ptr->overlay_state;
if (ol_state->analog[base]) int16_t ol_analog =
res |= ol_state->analog[base]; ol_state->analog[base];
/* Analog values are an integer corresponding
* to the extent of the analog motion; these
* cannot be OR'd together, we must instead
* keep the value with the largest magnitude */
if (ol_analog)
{
if (res == 0)
res = ol_analog;
else
{
int16_t ol_analog_abs = (ol_analog >= 0) ?
ol_analog : -ol_analog;
int16_t res_abs = (res >= 0) ?
res : -res;
res = (ol_analog_abs > res_abs) ?
ol_analog : res;
}
}
} }
#endif #endif
} }
@ -23239,6 +23310,10 @@ static int16_t input_state_device(
int val1 = handle->analog_value[port][offset]; int val1 = handle->analog_value[port][offset];
int val2 = handle->analog_value[port][offset+1]; int val2 = handle->analog_value[port][offset+1];
/* OR'ing these analog values is 100% incorrect,
* but I have no idea what this code is supposed
* to be doing (val1 and val2 always seem to be
* zero), so I will leave it alone... */
if (val1) if (val1)
res |= val1; res |= val1;
else if (val2) else if (val2)
@ -23274,19 +23349,7 @@ static int16_t input_state_device(
return res; return res;
} }
/** static int16_t input_state_internal(unsigned port, unsigned device,
* input_state:
* @port : user number.
* @device : device identifier of user.
* @idx : index value of user.
* @id : identifier of key pressed by user.
*
* Input state callback function.
*
* Returns: Non-zero if the given key (identified by @id)
* was pressed by the user (assigned to @port).
**/
static int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
@ -23296,6 +23359,7 @@ static int16_t input_state(unsigned port, unsigned device,
float input_analog_deadzone = settings->floats.input_analog_deadzone; float input_analog_deadzone = settings->floats.input_analog_deadzone;
float input_analog_sensitivity = settings->floats.input_analog_sensitivity; float input_analog_sensitivity = settings->floats.input_analog_sensitivity;
unsigned *input_remap_port_map = settings->uints.input_remap_port_map[port]; unsigned *input_remap_port_map = settings->uints.input_remap_port_map[port];
bool input_driver_analog_requested = p_rarch->input_driver_analog_requested[port];
const input_device_driver_t *joypad = p_rarch->joypad; const input_device_driver_t *joypad = p_rarch->joypad;
#ifdef HAVE_MFI #ifdef HAVE_MFI
const input_device_driver_t *sec_joypad = p_rarch->sec_joypad; const input_device_driver_t *sec_joypad = p_rarch->sec_joypad;
@ -23313,23 +23377,6 @@ static int16_t input_state(unsigned port, unsigned device,
(id == RETRO_DEVICE_ID_JOYPAD_MASK); (id == RETRO_DEVICE_ID_JOYPAD_MASK);
joypad_info.axis_threshold = p_rarch->input_driver_axis_threshold; joypad_info.axis_threshold = p_rarch->input_driver_axis_threshold;
#ifdef HAVE_BSV_MOVIE
/* Load input from BSV record, if enabled */
if (BSV_MOVIE_IS_PLAYBACK_ON())
{
int16_t bsv_result;
if (intfstream_read(p_rarch->bsv_movie_state_handle->file, &bsv_result, 2) == 2)
{
#ifdef HAVE_CHEEVOS
rcheevos_pause_hardcore();
#endif
return swap_if_big16(bsv_result);
}
p_rarch->bsv_movie_state.movie_end = true;
}
#endif
/* Loop over all 'physical' ports mapped to specified /* Loop over all 'physical' ports mapped to specified
* 'virtual' port index */ * 'virtual' port index */
while ((mapped_port = *(input_remap_port_map++)) < MAX_USERS) while ((mapped_port = *(input_remap_port_map++)) < MAX_USERS)
@ -23345,6 +23392,25 @@ static int16_t input_state(unsigned port, unsigned device,
if (mapped_port >= max_users) if (mapped_port >= max_users)
continue; continue;
/* If core has requested analog input, disable
* analog to dpad mapping (unless forced) */
switch (input_analog_dpad_mode)
{
case ANALOG_DPAD_LSTICK:
case ANALOG_DPAD_RSTICK:
if (input_driver_analog_requested)
input_analog_dpad_mode = ANALOG_DPAD_NONE;
break;
case ANALOG_DPAD_LSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_LSTICK;
break;
case ANALOG_DPAD_RSTICK_FORCED:
input_analog_dpad_mode = ANALOG_DPAD_RSTICK;
break;
default:
break;
}
/* TODO/FIXME: This code is gibberish - a mess of nested /* TODO/FIXME: This code is gibberish - a mess of nested
* refactors that make no sense whatsoever. The entire * refactors that make no sense whatsoever. The entire
* thing needs to be rewritten from scratch... */ * thing needs to be rewritten from scratch... */
@ -23426,12 +23492,14 @@ static int16_t input_state(unsigned port, unsigned device,
unsigned i; unsigned i;
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++) for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
if (input_state_device(p_rarch, settings, handle, if (input_state_device(p_rarch, settings, handle,
ret, mapped_port, device, idx, i, true)) input_analog_dpad_mode, ret, mapped_port,
device, idx, i, true))
port_result |= (1 << i); port_result |= (1 << i);
} }
else else
port_result = input_state_device(p_rarch, settings, handle, port_result = input_state_device(p_rarch, settings, handle,
ret, mapped_port, device, idx, id, false); input_analog_dpad_mode, ret, mapped_port,
device, idx, id, false);
} }
/* Digital values are represented by a bitmap; /* Digital values are represented by a bitmap;
@ -23472,6 +23540,63 @@ static int16_t input_state(unsigned port, unsigned device,
return result; return result;
} }
/**
* input_state:
* @port : user number.
* @device : device identifier of user.
* @idx : index value of user.
* @id : identifier of key pressed by user.
*
* Input state callback function.
*
* Returns: Non-zero if the given key (identified by @id)
* was pressed by the user (assigned to @port).
**/
static int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id)
{
struct rarch_state *p_rarch = &rarch_st;
int16_t result = 0;
#ifdef HAVE_BSV_MOVIE
/* Load input from BSV record, if enabled */
if (BSV_MOVIE_IS_PLAYBACK_ON())
{
int16_t bsv_result = 0;
if (intfstream_read(p_rarch->bsv_movie_state_handle->file, &bsv_result, 2) == 2)
{
#ifdef HAVE_CHEEVOS
rcheevos_pause_hardcore();
#endif
return swap_if_big16(bsv_result);
}
p_rarch->bsv_movie_state.movie_end = true;
}
#endif
/* Read input state */
result = input_state_internal(port, device, idx, id);
/* Register any analog stick input requests for
* this 'virtual' (core) port */
if ((device == RETRO_DEVICE_ANALOG) &&
((idx == RETRO_DEVICE_INDEX_ANALOG_LEFT) ||
(idx == RETRO_DEVICE_INDEX_ANALOG_RIGHT)))
p_rarch->input_driver_analog_requested[port] = true;
#ifdef HAVE_BSV_MOVIE
/* Save input to BSV record, if enabled */
if (BSV_MOVIE_IS_PLAYBACK_OFF())
{
result = swap_if_big16(result);
intfstream_write(p_rarch->bsv_movie_state_handle->file, &result, 2);
}
#endif
return result;
}
static int16_t input_joypad_axis( static int16_t input_joypad_axis(
float input_analog_deadzone, float input_analog_deadzone,
float input_analog_sensitivity, float input_analog_sensitivity,
@ -33744,6 +33869,8 @@ static void retroarch_deinit_drivers(
p_rarch->input_driver_nonblock_state = false; p_rarch->input_driver_nonblock_state = false;
p_rarch->input_driver_flushing_input = 0; p_rarch->input_driver_flushing_input = 0;
memset(&p_rarch->input_driver_turbo_btns, 0, sizeof(turbo_buttons_t)); memset(&p_rarch->input_driver_turbo_btns, 0, sizeof(turbo_buttons_t));
memset(&p_rarch->input_driver_analog_requested, 0,
sizeof(p_rarch->input_driver_analog_requested));
p_rarch->current_input = NULL; p_rarch->current_input = NULL;
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -36699,6 +36826,8 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
retroarch_audio_buffer_status_free(p_rarch); retroarch_audio_buffer_status_free(p_rarch);
retroarch_game_focus_free(p_rarch); retroarch_game_focus_free(p_rarch);
retroarch_fastmotion_override_free(p_rarch, &runloop_state); retroarch_fastmotion_override_free(p_rarch, &runloop_state);
memset(&p_rarch->input_driver_analog_requested, 0,
sizeof(p_rarch->input_driver_analog_requested));
break; break;
case RARCH_CTL_IS_IDLE: case RARCH_CTL_IS_IDLE:
return runloop_state.idle; return runloop_state.idle;
@ -38712,6 +38841,7 @@ static enum runloop_state runloop_check_state(
int runloop_iterate(void) int runloop_iterate(void)
{ {
unsigned i; unsigned i;
enum analog_dpad_mode dpad_mode[MAX_USERS];
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
unsigned video_frame_delay = settings->uints.video_frame_delay; unsigned video_frame_delay = settings->uints.video_frame_delay;
@ -38873,10 +39003,32 @@ int runloop_iterate(void)
/* Update binds for analog dpad modes. */ /* Update binds for analog dpad modes. */
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode) dpad_mode[i] = (enum analog_dpad_mode)
settings->uints.input_analog_dpad_mode[i]; settings->uints.input_analog_dpad_mode[i];
if (dpad_mode != ANALOG_DPAD_NONE) switch (dpad_mode[i])
{
case ANALOG_DPAD_LSTICK:
case ANALOG_DPAD_RSTICK:
{
unsigned mapped_port = settings->uints.input_remap_ports[i];
if (p_rarch->input_driver_analog_requested[mapped_port])
dpad_mode[i] = ANALOG_DPAD_NONE;
}
break;
case ANALOG_DPAD_LSTICK_FORCED:
dpad_mode[i] = ANALOG_DPAD_LSTICK;
break;
case ANALOG_DPAD_RSTICK_FORCED:
dpad_mode[i] = ANALOG_DPAD_RSTICK;
break;
default:
break;
}
/* Push analog to D-Pad mappings to binds. */
if (dpad_mode[i] != ANALOG_DPAD_NONE)
{ {
unsigned k; unsigned k;
unsigned joy_idx = settings->uints.input_joypad_index[i]; unsigned joy_idx = settings->uints.input_joypad_index[i];
@ -38887,9 +39039,7 @@ int runloop_iterate(void)
unsigned x_minus = RARCH_ANALOG_RIGHT_X_MINUS; unsigned x_minus = RARCH_ANALOG_RIGHT_X_MINUS;
unsigned y_minus = RARCH_ANALOG_RIGHT_Y_MINUS; unsigned y_minus = RARCH_ANALOG_RIGHT_Y_MINUS;
/* Push analog to D-Pad mappings to binds. */ if (dpad_mode[i] == ANALOG_DPAD_LSTICK)
if ((dpad_mode) == ANALOG_DPAD_LSTICK)
{ {
x_plus = RARCH_ANALOG_LEFT_X_PLUS; x_plus = RARCH_ANALOG_LEFT_X_PLUS;
y_plus = RARCH_ANALOG_LEFT_Y_PLUS; y_plus = RARCH_ANALOG_LEFT_Y_PLUS;
@ -38966,14 +39116,10 @@ int runloop_iterate(void)
discord_update(DISCORD_PRESENCE_GAME); discord_update(DISCORD_PRESENCE_GAME);
#endif #endif
/* Restores analog D-pad binds temporarily overridden. */
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode) if (dpad_mode[i] != ANALOG_DPAD_NONE)
settings->uints.input_analog_dpad_mode[i];
/* Restores analog D-pad binds temporarily overridden. */
if (dpad_mode != ANALOG_DPAD_NONE)
{ {
unsigned j; unsigned j;
unsigned joy_idx = settings->uints.input_joypad_index[i]; unsigned joy_idx = settings->uints.input_joypad_index[i];
@ -39428,6 +39574,17 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad)
if (!pad) if (!pad)
return false; return false;
/* We are potentially 'connecting' a entirely different
* type of virtual input device, which may or may not
* support analog inputs. We therefore have to reset
* the 'analog input requested' flag for this port - but
* since port mapping is arbitrary/mutable, it is easiest
* to simply reset the flags for all ports.
* Correct values will be registered at the next call
* of 'input_state()' */
memset(&p_rarch->input_driver_analog_requested, 0,
sizeof(p_rarch->input_driver_analog_requested));
#ifdef HAVE_RUNAHEAD #ifdef HAVE_RUNAHEAD
remember_controller_port_device(p_rarch, pad->port, pad->device); remember_controller_port_device(p_rarch, pad->port, pad->device);
#endif #endif

1
retroarch_data.h
View File

@ -2287,6 +2287,7 @@ struct rarch_state
bool input_driver_block_libretro_input; bool input_driver_block_libretro_input;
bool input_driver_nonblock_state; bool input_driver_nonblock_state;
bool input_driver_grab_mouse_state; bool input_driver_grab_mouse_state;
bool input_driver_analog_requested[MAX_USERS];
input_game_focus_state_t game_focus_state; /* bool alignment */ input_game_focus_state_t game_focus_state; /* bool alignment */

2
retroarch_fwd_decls.h
View File

@ -60,6 +60,8 @@ static bool secondary_core_create(struct rarch_state *p_rarch,
static int16_t input_state_get_last(unsigned port, static int16_t input_state_get_last(unsigned port,
unsigned device, unsigned index, unsigned id); unsigned device, unsigned index, unsigned id);
#endif #endif
static int16_t input_state_internal(unsigned port, unsigned device,
unsigned idx, unsigned id);
static int16_t input_state(unsigned port, unsigned device, static int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id); unsigned idx, unsigned id);
static void video_driver_frame(const void *data, unsigned width, static void video_driver_frame(const void *data, unsigned width,