Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-20 16:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix joystick disconnection detection

Browse Source 
Joystick disconnection was not dectected by the event processing
functions and required calling a joystick function.

Fixes #932.
This commit is contained in:
Camilla Löwy
2017-01-31 00:17:08 +01:00
parent 466347a335
commit c5694b3013
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linux_joystick.c
+17 -2
View File
@@ -146,7 +146,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
_glfw.linjs.watch = inotify_add_watch(_glfw.linjs.inotify,
dirname,
IN_CREATE | IN_ATTRIB);
IN_CREATE | IN_ATTRIB | IN_DELETE);
if (_glfw.linjs.watch == -1)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
@@ -240,7 +240,22 @@ void _glfwDetectJoystickConnectionLinux(void)
{
char path[20];
snprintf(path, sizeof(path), "/dev/input/%s", e->name);
openJoystickDevice(path);
if (e->mask & (IN_CREATE | IN_ATTRIB))
openJoystickDevice(path);
else if (e->mask & IN_DELETE)
{
int jid;
for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{
if (strcmp(_glfw.joysticks[jid].linjs.path, path) == 0)
{
closeJoystick(_glfw.joysticks + jid);
break;
}
}
}
}
offset += sizeof(struct inotify_event) + e->len;