godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93352 from Calinou/linuxbsd-controller-no-trackpad-graphics-tablet 

Fix trackpads and graphics tablets being recognized as controllers on Linux/*BSD
This commit is contained in:
Rémi Verschelde 2024-07-09 16:47:04 +02:00
parent 82cedc83c9 724cdffc8c
commit 49a6171319
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/linuxbsd/joypad_linux.cpp
View File

@ -374,6 +374,12 @@ void JoypadLinux::open_joypad(const char *p_path) {
name = namebuf; name = namebuf;
} }
for (const String &word : name.to_lower().split(" ")) {
if (banned_words.has(word)) {
return;
}
}
if (ioctl(fd, EVIOCGID, &inpid) < 0) { if (ioctl(fd, EVIOCGID, &inpid) < 0) {
close(fd); close(fd);
return; return;

15
platform/linuxbsd/joypad_linux.h
View File

@ -94,6 +94,21 @@ private:
Vector<String> attached_devices; Vector<String> attached_devices;
// List of lowercase words that will prevent the controller from being recognized if its name matches.
// This is done to prevent trackpads, graphics tablets and motherboard LED controllers from being
// recognized as controllers (and taking up controller ID slots as a result).
// Only whole words are matched within the controller name string. The match is case-insensitive.
const Vector<String> banned_words = {
"touchpad", // Matches e.g. "SynPS/2 Synaptics TouchPad", "Sony Interactive Entertainment DualSense Wireless Controller Touchpad"
"trackpad",
"clickpad",
"keyboard", // Matches e.g. "PG-90215 Keyboard", "Usb Keyboard Usb Keyboard Consumer Control"
"mouse", // Matches e.g. "Mouse passthrough"
"pen", // Matches e.g. "Wacom One by Wacom S Pen"
"finger", // Matches e.g. "Wacom HID 495F Finger"
"led", // Matches e.g. "ASRock LED Controller"
};
static void monitor_joypads_thread_func(void *p_user); static void monitor_joypads_thread_func(void *p_user);
void monitor_joypads_thread_run(); void monitor_joypads_thread_run();