mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into feature/back-merge

Browse Source
This commit is contained in:
Lukas Dürrenberger 2022-04-07 08:57:06 +02:00
commit cb675b2bbc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -37,4 +37,4 @@ build/
# Cache/IDE folders # Cache/IDE folders
.cache/ .cache/
.vscode/ .vscode/
.idea/

9
src/SFML/Window/Unix/JoystickImpl.cpp
View File

@ -29,6 +29,7 @@
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#include <linux/joystick.h> #include <linux/joystick.h>
#include <libudev.h> #include <libudev.h>
#include <poll.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <string> #include <string>
@ -254,13 +255,9 @@ namespace
// This will not fail since we make sure udevMonitor is valid // This will not fail since we make sure udevMonitor is valid
int monitorFd = udev_monitor_get_fd(udevMonitor); int monitorFd = udev_monitor_get_fd(udevMonitor);
fd_set descriptorSet; pollfd fds{ monitorFd, POLLIN, 0 };
FD_ZERO(&descriptorSet);
FD_SET(monitorFd, &descriptorSet);
timeval timeout = {0, 0};
return (select(monitorFd + 1, &descriptorSet, nullptr, nullptr, &timeout) > 0) && return (poll(&fds, 1, 0) > 0) && ((fds.revents & POLLIN) != 0);
FD_ISSET(monitorFd, &descriptorSet);
} }
// Get a property value from a udev device // Get a property value from a udev device