zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rescan for controllers when toggling gamepads back on

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7985 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-14 03:03:52 +00:00 committed by Christoph Oelckers
parent 0bf4f744a8
commit 1bbd251bff
6 changed files with 123 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/include/baselayer.h
View file

@ -230,6 +230,7 @@ void mouseSetCallback(void (*callback)(int32_t,int32_t));
void joySetCallback(void (*callback)(int32_t,int32_t));
const char *keyGetName(int32_t num);
const char *joyGetName(int32_t what, int32_t num); // what: 0=axis, 1=button, 2=hat
void joyScanDevices(void);
char keyGetScan(void);
char keyGetChar(void);

168
source/build/src/sdlayer.cpp
View file

@ -825,6 +825,103 @@ static void LoadSDLControllerDB()
}
#endif
void joyScanDevices()
{
inputdevices &= ~4;
if (controller)
{
SDL_GameControllerClose(controller);
controller = nullptr;
}
if (joydev)
{
SDL_JoystickClose(joydev);
joydev = nullptr;
}
int numjoysticks = SDL_NumJoysticks();
if (numjoysticks < 1)
{
buildputs("No game controllers found\n");
}
else
{
buildputs("Game controllers:\n");
for (int i = 0; i < numjoysticks; i++)
{
const char * name;
#if SDL_MAJOR_VERSION >= 2
if (SDL_IsGameController(i))
name = SDL_GameControllerNameForIndex(i);
else
#endif
name = SDL_JoystickNameForIndex(i);
buildprintf(" %d. %s\n", i+1, name);
}
#if SDL_MAJOR_VERSION >= 2
for (int i = 0; i < numjoysticks; i++)
{
if ((controller = SDL_GameControllerOpen(i)))
{
buildprintf("Using controller %s\n", SDL_GameControllerName(controller));
joystick.numAxes = SDL_CONTROLLER_AXIS_MAX;
joystick.numButtons = SDL_CONTROLLER_BUTTON_MAX;
joystick.numHats = 0;
joystick.isGameController = 1;
Xfree(joystick.pAxis);
joystick.pAxis = (int32_t *)Xcalloc(joystick.numAxes, sizeof(int32_t));
Xfree(joystick.pHat);
joystick.pHat = nullptr;
inputdevices |= 4;
return;
}
}
#endif
for (int i = 0; i < numjoysticks; i++)
{
if ((joydev = SDL_JoystickOpen(i)))
{
buildprintf("Using joystick %s\n", SDL_JoystickName(joydev));
// KEEPINSYNC duke3d/src/gamedefs.h, mact/include/_control.h
joystick.numAxes = min(9, SDL_JoystickNumAxes(joydev));
joystick.numButtons = min(32, SDL_JoystickNumButtons(joydev));
joystick.numHats = min((36-joystick.numButtons)/4,SDL_JoystickNumHats(joydev));
joystick.isGameController = 0;
initprintf("Joystick %d has %d axes, %d buttons, and %d hat(s).\n", i+1, joystick.numAxes, joystick.numButtons, joystick.numHats);
Xfree(joystick.pAxis);
joystick.pAxis = (int32_t *)Xcalloc(joystick.numAxes, sizeof(int32_t));
Xfree(joystick.pHat);
if (joystick.numHats)
joystick.pHat = (int32_t *)Xcalloc(joystick.numHats, sizeof(int32_t));
else
joystick.pHat = nullptr;
for (int j = 0; j < joystick.numHats; j++)
joystick.pHat[j] = -1; // center
SDL_JoystickEventState(SDL_ENABLE);
inputdevices |= 4;
return;
}
}
buildputs("No controllers are usable\n");
}
}
//
// initinput() -- init input system
//
@ -878,76 +975,7 @@ int32_t initinput(void)
LoadSDLControllerDB();
#endif
int numjoysticks = SDL_NumJoysticks();
if (numjoysticks < 1)
{
buildputs("No game controllers found\n");
}
else
{
buildputs("Game controllers:\n");
for (i = 0; i < numjoysticks; i++)
{
const char * name;
#if SDL_MAJOR_VERSION >= 2
if (SDL_IsGameController(i))
name = SDL_GameControllerNameForIndex(i);
else
#endif
name = SDL_JoystickNameForIndex(i);
buildprintf(" %d. %s\n", i+1, name);
}
#if SDL_MAJOR_VERSION >= 2
for (i = 0; i < numjoysticks; i++)
{
if ((controller = SDL_GameControllerOpen(i)))
{
buildprintf("Using controller %s\n", SDL_GameControllerName(controller));
inputdevices |= 4;
joystick.numAxes = SDL_CONTROLLER_AXIS_MAX;
joystick.numButtons = SDL_CONTROLLER_BUTTON_MAX;
joystick.numHats = 0;
joystick.isGameController = 1;
joystick.pAxis = (int32_t *)Xcalloc(joystick.numAxes, sizeof(int32_t));
return 0;
}
}
#endif
for (i = 0; i < numjoysticks; i++)
{
if ((joydev = SDL_JoystickOpen(i)))
{
buildprintf("Using joystick %s\n", SDL_JoystickName(joydev));
SDL_JoystickEventState(SDL_ENABLE);
inputdevices |= 4;
// KEEPINSYNC duke3d/src/gamedefs.h, mact/include/_control.h
joystick.numAxes = min(9, SDL_JoystickNumAxes(joydev));
joystick.numButtons = min(32, SDL_JoystickNumButtons(joydev));
joystick.numHats = min((36-joystick.numButtons)/4,SDL_JoystickNumHats(joydev));
initprintf("Joystick %d has %d axes, %d buttons, and %d hat(s).\n", i+1, joystick.numAxes, joystick.numButtons, joystick.numHats);
joystick.pAxis = (int32_t *)Xcalloc(joystick.numAxes, sizeof(int32_t));
if (joystick.numHats)
joystick.pHat = (int32_t *)Xcalloc(joystick.numHats, sizeof(int32_t));
for (i = 0; i < joystick.numHats; i++) joystick.pHat[i] = -1; // centre
return 0;
}
}
buildputs("No controllers are usable\n");
}
joyScanDevices();
}
return 0;

