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

Fixed joystick support.

This commit is contained in:
Stephen Anthony 2025-05-15 17:17:05 -02:30
parent 0db0774147
commit 916fb88dd8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/EventHandlerSDL.cxx
View File

@ -167,22 +167,22 @@ void EventHandlerSDL::pollEvent()
} }
#ifdef JOYSTICK_SUPPORT #ifdef JOYSTICK_SUPPORT
case SDL_JOYBUTTONUP: case SDL_EVENT_JOYSTICK_BUTTON_UP:
case SDL_JOYBUTTONDOWN: case SDL_EVENT_JOYSTICK_BUTTON_DOWN:
{ {
handleJoyBtnEvent(myEvent.jbutton.which, myEvent.jbutton.button, handleJoyBtnEvent(myEvent.jbutton.which, myEvent.jbutton.button,
myEvent.jbutton.state == SDL_PRESSED); myEvent.jbutton.down);
break; break;
} }
case SDL_JOYAXISMOTION: case SDL_EVENT_JOYSTICK_AXIS_MOTION:
{ {
handleJoyAxisEvent(myEvent.jaxis.which, myEvent.jaxis.axis, handleJoyAxisEvent(myEvent.jaxis.which, myEvent.jaxis.axis,
myEvent.jaxis.value); myEvent.jaxis.value);
break; break;
} }
case SDL_JOYHATMOTION: case SDL_EVENT_JOYSTICK_HAT_MOTION:
{ {
int value = 0; int value = 0;
const int v = myEvent.jhat.value; const int v = myEvent.jhat.value;
@ -197,18 +197,18 @@ void EventHandlerSDL::pollEvent()
} }
handleJoyHatEvent(myEvent.jhat.which, myEvent.jhat.hat, value); handleJoyHatEvent(myEvent.jhat.which, myEvent.jhat.hat, value);
break; // SDL_JOYHATMOTION break;
} }
case SDL_JOYDEVICEADDED: case SDL_EVENT_JOYSTICK_ADDED:
{ {
addPhysicalJoystick(make_shared<JoystickSDL>(myEvent.jdevice.which)); addPhysicalJoystick(make_shared<JoystickSDL>(myEvent.jdevice.which));
break; // SDL_JOYDEVICEADDED break;
} }
case SDL_JOYDEVICEREMOVED: case SDL_EVENT_JOYSTICK_REMOVED:
{ {
removePhysicalJoystick(myEvent.jdevice.which); removePhysicalJoystick(myEvent.jdevice.which);
break; // SDL_JOYDEVICEREMOVED break;
} }
#endif #endif
@ -296,6 +296,6 @@ EventHandlerSDL::JoystickSDL::~JoystickSDL()
ASSERT_MAIN_THREAD; ASSERT_MAIN_THREAD;
if(SDL_WasInit(SDL_INIT_JOYSTICK) && myStick) if(SDL_WasInit(SDL_INIT_JOYSTICK) && myStick)
SDL_JoystickClose(myStick); SDL_CloseJoystick(myStick);
} }
#endif #endif