Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 19:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Camilla Löwy 2017-06-15 19:56:25 +02:00
parent 6da26c8d6c
commit 99762ad7f0
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/linux_joystick.c
View File

@ -287,15 +287,12 @@ GLFWbool _glfwInitJoysticksLinux(void)
if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0) if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0)
continue; continue;
const size_t length = strlen(dirname) + strlen(entry->d_name) + 1; char path[PATH_MAX];
char* path = calloc(length + 1, 1);
snprintf(path, length + 1, "%s/%s", dirname, entry->d_name); snprintf(path, sizeof(path), "%s/%s", dirname, entry->d_name);
if (openJoystickDevice(path)) if (openJoystickDevice(path))
count++; count++;
free(path);
} }
closedir(dir); closedir(dir);
@ -349,29 +346,29 @@ void _glfwDetectJoystickConnectionLinux(void)
regmatch_t match; regmatch_t match;
const struct inotify_event* e = (struct inotify_event*) (buffer + offset); const struct inotify_event* e = (struct inotify_event*) (buffer + offset);
if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) == 0) offset += sizeof(struct inotify_event) + e->len;
if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) != 0)
continue;
char path[PATH_MAX];
snprintf(path, sizeof(path), "/dev/input/%s", e->name);
if (e->mask & (IN_CREATE | IN_ATTRIB))
openJoystickDevice(path);
else if (e->mask & IN_DELETE)
{ {
char path[20]; int jid;
snprintf(path, sizeof(path), "/dev/input/%s", e->name);
if (e->mask & (IN_CREATE | IN_ATTRIB)) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
openJoystickDevice(path);
else if (e->mask & IN_DELETE)
{ {
int jid; if (strcmp(_glfw.joysticks[jid].linjs.path, path) == 0)
for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (strcmp(_glfw.joysticks[jid].linjs.path, path) == 0) closeJoystick(_glfw.joysticks + jid);
{ break;
closeJoystick(_glfw.joysticks + jid);
break;
}
} }
} }
} }
offset += sizeof(struct inotify_event) + e->len;
} }
} }