4
source/build/src/winlayer.cpp
View file

@ -1150,6 +1150,10 @@ const char *joyGetName(int32_t what, int32_t num)
}
}
void joyScanDevices()
{
}
//
// AcquireInputDevices() -- (un)acquires the input devices
//

4
source/duke3d/src/menus.cpp
View file

@ -3380,7 +3380,11 @@ static int32_t Menu_EntryOptionModify(MenuEntry_t *entry, int32_t newOption)
else if (entry == &ME_MOUSESETUP_SMOOTH)
CONTROL_SmoothMouse = ud.config.SmoothInput;
else if (entry == &ME_JOYSTICK_ENABLE)
{
if (newOption)
CONTROL_ScanForControllers();
CONTROL_JoystickEnabled = (newOption && CONTROL_JoyPresent);
}
else if (entry == &ME_JOYSTICKAXIS_ANALOG)
CONTROL_MapAnalogAxis(M_JOYSTICKAXES.currentEntry, newOption, controldevice_joystick);
else if (entry == &ME_NETOPTIONS_EPISODE)

2
source/mact/include/control.h
View file

@ -198,6 +198,8 @@ void CONTROL_MapAnalogAxis(int whichaxis, int whichanalog, controldevice device)
void CONTROL_MapDigitalAxis(int32_t whichaxis, int32_t whichfunction, int32_t direction, controldevice device);
void CONTROL_SetAnalogAxisScale(int32_t whichaxis, int32_t axisscale, controldevice device);
void CONTROL_ScanForControllers(void);
int32_t CONTROL_GetGameControllerDigitalAxisPos(int32_t axis);
int32_t CONTROL_GetGameControllerDigitalAxisNeg(int32_t axis);
void CONTROL_ClearGameControllerDigitalAxisPos(int32_t axis);

17
source/mact/src/control.cpp
View file

@ -842,6 +842,19 @@ void CONTROL_GetInput(ControlInfo *info)
inputchecked = 1;
}
static void CONTROL_ResetJoystickValues()
{
CONTROL_NumJoyAxes = min(MAXJOYAXES, joystick.numAxes);
CONTROL_NumJoyButtons = min(MAXJOYBUTTONS, joystick.numButtons + 4 * (joystick.numHats > 0));
CONTROL_JoystickEnabled = CONTROL_JoyPresent = !!((inputdevices & 4) >> 2);
}
void CONTROL_ScanForControllers()
{
joyScanDevices();
CONTROL_ResetJoystickValues();
}
bool CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t ticspersecond)
{
UNREFERENCED_PARAMETER(which);
@ -866,9 +879,7 @@ bool CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t ti
CONTROL_MousePresent = Mouse_Init();
CONTROL_MouseEnabled = CONTROL_MousePresent;
CONTROL_NumJoyAxes = min(MAXJOYAXES, joystick.numAxes);
CONTROL_NumJoyButtons = min(MAXJOYBUTTONS, joystick.numButtons + 4 * (joystick.numHats > 0));
CONTROL_JoystickEnabled = CONTROL_JoyPresent = !!((inputdevices & 4) >> 2);
CONTROL_ResetJoystickValues();
#ifdef GEKKO
if (CONTROL_MousePresent)