ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-03 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the Steam virtual gamepad slot as the gamepad player index

Browse source 
(cherry picked from commit 7529d25b2b99e2f790c418e479e7ce85c1c818e6)
This commit is contained in:
Sam Lantinga 2023-12-09 21:00:32 -08:00
parent 5b26d4e0ca
commit dd28637947
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/joystick/linux/SDL_sysjoystick.c
View file

@ -157,6 +157,7 @@ typedef struct SDL_joylist_item
char *name; /* "SideWinder 3D Pro" or whatever */ char *name; /* "SideWinder 3D Pro" or whatever */
SDL_JoystickGUID guid; SDL_JoystickGUID guid;
dev_t devnum; dev_t devnum;
int steam_virtual_gamepad_slot;
struct joystick_hwdata *hwdata; struct joystick_hwdata *hwdata;
struct SDL_joylist_item *next; struct SDL_joylist_item *next;
@ -220,6 +221,19 @@ static SDL_bool IsVirtualJoystick(Uint16 vendor, Uint16 product, Uint16 version,
} }
#endif /* SDL_JOYSTICK_HIDAPI */ #endif /* SDL_JOYSTICK_HIDAPI */
static SDL_bool GetVirtualGamepadSlot(const char *name, int *slot)
{
const char *digits = SDL_strstr(name, "pad ");
if (digits) {
digits += 4;
if (SDL_isdigit(*digits)) {
*slot = SDL_atoi(digits);
return SDL_TRUE;
}
}
return SDL_FALSE;
}
static int GuessDeviceClass(int fd) static int GuessDeviceClass(int fd)
{ {
unsigned long evbit[NBITS(EV_MAX)] = { 0 }; unsigned long evbit[NBITS(EV_MAX)] = { 0 };
@ -255,7 +269,7 @@ static int GuessIsSensor(int fd)
return 0; return 0;
} }
static int IsJoystick(const char *path, int fd, char **name_return, SDL_JoystickGUID *guid) static int IsJoystick(const char *path, int fd, char **name_return, Uint16 *vendor_return, Uint16 *product_return, SDL_JoystickGUID *guid)
{ {
struct input_id inpid; struct input_id inpid;
char *name; char *name;
@ -308,6 +322,8 @@ static int IsJoystick(const char *path, int fd, char **name_return, SDL_Joystick
return 0; return 0;
} }
*name_return = name; *name_return = name;
*vendor_return = inpid.vendor;
*product_return = inpid.product;
return 1; return 1;
} }
@ -385,6 +401,7 @@ static void MaybeAddDevice(const char *path)
struct stat sb; struct stat sb;
int fd = -1; int fd = -1;
char *name = NULL; char *name = NULL;
Uint16 vendor, product;
SDL_JoystickGUID guid; SDL_JoystickGUID guid;
SDL_joylist_item *item; SDL_joylist_item *item;
SDL_sensorlist_item *item_sensor; SDL_sensorlist_item *item_sensor;
@ -420,7 +437,7 @@ static void MaybeAddDevice(const char *path)
SDL_Log("Checking %s\n", path); SDL_Log("Checking %s\n", path);
#endif #endif
if (IsJoystick(path, fd, &name, &guid)) { if (IsJoystick(path, fd, &name, &vendor, &product, &guid)) {
#ifdef DEBUG_INPUT_EVENTS #ifdef DEBUG_INPUT_EVENTS
SDL_Log("found joystick: %s\n", path); SDL_Log("found joystick: %s\n", path);
#endif #endif
@ -432,10 +449,16 @@ static void MaybeAddDevice(const char *path)
} }
item->devnum = sb.st_rdev; item->devnum = sb.st_rdev;
item->steam_virtual_gamepad_slot = -1;
item->path = SDL_strdup(path); item->path = SDL_strdup(path);
item->name = name; item->name = name;
item->guid = guid; item->guid = guid;
if (vendor == USB_VENDOR_VALVE &&
product == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD) {
GetVirtualGamepadSlot(item->name, &item->steam_virtual_gamepad_slot);
}
if ((!item->path) || (!item->name)) { if ((!item->path) || (!item->name)) {
FreeJoylistItem(item); FreeJoylistItem(item);
goto done; goto done;
@ -841,19 +864,6 @@ static int SDLCALL sort_virtual_gamepads(const void *_a, const void *_b)
return a->slot - b->slot; return a->slot - b->slot;
} }
static SDL_bool get_virtual_gamepad_slot(const char *name, int *slot)
{
const char *digits = SDL_strstr(name, "pad ");
if (digits) {
digits += 4;
if (SDL_isdigit(*digits)) {
*slot = SDL_atoi(digits);
return SDL_TRUE;
}
}
return SDL_FALSE;
}
static void LINUX_ScanSteamVirtualGamepads(void) static void LINUX_ScanSteamVirtualGamepads(void)
{ {
int i, count; int i, count;
@ -876,7 +886,7 @@ static void LINUX_ScanSteamVirtualGamepads(void)
inpid.vendor == USB_VENDOR_VALVE && inpid.vendor == USB_VENDOR_VALVE &&
inpid.product == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD && inpid.product == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD &&
ioctl(fd, EVIOCGNAME(sizeof(name)), name) > 0 && ioctl(fd, EVIOCGNAME(sizeof(name)), name) > 0 &&
get_virtual_gamepad_slot(name, &virtual_gamepad_slot)) { GetVirtualGamepadSlot(name, &virtual_gamepad_slot)) {
VirtualGamepadEntry *new_virtual_gamepads = (VirtualGamepadEntry *)SDL_realloc(virtual_gamepads, (num_virtual_gamepads + 1) * sizeof(*virtual_gamepads)); VirtualGamepadEntry *new_virtual_gamepads = (VirtualGamepadEntry *)SDL_realloc(virtual_gamepads, (num_virtual_gamepads + 1) * sizeof(*virtual_gamepads));
if (new_virtual_gamepads) { if (new_virtual_gamepads) {
VirtualGamepadEntry *entry = &new_virtual_gamepads[num_virtual_gamepads]; VirtualGamepadEntry *entry = &new_virtual_gamepads[num_virtual_gamepads];
@ -1104,7 +1114,7 @@ static const char *LINUX_JoystickGetDevicePath(int device_index)
static int LINUX_JoystickGetDevicePlayerIndex(int device_index) static int LINUX_JoystickGetDevicePlayerIndex(int device_index)
{ {
return -1; return GetJoystickByDevIndex(device_index)->steam_virtual_gamepad_slot;
} }
static void LINUX_JoystickSetDevicePlayerIndex(int device_index, int player_index) static void LINUX_JoystickSetDevicePlayerIndex(int device_index, int player_index)