eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Setup to handle the guide button once we get an updated GameInput SDK

Browse source
This commit is contained in:
Sam Lantinga 2024-02-17 21:52:53 -08:00
parent ae8a910781
commit f63f99bd2d
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/joystick/gdk/SDL_gameinputjoystick.c
View file

@ -53,6 +53,7 @@ typedef struct joystick_hwdata
GAMEINPUT_InternalDevice *devref; GAMEINPUT_InternalDevice *devref;
SDL_bool report_sensors; SDL_bool report_sensors;
GameInputRumbleParams rumbleParams; GameInputRumbleParams rumbleParams;
GameInputCallbackToken guide_button_callback_token;
} GAMEINPUT_InternalJoystickHwdata; } GAMEINPUT_InternalJoystickHwdata;
@ -345,6 +346,17 @@ static SDL_JoystickPowerLevel GAMEINPUT_InternalGetPowerLevel(IGameInputDevice *
return SDL_JOYSTICK_POWER_UNKNOWN; return SDL_JOYSTICK_POWER_UNKNOWN;
} }
#if 0
static void CALLBACK GAMEINPUT_InternalGuideButtonCallback(GameInputCallbackToken callbackToken, void *context, IGameInputDevice *device, uint64_t timestamp, bool isPressed)
{
SDL_Joystick *joystick = (SDL_Joystick *)context;
SDL_LockJoysticks();
SDL_SendJoystickButton(0, joystick, SDL_GAMEPAD_BUTTON_GUIDE, isPressed ? SDL_PRESSED : SDL_RELEASED);
SDL_UnlockJoysticks();
}
#endif
static int GAMEINPUT_JoystickOpen(SDL_Joystick *joystick, int device_index) static int GAMEINPUT_JoystickOpen(SDL_Joystick *joystick, int device_index)
{ {
GAMEINPUT_InternalDevice *elem = GAMEINPUT_InternalFindByIndex(device_index); GAMEINPUT_InternalDevice *elem = GAMEINPUT_InternalFindByIndex(device_index);
@ -366,6 +378,12 @@ static int GAMEINPUT_JoystickOpen(SDL_Joystick *joystick, int device_index)
joystick->nbuttons = 11; joystick->nbuttons = 11;
joystick->nhats = 1; joystick->nhats = 1;
if (elem->info->supportedInput & GameInputKindGamepad) {
#if 0 /* The actual signature for this function is GameInputClient::RegisterSystemButtonCallback(struct IGameInputDevice *,enum GameInputSystemButtons,void *,void (*)(unsigned __int64,void *,struct IGameInputDevice *,unsigned __int64,enum GameInputSystemButtons,enum GameInputSystemButtons),unsigned __int64 *) */
IGameInput_RegisterGuideButtonCallback(g_pGameInput, elem->device, joystick, GAMEINPUT_InternalGuideButtonCallback, &hwdata->guide_button_callback_token);
#endif
}
if (elem->info->supportedRumbleMotors & (GameInputRumbleLowFrequency | GameInputRumbleHighFrequency)) { if (elem->info->supportedRumbleMotors & (GameInputRumbleLowFrequency | GameInputRumbleHighFrequency)) {
SDL_SetBooleanProperty(SDL_GetJoystickProperties(joystick), SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, SDL_TRUE); SDL_SetBooleanProperty(SDL_GetJoystickProperties(joystick), SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, SDL_TRUE);
} }
@ -464,7 +482,11 @@ static void GAMEINPUT_JoystickUpdate(SDL_Joystick *joystick)
if (IGameInputReading_GetGamepadState(reading, &state)) { if (IGameInputReading_GetGamepadState(reading, &state)) {
for (btnidx = 0; btnidx < SDL_arraysize(s_XInputButtons); ++btnidx) { for (btnidx = 0; btnidx < SDL_arraysize(s_XInputButtons); ++btnidx) {
btnstate = (state.buttons & s_XInputButtons[btnidx]) ? SDL_PRESSED : SDL_RELEASED; WORD button_mask = s_XInputButtons[btnidx];
if (!button_mask) {
continue;
}
btnstate = (state.buttons & button_mask) ? SDL_PRESSED : SDL_RELEASED;
SDL_SendJoystickButton(timestamp, joystick, btnidx, btnstate); SDL_SendJoystickButton(timestamp, joystick, btnidx, btnstate);
} }
@ -526,7 +548,13 @@ static void GAMEINPUT_JoystickUpdate(SDL_Joystick *joystick)
static void GAMEINPUT_JoystickClose(SDL_Joystick* joystick) static void GAMEINPUT_JoystickClose(SDL_Joystick* joystick)
{ {
SDL_free(joystick->hwdata); GAMEINPUT_InternalJoystickHwdata *hwdata = joystick->hwdata;
if (hwdata->guide_button_callback_token) {
IGameInput_UnregisterCallback(g_pGameInput, hwdata->guide_button_callback_token, 5000);
}
SDL_free(hwdata);
joystick->hwdata = NULL; joystick->hwdata = NULL;
} }