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

evdev: Support user-provided devices via SDL_EVDEV_DEVICES in non-udev mode.

This commit is contained in:
Adam Butcher 2022-06-23 16:10:39 +01:00 committed by Sam Lantinga
parent f790fc4fc0
commit 8f5932dc2e
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/linux/SDL_evdev.c
View File

@ -123,8 +123,8 @@ static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item); static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
static int SDL_EVDEV_device_removed(const char *dev_path); static int SDL_EVDEV_device_removed(const char *dev_path);
#if SDL_USE_LIBUDEV
static int SDL_EVDEV_device_added(const char *dev_path, int udev_class); static int SDL_EVDEV_device_added(const char *dev_path, int udev_class);
#if SDL_USE_LIBUDEV
static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class,
const char *dev_path); const char *dev_path);
#endif /* SDL_USE_LIBUDEV */ #endif /* SDL_USE_LIBUDEV */
@ -175,7 +175,30 @@ SDL_EVDEV_Init(void)
/* Force a scan to build the initial device list */ /* Force a scan to build the initial device list */
SDL_UDEV_Scan(); SDL_UDEV_Scan();
#else #else
/* TODO: Scan the devices manually, like a caveman */ {
/* Allow the user to specify a list of devices explicitly of
the form:
deviceclass:path[,deviceclass:path[,...]]
where device class is an integer representing the
SDL_UDEV_deviceclass and path is the full path to
the event device. */
const char* devices = SDL_getenv("SDL_EVDEV_DEVICES");
if (devices) {
/* Assume this is the old use of the env var and it is not in
ROM. */
char* rest = (char*) devices;
char* spec;
while ((spec = strtok_r(rest, ",", &rest))) {
char* endofcls = 0;
long cls = strtol(spec, &endofcls, 0);
if (endofcls)
SDL_EVDEV_device_added(endofcls + 1, cls);
}
}
else {
/* TODO: Scan the devices manually, like a caveman */
}
}
#endif /* SDL_USE_LIBUDEV */ #endif /* SDL_USE_LIBUDEV */
_this->kbd = SDL_EVDEV_kbd_init(); _this->kbd = SDL_EVDEV_kbd_init();
@ -507,7 +530,6 @@ SDL_EVDEV_translate_keycode(int keycode)
return scancode; return scancode;
} }
#ifdef SDL_USE_LIBUDEV
static int static int
SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class) SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class)
{ {
@ -607,7 +629,6 @@ SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class)
return 0; return 0;
} }
#endif /* SDL_USE_LIBUDEV */
static void static void
SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) { SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) {
@ -745,7 +766,6 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
#endif /* EVIOCGMTSLOTS */ #endif /* EVIOCGMTSLOTS */
} }
#if SDL_USE_LIBUDEV
static int static int
SDL_EVDEV_device_added(const char *dev_path, int udev_class) SDL_EVDEV_device_added(const char *dev_path, int udev_class)
{ {
@ -807,7 +827,6 @@ SDL_EVDEV_device_added(const char *dev_path, int udev_class)
return _this->num_devices++; return _this->num_devices++;
} }
#endif /* SDL_USE_LIBUDEV */
static int static int
SDL_EVDEV_device_removed(const char *dev_path) SDL_EVDEV_device_removed(const char *dev_path)