Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-08 11:33:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Joystick hot-plugging for SDL.

Browse Source
This commit is contained in:
oscdis 2015-06-23 23:13:23 +09:00
parent a5cfd1a319
commit 76e9a03f5b
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
SDL/SDLJoystick.cpp
View File

@ -49,14 +49,15 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
case SDL_JOYAXISMOTION:
{
std::map<int, int>::const_iterator i = SDLJoyAxisMap.find(event.jaxis.axis);
if (i != SDLJoyAxisMap.end()) {
int deviceIndex = getDeviceIndex(event.jaxis.which);
if (i != SDLJoyAxisMap.end() && deviceIndex >= 0) {
AxisInput axis;
axis.axisId = i->second;
// 1.2 to try to approximate the PSP's clamped rectangular range.
axis.value = 1.2 * event.jaxis.value / 32767.0f;
if (axis.value > 1.0f) axis.value = 1.0f;
if (axis.value < -1.0f) axis.value = -1.0f;
axis.deviceId = DEVICE_ID_PAD_0 + event.jaxis.which;
axis.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
axis.flags = 0;
NativeAxis(axis);
}
@ -66,11 +67,12 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
case SDL_JOYBUTTONDOWN:
{
std::map<int, int>::const_iterator i = SDLJoyButtonMap.find(event.jbutton.button);
if (i != SDLJoyButtonMap.end()) {
int deviceIndex = getDeviceIndex(event.jbutton.which);
if (i != SDLJoyButtonMap.end() && deviceIndex >= 0) {
KeyInput key;
key.flags = KEY_DOWN;
key.keyCode = i->second;
key.deviceId = DEVICE_ID_PAD_0 + event.jbutton.which;
key.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
NativeKey(key);
}
break;
@ -79,11 +81,12 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
case SDL_JOYBUTTONUP:
{
std::map<int, int>::const_iterator i = SDLJoyButtonMap.find(event.jbutton.button);
if (i != SDLJoyButtonMap.end()) {
int deviceIndex = getDeviceIndex(event.jbutton.which);
if (i != SDLJoyButtonMap.end() && deviceIndex >= 0) {
KeyInput key;
key.flags = KEY_UP;
key.keyCode = i->second;
key.deviceId = DEVICE_ID_PAD_0 + event.jbutton.which;
key.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
NativeKey(key);
}
break;
@ -91,9 +94,13 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
case SDL_JOYHATMOTION:
{
int deviceIndex = getDeviceIndex(event.jhat.which);
if (deviceIndex < 0) {
break;
}
#ifdef _WIN32
KeyInput key;
key.deviceId = DEVICE_ID_PAD_0 + event.jhat.which;
key.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
key.flags = (event.jhat.value & SDL_HAT_UP)?KEY_DOWN:KEY_UP;
key.keyCode = NKCODE_DPAD_UP;
@ -112,8 +119,8 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
AxisInput axisY;
axisX.axisId = JOYSTICK_AXIS_HAT_X;
axisY.axisId = JOYSTICK_AXIS_HAT_Y;
axisX.deviceId = DEVICE_ID_PAD_0 + event.jhat.which;
axisY.deviceId = DEVICE_ID_PAD_0 + event.jhat.which;
axisX.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
axisY.deviceId = DEVICE_ID_PAD_0 + deviceIndex;
axisX.value = 0.0f;
axisY.value = 0.0f;
if (event.jhat.value & SDL_HAT_LEFT) axisX.value = -1.0f;
@ -125,9 +132,40 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
#endif
break;
}
case SDL_JOYDEVICEADDED:
{
int deviceIndex = event.jdevice.which;
if (deviceIndex >= joys.size()) {
joys.resize(deviceIndex+1);
}
joys[deviceIndex] = SDL_JoystickOpen(deviceIndex);
SDL_JoystickEventState(SDL_ENABLE);
break;
}
case SDL_JOYDEVICEREMOVED:
{
int deviceIndex = getDeviceIndex(event.jdevice.which);
if (deviceIndex >= 0){
SDL_JoystickClose(joys[deviceIndex]);
joys[deviceIndex] = 0;
}
break;
}
}
}
int SDLJoystick::getDeviceIndex(int instanceId){
for (int i = 0; i < joys.size(); i++){
SDL_Joystick *joy = joys[i];
if (SDL_JoystickInstanceID(joy) == instanceId){
return i;
}
}
return -1;
}
void SDLJoystick::runLoop(){
while (running){
SDL_Event evt;

1
SDL/SDLJoystick.h
View File

@ -94,4 +94,5 @@ private:
SDL_Thread *thread ;
bool running ;
int getDeviceIndex(int instanceId);
};