incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix gamepad input pt1

Browse source
This commit is contained in:
NepDisk 2026-02-12 16:53:32 -05:00
parent 1ca56d100a
commit c5fe606343
2 changed files with 53 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/sdl/i_system.cpp
View file

@ -1201,6 +1201,7 @@ void I_ShutdownJoystick(UINT8 index)
static int joy_open(int playerIndex, int joyID) static int joy_open(int playerIndex, int joyID)
{ {
SDL_Gamepad *newdev = NULL; SDL_Gamepad *newdev = NULL;
SDL_JoystickID *joystick_list = NULL;
int num_joy = 0; int num_joy = 0;
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0) if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
@ -1217,15 +1218,24 @@ static int joy_open(int playerIndex, int joyID)
if (joyID <= 0) if (joyID <= 0)
return -1; return -1;
SDL_GetJoysticks(&num_joy); joystick_list = SDL_GetJoysticks(&num_joy);
if (num_joy == 0) if (!joystick_list || num_joy == 0)
{ {
CONS_Printf("%s", M_GetText("Found no joysticks on this system\n")); CONS_Printf("%s", M_GetText("Found no joysticks on this system\n"));
return -1; return -1;
} }
newdev = SDL_OpenGamepad(joyID-1); if (joyID > num_joy)
{
SDL_free(joystick_list);
return -1;
}
SDL_JoystickID joystick_id = joystick_list[joyID - 1];
SDL_free(joystick_list);
newdev = SDL_OpenGamepad(joystick_id);
// Handle the edge case where the device <-> joystick index assignment can change due to hotplugging // Handle the edge case where the device <-> joystick index assignment can change due to hotplugging
// This indexing is SDL's responsibility and there's not much we can do about it. // This indexing is SDL's responsibility and there's not much we can do about it.
@ -1251,7 +1261,7 @@ static int joy_open(int playerIndex, int joyID)
} }
JoyInfo[playerIndex].dev = newdev; JoyInfo[playerIndex].dev = newdev;
JoyInfo[playerIndex].id = I_GetJoystickID(JoyInfo[playerIndex].dev); JoyInfo[playerIndex].id = joystick_id;;
if (JoyInfo[playerIndex].dev == NULL) if (JoyInfo[playerIndex].dev == NULL)
{ {
@ -1279,6 +1289,8 @@ static int joy_open(int playerIndex, int joyID)
void I_InitJoystick(UINT8 index) void I_InitJoystick(UINT8 index)
{ {
SDL_Gamepad *newcontroller = NULL; SDL_Gamepad *newcontroller = NULL;
SDL_JoystickID *joystick_list = NULL;
int num_joy = 0;
UINT8 i; UINT8 i;
//I_ShutdownJoystick(); //I_ShutdownJoystick();
@ -1333,8 +1345,16 @@ void I_InitJoystick(UINT8 index)
} }
} }
if (cv_usejoystick[index].value) joystick_list = SDL_GetJoysticks(&num_joy);
newcontroller = SDL_OpenGamepad(cv_usejoystick[index].value-1);
if (joystick_list && cv_usejoystick[index].value > 0 && cv_usejoystick[index].value <= num_joy)
{
SDL_JoystickID joystick_id = joystick_list[cv_usejoystick[index].value - 1];
newcontroller = SDL_OpenGamepad(joystick_id);
}
if (joystick_list)
SDL_free(joystick_list);
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{ {
@ -1438,11 +1458,29 @@ static char joyname[255]; // joystick name is straight from the driver
const char *I_GetJoyName(INT32 joyid) const char *I_GetJoyName(INT32 joyid)
{ {
const char *tempname = NULL; const char *tempname = NULL;
SDL_JoystickID *joystick_list = NULL;
int num_joy = 0;
joyname[0] = 0; joyname[0] = 0;
joyid--; //SDL's Joystick System starts at 0, not 1
if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK) if (SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
{ {
tempname = SDL_GetJoystickNameForID(joyid); if (joyid <= 0)
return joyname;
joystick_list = SDL_GetJoysticks(&num_joy);
if (!joystick_list || joyid > num_joy)
{
if (joystick_list)
SDL_free(joystick_list);
return joyname;
}
SDL_JoystickID joystick_id = joystick_list[joyid - 1];
SDL_free(joystick_list);
tempname = SDL_GetJoystickNameForID(joystick_id);
if (tempname) if (tempname)
{ {
strncpy(joyname, tempname, 254); strncpy(joyname, tempname, 254);

12
src/sdl/i_video.cpp
View file

@ -935,10 +935,11 @@ static void Impl_HandleControllerButtonEvent(SDL_GamepadButtonEvent evt, Uint32
static void Impl_HandleControllerAddEvent(SDL_Event evt) static void Impl_HandleControllerAddEvent(SDL_Event evt)
{ {
UINT8 i; UINT8 i;
SDL_JoystickID joystick_id = evt.gdevice.which;
SDL_Gamepad *newcontroller = SDL_OpenGamepad(evt.gdevice.which); SDL_Gamepad *newcontroller = SDL_OpenGamepad(joystick_id);
CONS_Debug(DBG_GAMELOGIC, "Controller device index %d added\n", evt.gdevice.which + 1); CONS_Debug(DBG_GAMELOGIC, "Controller device index %d added\n", joystick_id + 1);
// Because SDL's device index is unstable, we're going to cheat here a bit: // Because SDL's device index is unstable, we're going to cheat here a bit:
// For the first joystick setting that is NOT active: // For the first joystick setting that is NOT active:
@ -966,7 +967,7 @@ static void Impl_HandleControllerAddEvent(SDL_Event evt)
if (j == MAXSPLITSCREENPLAYERS) if (j == MAXSPLITSCREENPLAYERS)
{ {
// ensures we aren't overriding a currently active device // ensures we aren't overriding a currently active device
cv_usejoystick[i].value = evt.gdevice.which + 1; cv_usejoystick[i].value = joystick_id + 1;
I_UpdateJoystickDeviceIndices(0); I_UpdateJoystickDeviceIndices(0);
} }
} }
@ -1014,12 +1015,13 @@ static void Impl_HandleControllerAddEvent(SDL_Event evt)
static void Impl_HandleControllerRemoveEvent(SDL_Event evt) static void Impl_HandleControllerRemoveEvent(SDL_Event evt)
{ {
UINT8 i; UINT8 i;
SDL_JoystickID joystick_id = evt.gdevice.which;
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{ {
if (JoyInfo[i].dev && !SDL_GamepadConnected(JoyInfo[i].dev)) if (JoyInfo[i].dev && JoyInfo[i].id == joystick_id && !SDL_GamepadConnected(JoyInfo[i].dev))
{ {
CONS_Debug(DBG_GAMELOGIC, "Joystick%d removed, device index: %d\n", i+1, JoyInfo[i].oldjoy); CONS_Debug(DBG_GAMELOGIC, "Joystick%d removed, device index: %d\n", i+1, joystick_id);
I_ShutdownJoystick(i); I_ShutdownJoystick(i);
} }
} }