ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input_driver_poll; remove shadowed variable 

menu_input_read_mouse_hw - cleanup + go through local pointer
variable for primary_joypad
This commit is contained in:
twinaphex 2021-08-29 18:41:58 +02:00
parent 540d192ecb
commit a9f1dd3647
1 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
retroarch.c
View File

@ -22077,8 +22077,6 @@ static void input_driver_poll(void)
bool poll_overlay = (p_rarch->overlay_ptr && p_rarch->overlay_ptr->alive); bool poll_overlay = (p_rarch->overlay_ptr && p_rarch->overlay_ptr->alive);
#endif #endif
input_mapper_t *handle = &p_rarch->input_driver_mapper; input_mapper_t *handle = &p_rarch->input_driver_mapper;
const input_device_driver_t
*joypad = input_driver_st->primary_joypad;
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;
@ -23099,63 +23097,67 @@ static int16_t menu_input_read_mouse_hw(
struct rarch_state *p_rarch, struct rarch_state *p_rarch,
enum menu_input_mouse_hw_id id) enum menu_input_mouse_hw_id id)
{ {
rarch_joypad_info_t joypad_info;
unsigned type = 0;
unsigned device = RETRO_DEVICE_MOUSE;
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state; input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
input_driver_t *current_input = input_driver_st->current_driver; input_driver_t *current_input = input_driver_st->current_driver;
if (current_input->input_state)
{
rarch_joypad_info_t joypad_info;
unsigned type = 0;
unsigned device = RETRO_DEVICE_MOUSE;
const input_device_driver_t
*joypad = input_driver_st->primary_joypad;
#ifdef HAVE_MFI #ifdef HAVE_MFI
const input_device_driver_t const input_device_driver_t
*sec_joypad = input_driver_st->secondary_joypad; *sec_joypad = input_driver_st->secondary_joypad;
#else #else
const input_device_driver_t const input_device_driver_t
*sec_joypad = NULL; *sec_joypad = NULL;
#endif #endif
joypad_info.joy_idx = 0; joypad_info.joy_idx = 0;
joypad_info.auto_binds = NULL; joypad_info.auto_binds = NULL;
joypad_info.axis_threshold = 0.0f; joypad_info.axis_threshold = 0.0f;
switch (id) switch (id)
{ {
case MENU_MOUSE_X_AXIS: case MENU_MOUSE_X_AXIS:
device = RARCH_DEVICE_MOUSE_SCREEN; device = RARCH_DEVICE_MOUSE_SCREEN;
type = RETRO_DEVICE_ID_MOUSE_X; type = RETRO_DEVICE_ID_MOUSE_X;
break; break;
case MENU_MOUSE_Y_AXIS: case MENU_MOUSE_Y_AXIS:
device = RARCH_DEVICE_MOUSE_SCREEN; device = RARCH_DEVICE_MOUSE_SCREEN;
type = RETRO_DEVICE_ID_MOUSE_Y; type = RETRO_DEVICE_ID_MOUSE_Y;
break; break;
case MENU_MOUSE_LEFT_BUTTON: case MENU_MOUSE_LEFT_BUTTON:
type = RETRO_DEVICE_ID_MOUSE_LEFT; type = RETRO_DEVICE_ID_MOUSE_LEFT;
break; break;
case MENU_MOUSE_RIGHT_BUTTON: case MENU_MOUSE_RIGHT_BUTTON:
type = RETRO_DEVICE_ID_MOUSE_RIGHT; type = RETRO_DEVICE_ID_MOUSE_RIGHT;
break; break;
case MENU_MOUSE_WHEEL_UP: case MENU_MOUSE_WHEEL_UP:
type = RETRO_DEVICE_ID_MOUSE_WHEELUP; type = RETRO_DEVICE_ID_MOUSE_WHEELUP;
break; break;
case MENU_MOUSE_WHEEL_DOWN: case MENU_MOUSE_WHEEL_DOWN:
type = RETRO_DEVICE_ID_MOUSE_WHEELDOWN; type = RETRO_DEVICE_ID_MOUSE_WHEELDOWN;
break; break;
case MENU_MOUSE_HORIZ_WHEEL_UP: case MENU_MOUSE_HORIZ_WHEEL_UP:
type = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP; type = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP;
break; break;
case MENU_MOUSE_HORIZ_WHEEL_DOWN: case MENU_MOUSE_HORIZ_WHEEL_DOWN:
type = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN; type = RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN;
break; break;
}
return current_input->input_state(
input_driver_st->current_data,
joypad,
sec_joypad,
&joypad_info,
NULL,
p_rarch->keyboard_mapping_blocked,
0, device, 0, type);
} }
return 0;
if (!current_input->input_state)
return 0;
return current_input->input_state(
input_driver_st->current_data,
input_driver_st->primary_joypad,
sec_joypad,
&joypad_info,
NULL,
p_rarch->keyboard_mapping_blocked,
0, device, 0, type);
} }
static void menu_input_get_mouse_hw_state( static void menu_input_get_mouse_hw_state(