encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-12 22:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where a Logitech wireless keyboard with built-in mouse touchpad didn't get recongized as both devices.

Browse Source
This commit is contained in:
Sam Lantinga
2013-10-05 21:15:55 -07:00
parent 529664278f
commit 90a219a375
5 changed files with 134 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/linux/SDL_udev.c
View File

@@ -279,7 +279,7 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
{
const char *subsystem;
const char *val = NULL;
SDL_UDEV_deviceclass devclass = 0;
int devclass = 0;
const char *path;
SDL_UDEV_CallbackList *item;
@@ -291,32 +291,26 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
subsystem = _this->udev_device_get_subsystem(dev);
if (SDL_strcmp(subsystem, "sound") == 0) {
devclass = SDL_UDEV_DEVICE_SOUND;
}
else if (SDL_strcmp(subsystem, "input") == 0) {
} else if (SDL_strcmp(subsystem, "input") == 0) {
val = _this->udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
devclass = SDL_UDEV_DEVICE_JOYSTICK;
devclass |= SDL_UDEV_DEVICE_JOYSTICK;
}
if (devclass == 0) {
val = _this->udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
devclass = SDL_UDEV_DEVICE_MOUSE;
}
val = _this->udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
devclass |= SDL_UDEV_DEVICE_MOUSE;
}
if (devclass == 0) {
val = _this->udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
devclass = SDL_UDEV_DEVICE_KEYBOARD;
}
val = _this->udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
devclass |= SDL_UDEV_DEVICE_KEYBOARD;
}
if (devclass == 0) {
return;
}
}
else {
} else {
return;
}
@@ -401,4 +395,4 @@ SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
}
#endif /* SDL_USE_LIBUDEV */
#endif /* SDL_USE_LIBUDEV */

13
src/core/linux/SDL_udev.h
View File

@@ -46,15 +46,16 @@ typedef enum
SDL_UDEV_DEVICEREMOVED
} SDL_UDEV_deviceevent;
/* A device can be any combination of these classes */
typedef enum
{
SDL_UDEV_DEVICE_MOUSE = 0x0001,
SDL_UDEV_DEVICE_KEYBOARD,
SDL_UDEV_DEVICE_JOYSTICK,
SDL_UDEV_DEVICE_SOUND
SDL_UDEV_DEVICE_MOUSE = 0x0001,
SDL_UDEV_DEVICE_KEYBOARD = 0x0002,
SDL_UDEV_DEVICE_JOYSTICK = 0x0004,
SDL_UDEV_DEVICE_SOUND = 0x0008
} SDL_UDEV_deviceclass;
typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath);
typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
typedef struct SDL_UDEV_CallbackList {
SDL_UDEV_Callback callback;
@@ -111,4 +112,4 @@ extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
#endif /* HAVE_LIBUDEV_H */
#endif /* _SDL_udev_h */
#endif /* _SDL_udev_h */