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

(winraw_input) Cleanups - use button_is_pressed

This commit is contained in:
twinaphex 2020-06-12 06:37:36 +02:00
parent c1d63ca7c1
commit 0e907f01ca
1 changed files with 109 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
input/drivers/winraw_input.c
View File

@ -314,32 +314,6 @@ static bool winraw_mouse_button_pressed(
return false; return false;
} }
static int16_t winraw_is_pressed(
winraw_input_t *wr,
winraw_mouse_t *mouse,
const input_device_driver_t *joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind *binds,
unsigned port, unsigned id)
{
const struct retro_keybind *bind = &binds[id];
/* Auto-binds are per joypad, not per user. */
const uint64_t joykey = (binds[id].joykey != NO_BTN)
? binds[id].joykey : joypad_info->auto_binds[id].joykey;
const uint32_t joyaxis = (binds[id].joyaxis != AXIS_NONE)
? binds[id].joyaxis : joypad_info->auto_binds[id].joyaxis;
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, bind->mbutton))
return 1;
if ((uint16_t)joykey != NO_BTN &&
joypad->button(joypad_info->joy_idx, (uint16_t)joykey))
return 1;
if (((float)abs(joypad->axis(joypad_info->joy_idx, joyaxis))
/ 0x8000) > joypad_info->axis_threshold)
return 1;
return 0;
}
static void winraw_init_mouse_xy_mapping(void) static void winraw_init_mouse_xy_mapping(void)
{ {
struct video_viewport viewport; struct video_viewport viewport;
@ -660,10 +634,15 @@ static int16_t winraw_input_state(void *d,
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++) for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{ {
if (binds[port][i].valid) if (binds[port][i].valid)
if (winraw_is_pressed( {
wr, mouse, wr->joypad, if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port][i].mbutton))
ret |= (1 << i);
else if (button_is_pressed(
wr->joypad,
joypad_info, binds[port], port, i)) joypad_info, binds[port], port, i))
ret |= (1 << i); ret |= (1 << i);
}
} }
} }
else else
@ -674,10 +653,15 @@ static int16_t winraw_input_state(void *d,
winraw_keyboard_pressed(wr, binds[port][i].key)) winraw_keyboard_pressed(wr, binds[port][i].key))
ret |= (1 << i); ret |= (1 << i);
else if (binds[port][i].valid) else if (binds[port][i].valid)
if (winraw_is_pressed( {
wr, mouse, wr->joypad, if (mouse && winraw_mouse_button_pressed(wr,
joypad_info, binds[port], port, i)) mouse, port, binds[port][i].mbutton))
ret |= (1 << i); ret |= (1 << i);
else if (button_is_pressed(
wr->joypad,
joypad_info, binds[port], port, i))
ret |= (1 << i);
}
} }
} }
@ -693,9 +677,14 @@ static int16_t winraw_input_state(void *d,
|| !input_winraw.keyboard_mapping_blocked) || !input_winraw.keyboard_mapping_blocked)
return 1; return 1;
if (binds[port][id].valid) if (binds[port][id].valid)
return winraw_is_pressed( {
wr, mouse, wr->joypad, if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port][id].mbutton))
return 1;
return button_is_pressed(
wr->joypad,
joypad_info, binds[port], port, id); joypad_info, binds[port], port, id);
}
} }
} }
break; break;
@ -731,9 +720,15 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_TRIGGER].key)) [RARCH_LIGHTGUN_TRIGGER].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_TRIGGER].valid) if (binds[port][RARCH_LIGHTGUN_TRIGGER].valid)
return winraw_is_pressed( {
wr, mouse, wr->joypad, joypad_info, binds[port], if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_TRIGGER].mbutton))
return 1;
return button_is_pressed(
wr->joypad, joypad_info, binds[port],
port, RARCH_LIGHTGUN_TRIGGER); port, RARCH_LIGHTGUN_TRIGGER);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_RELOAD: case RETRO_DEVICE_ID_LIGHTGUN_RELOAD:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -742,9 +737,15 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_RELOAD].key)) [RARCH_LIGHTGUN_RELOAD].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_RELOAD].valid) if (binds[port][RARCH_LIGHTGUN_RELOAD].valid)
return winraw_is_pressed( {
wr, mouse, wr->joypad, joypad_info, binds[port], if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_RELOAD].mbutton))
return 1;
return button_is_pressed(
wr->joypad, joypad_info, binds[port],
port, RARCH_LIGHTGUN_RELOAD); port, RARCH_LIGHTGUN_RELOAD);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_AUX_A: case RETRO_DEVICE_ID_LIGHTGUN_AUX_A:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -753,8 +754,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_AUX_A].key)) [RARCH_LIGHTGUN_AUX_A].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_AUX_A].valid) if (binds[port][RARCH_LIGHTGUN_AUX_A].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_AUX_A].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_A); joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_A);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_AUX_B: case RETRO_DEVICE_ID_LIGHTGUN_AUX_B:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -763,8 +770,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_AUX_B].key)) [RARCH_LIGHTGUN_AUX_B].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_AUX_B].valid) if (binds[port][RARCH_LIGHTGUN_AUX_B].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_AUX_B].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_B); joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_B);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_AUX_C: case RETRO_DEVICE_ID_LIGHTGUN_AUX_C:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -773,8 +786,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_AUX_C].key)) [RARCH_LIGHTGUN_AUX_C].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_AUX_C].valid) if (binds[port][RARCH_LIGHTGUN_AUX_C].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_AUX_C].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_C); joypad_info, binds[port], port, RARCH_LIGHTGUN_AUX_C);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_START: case RETRO_DEVICE_ID_LIGHTGUN_START:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -783,8 +802,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_START].key)) [RARCH_LIGHTGUN_START].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_START].valid) if (binds[port][RARCH_LIGHTGUN_START].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_START].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_START); joypad_info, binds[port], port, RARCH_LIGHTGUN_START);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_SELECT: case RETRO_DEVICE_ID_LIGHTGUN_SELECT:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -793,8 +818,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_SELECT].key)) [RARCH_LIGHTGUN_SELECT].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_SELECT].valid) if (binds[port][RARCH_LIGHTGUN_SELECT].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_SELECT].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_SELECT); joypad_info, binds[port], port, RARCH_LIGHTGUN_SELECT);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_DPAD_UP: case RETRO_DEVICE_ID_LIGHTGUN_DPAD_UP:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -803,8 +834,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_DPAD_UP].key)) [RARCH_LIGHTGUN_DPAD_UP].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_DPAD_UP].valid) if (binds[port][RARCH_LIGHTGUN_DPAD_UP].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_DPAD_UP].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_UP); joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_UP);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_DPAD_DOWN: case RETRO_DEVICE_ID_LIGHTGUN_DPAD_DOWN:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -813,8 +850,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_DPAD_DOWN].key)) [RARCH_LIGHTGUN_DPAD_DOWN].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_DPAD_DOWN].valid) if (binds[port][RARCH_LIGHTGUN_DPAD_DOWN].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_DPAD_DOWN].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_DOWN); joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_DOWN);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_DPAD_LEFT: case RETRO_DEVICE_ID_LIGHTGUN_DPAD_LEFT:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -823,8 +866,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_DPAD_LEFT].key)) [RARCH_LIGHTGUN_DPAD_LEFT].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_DPAD_LEFT].valid) if (binds[port][RARCH_LIGHTGUN_DPAD_LEFT].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_DPAD_LEFT].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_LEFT); joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_LEFT);
}
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_DPAD_RIGHT: case RETRO_DEVICE_ID_LIGHTGUN_DPAD_RIGHT:
if (!input_winraw.keyboard_mapping_blocked) if (!input_winraw.keyboard_mapping_blocked)
@ -833,8 +882,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_DPAD_RIGHT].key)) [RARCH_LIGHTGUN_DPAD_RIGHT].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_DPAD_RIGHT].valid) if (binds[port][RARCH_LIGHTGUN_DPAD_RIGHT].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_DPAD_RIGHT].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_RIGHT); joypad_info, binds[port], port, RARCH_LIGHTGUN_DPAD_RIGHT);
}
break; break;
/*deprecated*/ /*deprecated*/
@ -850,8 +905,14 @@ static int16_t winraw_input_state(void *d,
[RARCH_LIGHTGUN_START].key)) [RARCH_LIGHTGUN_START].key))
return 1; return 1;
if (binds[port][RARCH_LIGHTGUN_START].valid) if (binds[port][RARCH_LIGHTGUN_START].valid)
return winraw_is_pressed(wr, mouse, wr->joypad, {
if (mouse && winraw_mouse_button_pressed(wr,
mouse, port, binds[port]
[RARCH_LIGHTGUN_START].mbutton))
return 1;
return button_is_pressed(wr->joypad,
joypad_info, binds[port], port, RARCH_LIGHTGUN_START); joypad_info, binds[port], port, RARCH_LIGHTGUN_START);
}
break; break;
} }
break; break;