Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed bug #1121 (More than one device through SDL_JOYSTICK_DEVICE)

 Chusslove Illich      2011-02-13 04:30:28 PST

Currently SDL_JOYSTICK_DEVICE environment variable can be used to add
exactly one topmost device. I think it would be nice if one could also set
several devices (e.g. a stick and a throttle) in this way, as a colon-
separated list. The attached patch implements this
  • Loading branch information
slouken committed Feb 16, 2011
1 parent 26c16bb commit 43dcde0be507f7f27bec1abc8154d8c78c733221

File 1 of 1 in 43dcde0

@@ -413,21 +413,31 @@ SDL_SYS_JoystickInit(void)

numjoysticks = 0;

/* First see if the user specified a joystick to use */
/* First see if the user specified one or more joysticks to use */
if (SDL_getenv("SDL_JOYSTICK_DEVICE") != NULL) {
SDL_strlcpy(path, SDL_getenv("SDL_JOYSTICK_DEVICE"), sizeof(path));
if (stat(path, &sb) == 0) {
fd = open(path, O_RDONLY, 0);
if (fd >= 0) {
/* Assume the user knows what they're doing. */
SDL_joylist[numjoysticks].fname = SDL_strdup(path);
if (SDL_joylist[numjoysticks].fname) {
dev_nums[numjoysticks] = sb.st_rdev;
++numjoysticks;
char *envcopy, *envpath, *delim;
envcopy = SDL_strdup(SDL_getenv("SDL_JOYSTICK_DEVICE"));
envpath = envcopy;
while (envpath != NULL) {
delim = SDL_strchr(envpath, ':');
if (delim != NULL) {
*delim++ = '\0';
}
if (stat(envpath, &sb) == 0) {
fd = open(envpath, O_RDONLY, 0);
if (fd >= 0) {
/* Assume the user knows what they're doing. */
SDL_joylist[numjoysticks].fname = SDL_strdup(envpath);
if (SDL_joylist[numjoysticks].fname) {
dev_nums[numjoysticks] = sb.st_rdev;
++numjoysticks;
}
close(fd);
}
close(fd);
}
envpath = delim;
}
SDL_free(envcopy);
}

for (i = 0; i < SDL_arraysize(joydev_pattern); ++i) {

0 comments on commit 43dcde0

Please sign in to comment.