encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup for the /dev/js* support (thanks @meyraud705)

This commit is contained in:
Sam Lantinga 2021-11-11 06:30:36 -08:00
parent 3090812e1e
commit bd92a95f22
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/joystick/linux/SDL_sysjoystick.c
View File

@ -85,7 +85,7 @@ typedef enum
static EnumerationMethod enumeration_method = ENUMERATION_UNSET; static EnumerationMethod enumeration_method = ENUMERATION_UNSET;
static SDL_bool IsJoystickDeviceNode(const char *node); static SDL_bool IsJoystickJSNode(const char *node);
static int MaybeAddDevice(const char *path); static int MaybeAddDevice(const char *path);
static int MaybeRemoveDevice(const char *path); static int MaybeRemoveDevice(const char *path);
@ -186,8 +186,7 @@ IsJoystick(int fd, char **name_return, SDL_JoystickGUID *guid)
char product_string[128]; char product_string[128];
if (ioctl(fd, JSIOCGNAME(sizeof(product_string)), product_string) >= 0) { if (ioctl(fd, JSIOCGNAME(sizeof(product_string)), product_string) >= 0) {
inpid.vendor = 0; SDL_zero(inpid);
inpid.product = 0;
} else { } else {
/* When udev is enabled we only get joystick devices here, so there's no need to test them */ /* When udev is enabled we only get joystick devices here, so there's no need to test them */
if (enumeration_method != ENUMERATION_LIBUDEV && !GuessIsJoystick(fd)) { if (enumeration_method != ENUMERATION_LIBUDEV && !GuessIsJoystick(fd)) {
@ -261,9 +260,15 @@ static void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_clas
if (!(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) { if (!(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
return; return;
} }
if (SDL_classic_joysticks && !IsJoystickDeviceNode(devpath)) { if (SDL_classic_joysticks) {
if (!IsJoystickJSNode(devpath)) {
return; return;
} }
} else {
if (IsJoystickJSNode(devpath)) {
return;
}
}
MaybeAddDevice(devpath); MaybeAddDevice(devpath);
break; break;
@ -518,17 +523,33 @@ StrIsInteger(const char *string)
} }
static SDL_bool static SDL_bool
IsJoystickDeviceNode(const char *node) IsJoystickJSNode(const char *node)
{ {
const char *last_slash = SDL_strrchr(node, '/'); const char *last_slash = SDL_strrchr(node, '/');
if (last_slash) { if (last_slash) {
node = last_slash + 1; node = last_slash + 1;
} }
if (SDL_classic_joysticks) {
return (StrHasPrefix(node, "js") && StrIsInteger(node + 2)); return (StrHasPrefix(node, "js") && StrIsInteger(node + 2));
} else { }
static SDL_bool
IsJoystickEventNode(const char *node)
{
const char *last_slash = SDL_strrchr(node, '/');
if (last_slash) {
node = last_slash + 1;
}
return (StrHasPrefix(node, "event") && StrIsInteger(node + 5)); return (StrHasPrefix(node, "event") && StrIsInteger(node + 5));
} }
static SDL_bool
IsJoystickDeviceNode(const char *node)
{
if (SDL_classic_joysticks) {
return IsJoystickJSNode(node);
} else {
return IsJoystickEventNode(node);
}
} }
static void static void
@ -958,6 +979,8 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
joystick->hwdata->key_pam = NULL; joystick->hwdata->key_pam = NULL;
key_pam_size = 0; key_pam_size = 0;
} }
} else {
key_pam_size = 0;
} }
for (i = 0; i < key_pam_size; ++i) { for (i = 0; i < key_pam_size; ++i) {
Uint16 code = joystick->hwdata->key_pam[i]; Uint16 code = joystick->hwdata->key_pam[i];
@ -977,6 +1000,8 @@ ConfigJoystick(SDL_Joystick *joystick, int fd)
joystick->hwdata->abs_pam = NULL; joystick->hwdata->abs_pam = NULL;
abs_pam_size = 0; abs_pam_size = 0;
} }
} else {
abs_pam_size = 0;
} }
for (i = 0; i < abs_pam_size; ++i) { for (i = 0; i < abs_pam_size; ++i) {
Uint8 code = joystick->hwdata->abs_pam[i]; Uint8 code = joystick->hwdata->abs_pam[i];