Commit c9ada1c1427ee8647fad92e2776912e1480297ca
2021-11-11T12:45:38
Made HIDAPI device change notifications available via SDL_hid_device_change_count()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197
diff --git a/include/SDL_hidapi.h b/include/SDL_hidapi.h
index 5552111..fe7a8e9 100644
--- a/include/SDL_hidapi.h
+++ b/include/SDL_hidapi.h
@@ -122,9 +122,13 @@ typedef struct SDL_hid_device_info
* be called at the beginning of execution however, if there is a chance of
* HIDAPI handles being opened by different threads simultaneously.
*
+ * Each call to this function should have a matching call to SDL_hid_exit()
+ *
* \returns 0 on success and -1 on error.
*
* \since This function is available since SDL 2.0.18.
+ *
+ * \sa SDL_hid_exit
*/
extern DECLSPEC int SDLCALL SDL_hid_init(void);
@@ -137,10 +141,33 @@ extern DECLSPEC int SDLCALL SDL_hid_init(void);
* \returns 0 on success and -1 on error.
*
* \since This function is available since SDL 2.0.18.
+ *
+ * \sa SDL_hid_init
*/
extern DECLSPEC int SDLCALL SDL_hid_exit(void);
/**
+ * Check to see if devices may have been added or removed.
+ *
+ * Enumerating the HID devices is an expensive operation, so you can call this
+ * to see if there have been any system device changes since the last call to
+ * this function. A change in the counter returned doesn't necessarily mean
+ * that anything has changed, but you can call SDL_hid_enumerate() to get an
+ * updated device list.
+ *
+ * Calling this function for the first time may cause a thread or other
+ * system resource to be allocated to track device change notifications.
+ *
+ * \returns a change counter that is incremented with each potential device
+ * change, or 0 if device change detection isn't available.
+ *
+ * \since This function is available since SDL 2.0.18.
+ *
+ * \sa SDL_hid_enumerate
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_hid_device_change_count(void);
+
+/**
* Enumerate the HID Devices.
*
* This function returns a linked list of all the HID devices attached to the
@@ -157,6 +184,8 @@ extern DECLSPEC int SDLCALL SDL_hid_exit(void);
* SDL_hid_free_enumeration().
*
* \since This function is available since SDL 2.0.18.
+ *
+ * \sa SDL_hid_device_change_count
*/
extern DECLSPEC SDL_hid_device_info * SDLCALL SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id);
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index 9077bb0..8a9f43f 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -846,3 +846,4 @@
#define SDL_GetWindowMouseRect SDL_GetWindowMouseRect_REAL
#define SDL_RenderWindowToLogical SDL_RenderWindowToLogical_REAL
#define SDL_RenderLogicalToWindow SDL_RenderLogicalToWindow_REAL
+#define SDL_hid_device_change_count SDL_hid_device_change_count_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 93be9fb..d6c289c 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -915,3 +915,4 @@ SDL_DYNAPI_PROC(int,SDL_SetWindowMouseRect,(SDL_Window *a, const SDL_Rect *b),(a
SDL_DYNAPI_PROC(const SDL_Rect*,SDL_GetWindowMouseRect,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_RenderWindowToLogical,(SDL_Renderer *a, int b, int c, float *d, float *e),(a,b,c,d,e),)
SDL_DYNAPI_PROC(void,SDL_RenderLogicalToWindow,(SDL_Renderer *a, float b, float c, int *d, int *e),(a,b,c,d,e),)
+SDL_DYNAPI_PROC(Uint32,SDL_hid_device_change_count,(void),(),return)
diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c
index dbb0ae8..67decce 100644
--- a/src/hidapi/SDL_hidapi.c
+++ b/src/hidapi/SDL_hidapi.c
@@ -31,10 +31,483 @@
#include "SDL_loadso.h"
#include "SDL_hidapi.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
#include "SDL_hidapi_c.h"
#if !SDL_HIDAPI_DISABLED
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+#if defined(__MACOSX__)
+#include <CoreFoundation/CoreFoundation.h>
+#include <mach/mach.h>
+#include <IOKit/IOKitLib.h>
+#include <IOKit/hid/IOHIDDevice.h>
+#include <IOKit/usb/USBSpec.h>
+#endif
+
+#include "../core/linux/SDL_udev.h"
+#ifdef SDL_USE_LIBUDEV
+#include <poll.h>
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_INOTIFY
+#include <unistd.h> /* just in case we didn't use that SDL_USE_LIBUDEV block... */
+#include <errno.h> /* errno, strerror */
+#include <fcntl.h>
+#include <limits.h> /* For the definition of NAME_MAX */
+#include <sys/inotify.h>
+#endif
+
+#if defined(SDL_USE_LIBUDEV)
+typedef enum
+{
+ ENUMERATION_UNSET,
+ ENUMERATION_LIBUDEV,
+ ENUMERATION_FALLBACK
+} LinuxEnumerationMethod;
+
+static LinuxEnumerationMethod linux_enumeration_method = ENUMERATION_UNSET;
+#endif
+
+#if defined(HAVE_INOTIFY)
+static int inotify_fd = -1;
+#endif
+
+#if defined(SDL_USE_LIBUDEV)
+static const SDL_UDEV_Symbols * usyms = NULL;
+#endif
+
+static struct
+{
+ SDL_bool m_bInitialized;
+ Uint32 m_unDeviceChangeCounter;
+ SDL_bool m_bCanGetNotifications;
+ Uint32 m_unLastDetect;
+
+#if defined(__WIN32__)
+ SDL_threadID m_nThreadID;
+ WNDCLASSEXA m_wndClass;
+ HWND m_hwndMsg;
+ HDEVNOTIFY m_hNotify;
+ double m_flLastWin32MessageCheck;
+#endif
+
+#if defined(__MACOSX__)
+ IONotificationPortRef m_notificationPort;
+ mach_port_t m_notificationMach;
+#endif
+
+#if defined(SDL_USE_LIBUDEV)
+ struct udev *m_pUdev;
+ struct udev_monitor *m_pUdevMonitor;
+ int m_nUdevFd;
+#endif
+} SDL_HIDAPI_discovery;
+
+
+#ifdef __WIN32__
+struct _DEV_BROADCAST_HDR
+{
+ DWORD dbch_size;
+ DWORD dbch_devicetype;
+ DWORD dbch_reserved;
+};
+
+typedef struct _DEV_BROADCAST_DEVICEINTERFACE_A
+{
+ DWORD dbcc_size;
+ DWORD dbcc_devicetype;
+ DWORD dbcc_reserved;
+ GUID dbcc_classguid;
+ char dbcc_name[ 1 ];
+} DEV_BROADCAST_DEVICEINTERFACE_A, *PDEV_BROADCAST_DEVICEINTERFACE_A;
+
+typedef struct _DEV_BROADCAST_HDR DEV_BROADCAST_HDR;
+#define DBT_DEVICEARRIVAL 0x8000 /* system detected a new device */
+#define DBT_DEVICEREMOVECOMPLETE 0x8004 /* device was removed from the system */
+#define DBT_DEVTYP_DEVICEINTERFACE 0x00000005 /* device interface class */
+#define DBT_DEVNODES_CHANGED 0x0007
+#define DBT_CONFIGCHANGED 0x0018
+#define DBT_DEVICETYPESPECIFIC 0x8005 /* type specific event */
+#define DBT_DEVINSTSTARTED 0x8008 /* device installed and started */
+
+#include <initguid.h>
+DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED);
+
+static LRESULT CALLBACK ControllerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+ switch (message) {
+ case WM_DEVICECHANGE:
+ switch (wParam) {
+ case DBT_DEVICEARRIVAL:
+ case DBT_DEVICEREMOVECOMPLETE:
+ if (((DEV_BROADCAST_HDR*)lParam)->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE) {
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ }
+ break;
+ }
+ return TRUE;
+ }
+
+ return DefWindowProc(hwnd, message, wParam, lParam);
+}
+#endif /* __WIN32__ */
+
+
+#if defined(__MACOSX__)
+static void CallbackIOServiceFunc(void *context, io_iterator_t portIterator)
+{
+ /* Must drain the iterator, or we won't receive new notifications */
+ io_object_t entry;
+ while ((entry = IOIteratorNext(portIterator)) != 0) {
+ IOObjectRelease(entry);
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ }
+}
+#endif /* __MACOSX__ */
+
+#ifdef HAVE_INOTIFY
+#ifdef HAVE_INOTIFY_INIT1
+static int SDL_inotify_init1(void) {
+ return inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
+}
+#else
+static int SDL_inotify_init1(void) {
+ int fd = inotify_init();
+ if (fd < 0) return -1;
+ fcntl(fd, F_SETFL, O_NONBLOCK);
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+ return fd;
+}
+#endif
+
+static int
+StrHasPrefix(const char *string, const char *prefix)
+{
+ return (SDL_strncmp(string, prefix, SDL_strlen(prefix)) == 0);
+}
+
+static int
+StrIsInteger(const char *string)
+{
+ const char *p;
+
+ if (*string == '\0') {
+ return 0;
+ }
+
+ for (p = string; *p != '\0'; p++) {
+ if (*p < '0' || *p > '9') {
+ return 0;
+ }
+ }
+
+ return 1;
+}
+#endif /* HAVE_INOTIFY */
+
+static void
+HIDAPI_InitializeDiscovery()
+{
+ SDL_HIDAPI_discovery.m_bInitialized = SDL_TRUE;
+ SDL_HIDAPI_discovery.m_unDeviceChangeCounter = 1;
+ SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_FALSE;
+ SDL_HIDAPI_discovery.m_unLastDetect = 0;
+
+#if defined(__WIN32__)
+ SDL_HIDAPI_discovery.m_nThreadID = SDL_ThreadID();
+
+ SDL_zero(SDL_HIDAPI_discovery.m_wndClass);
+ SDL_HIDAPI_discovery.m_wndClass.hInstance = GetModuleHandle(NULL);
+ SDL_HIDAPI_discovery.m_wndClass.lpszClassName = "SDL_HIDAPI_DEVICE_DETECTION";
+ SDL_HIDAPI_discovery.m_wndClass.lpfnWndProc = ControllerWndProc; /* This function is called by windows */
+ SDL_HIDAPI_discovery.m_wndClass.cbSize = sizeof(WNDCLASSEX);
+
+ RegisterClassExA(&SDL_HIDAPI_discovery.m_wndClass);
+ SDL_HIDAPI_discovery.m_hwndMsg = CreateWindowExA(0, "SDL_HIDAPI_DEVICE_DETECTION", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
+
+ {
+ DEV_BROADCAST_DEVICEINTERFACE_A devBroadcast;
+
+ SDL_zero(devBroadcast);
+ devBroadcast.dbcc_size = sizeof( devBroadcast );
+ devBroadcast.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
+ devBroadcast.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
+
+ /* DEVICE_NOTIFY_ALL_INTERFACE_CLASSES is important, makes GUID_DEVINTERFACE_USB_DEVICE ignored,
+ * but that seems to be necessary to get a notice after each individual usb input device actually
+ * installs, rather than just as the composite device is seen.
+ */
+ SDL_HIDAPI_discovery.m_hNotify = RegisterDeviceNotification( SDL_HIDAPI_discovery.m_hwndMsg, &devBroadcast, DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES );
+ SDL_HIDAPI_discovery.m_bCanGetNotifications = ( SDL_HIDAPI_discovery.m_hNotify != 0 );
+ }
+#endif /* __WIN32__ */
+
+#if defined(__MACOSX__)
+ SDL_HIDAPI_discovery.m_notificationPort = IONotificationPortCreate(kIOMasterPortDefault);
+ if (SDL_HIDAPI_discovery.m_notificationPort) {
+ {
+ io_iterator_t portIterator = 0;
+ io_object_t entry;
+ IOReturn result = IOServiceAddMatchingNotification(
+ SDL_HIDAPI_discovery.m_notificationPort,
+ kIOFirstMatchNotification,
+ IOServiceMatching(kIOHIDDeviceKey),
+ CallbackIOServiceFunc, NULL, &portIterator);
+
+ if (result == 0) {
+ /* Must drain the existing iterator, or we won't receive new notifications */
+ while ((entry = IOIteratorNext(portIterator)) != 0) {
+ IOObjectRelease(entry);
+ }
+ } else {
+ IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
+ SDL_HIDAPI_discovery.m_notificationPort = nil;
+ }
+ }
+ {
+ io_iterator_t portIterator = 0;
+ io_object_t entry;
+ IOReturn result = IOServiceAddMatchingNotification(
+ SDL_HIDAPI_discovery.m_notificationPort,
+ kIOTerminatedNotification,
+ IOServiceMatching(kIOHIDDeviceKey),
+ CallbackIOServiceFunc, NULL, &portIterator);
+
+ if (result == 0) {
+ /* Must drain the existing iterator, or we won't receive new notifications */
+ while ((entry = IOIteratorNext(portIterator)) != 0) {
+ IOObjectRelease(entry);
+ }
+ } else {
+ IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
+ SDL_HIDAPI_discovery.m_notificationPort = nil;
+ }
+ }
+ }
+
+ SDL_HIDAPI_discovery.m_notificationMach = MACH_PORT_NULL;
+ if (SDL_HIDAPI_discovery.m_notificationPort) {
+ SDL_HIDAPI_discovery.m_notificationMach = IONotificationPortGetMachPort(SDL_HIDAPI_discovery.m_notificationPort);
+ }
+
+ SDL_HIDAPI_discovery.m_bCanGetNotifications = (SDL_HIDAPI_discovery.m_notificationMach != MACH_PORT_NULL);
+
+#endif // __MACOSX__
+
+#if defined(SDL_USE_LIBUDEV)
+ if (linux_enumeration_method == ENUMERATION_LIBUDEV) {
+ SDL_HIDAPI_discovery.m_pUdev = NULL;
+ SDL_HIDAPI_discovery.m_pUdevMonitor = NULL;
+ SDL_HIDAPI_discovery.m_nUdevFd = -1;
+
+ usyms = SDL_UDEV_GetUdevSyms();
+ if (usyms) {
+ SDL_HIDAPI_discovery.m_pUdev = usyms->udev_new();
+ }
+ if (SDL_HIDAPI_discovery.m_pUdev) {
+ SDL_HIDAPI_discovery.m_pUdevMonitor = usyms->udev_monitor_new_from_netlink(SDL_HIDAPI_discovery.m_pUdev, "udev");
+ if (SDL_HIDAPI_discovery.m_pUdevMonitor) {
+ usyms->udev_monitor_enable_receiving(SDL_HIDAPI_discovery.m_pUdevMonitor);
+ SDL_HIDAPI_discovery.m_nUdevFd = usyms->udev_monitor_get_fd(SDL_HIDAPI_discovery.m_pUdevMonitor);
+ SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_TRUE;
+ }
+ }
+ }
+ else
+#endif /* SDL_USE_LIBUDEV */
+ {
+#if defined(HAVE_INOTIFY)
+ inotify_fd = SDL_inotify_init1();
+
+ if (inotify_fd < 0) {
+ SDL_LogWarn(SDL_LOG_CATEGORY_INPUT,
+ "Unable to initialize inotify, falling back to polling: %s",
+ strerror(errno));
+ return;
+ }
+
+ /* We need to watch for attribute changes in addition to
+ * creation, because when a device is first created, it has
+ * permissions that we can't read. When udev chmods it to
+ * something that we maybe *can* read, we'll get an
+ * IN_ATTRIB event to tell us. */
+ if (inotify_add_watch(inotify_fd, "/dev",
+ IN_CREATE | IN_DELETE | IN_MOVE | IN_ATTRIB) < 0) {
+ close(inotify_fd);
+ inotify_fd = -1;
+ SDL_LogWarn(SDL_LOG_CATEGORY_INPUT,
+ "Unable to add inotify watch, falling back to polling: %s",
+ strerror (errno));
+ return;
+ }
+
+ SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_TRUE;
+#endif /* HAVE_INOTIFY */
+ }
+}
+
+static void
+HIDAPI_UpdateDiscovery()
+{
+ if (!SDL_HIDAPI_discovery.m_bInitialized) {
+ HIDAPI_InitializeDiscovery();
+ }
+
+ if (!SDL_HIDAPI_discovery.m_bCanGetNotifications) {
+ const Uint32 SDL_HIDAPI_DETECT_INTERVAL_MS = 3000; /* Update every 3 seconds */
+ Uint32 now = SDL_GetTicks();
+ if (!SDL_HIDAPI_discovery.m_unLastDetect || SDL_TICKS_PASSED(now, SDL_HIDAPI_discovery.m_unLastDetect + SDL_HIDAPI_DETECT_INTERVAL_MS)) {
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ SDL_HIDAPI_discovery.m_unLastDetect = now;
+ }
+ return;
+ }
+
+#if defined(__WIN32__)
+#if 0 /* just let the usual SDL_PumpEvents loop dispatch these, fixing bug 4286. --ryan. */
+ /* We'll only get messages on the same thread that created the window */
+ if (SDL_ThreadID() == SDL_HIDAPI_discovery.m_nThreadID) {
+ MSG msg;
+ while (PeekMessage(&msg, SDL_HIDAPI_discovery.m_hwndMsg, 0, 0, PM_NOREMOVE)) {
+ if (GetMessageA(&msg, SDL_HIDAPI_discovery.m_hwndMsg, 0, 0) != 0) {
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ }
+ }
+ }
+#endif
+#endif /* __WIN32__ */
+
+#if defined(__MACOSX__)
+ if (SDL_HIDAPI_discovery.m_notificationPort) {
+ struct { mach_msg_header_t hdr; char payload[ 4096 ]; } msg;
+ while (mach_msg(&msg.hdr, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0, sizeof(msg), SDL_HIDAPI_discovery.m_notificationMach, 0, MACH_PORT_NULL) == KERN_SUCCESS) {
+ IODispatchCalloutFromMessage(NULL, &msg.hdr, SDL_HIDAPI_discovery.m_notificationPort);
+ }
+ }
+#endif
+
+#if defined(SDL_USE_LIBUDEV)
+ if (linux_enumeration_method == ENUMERATION_LIBUDEV) {
+ if (SDL_HIDAPI_discovery.m_nUdevFd >= 0) {
+ /* Drain all notification events.
+ * We don't expect a lot of device notifications so just
+ * do a new discovery on any kind or number of notifications.
+ * This could be made more restrictive if necessary.
+ */
+ for (;;) {
+ struct pollfd PollUdev;
+ struct udev_device *pUdevDevice;
+
+ PollUdev.fd = SDL_HIDAPI_discovery.m_nUdevFd;
+ PollUdev.events = POLLIN;
+ if (poll(&PollUdev, 1, 0) != 1) {
+ break;
+ }
+
+ pUdevDevice = usyms->udev_monitor_receive_device(SDL_HIDAPI_discovery.m_pUdevMonitor);
+ if (pUdevDevice) {
+ const char *action = NULL;
+ action = usyms->udev_device_get_action(pUdevDevice);
+ if (!action || SDL_strcmp(action, "add") == 0 || SDL_strcmp(action, "remove") == 0) {
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ }
+ usyms->udev_device_unref(pUdevDevice);
+ }
+ }
+ }
+ }
+ else
+#endif /* SDL_USE_LIBUDEV */
+ {
+#if defined(HAVE_INOTIFY)
+ if (inotify_fd >= 0) {
+ union
+ {
+ struct inotify_event event;
+ char storage[4096];
+ char enough_for_inotify[sizeof (struct inotify_event) + NAME_MAX + 1];
+ } buf;
+ ssize_t bytes;
+ size_t remain = 0;
+ size_t len;
+
+ bytes = read(inotify_fd, &buf, sizeof (buf));
+
+ if (bytes > 0) {
+ remain = (size_t) bytes;
+ }
+
+ while (remain > 0) {
+ if (buf.event.len > 0) {
+ if (StrHasPrefix(buf.event.name, "hidraw") &&
+ StrIsInteger(buf.event.name + SDL_strlen ("hidraw"))) {
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ /* We found an hidraw change. We still continue to
+ * drain the inotify fd to avoid leaving old
+ * notifications in the queue. */
+ }
+ }
+
+ len = sizeof (struct inotify_event) + buf.event.len;
+ remain -= len;
+
+ if (remain != 0) {
+ SDL_memmove(&buf.storage[0], &buf.storage[len], remain);
+ }
+ }
+ }
+#endif /* HAVE_INOTIFY */
+ }
+}
+
+static void
+HIDAPI_ShutdownDiscovery()
+{
+ if (!SDL_HIDAPI_discovery.m_bInitialized) {
+ return;
+ }
+
+#if defined(__WIN32__)
+ if (SDL_HIDAPI_discovery.m_hNotify)
+ UnregisterDeviceNotification(SDL_HIDAPI_discovery.m_hNotify);
+
+ if (SDL_HIDAPI_discovery.m_hwndMsg) {
+ DestroyWindow(SDL_HIDAPI_discovery.m_hwndMsg);
+ }
+
+ UnregisterClassA(SDL_HIDAPI_discovery.m_wndClass.lpszClassName, SDL_HIDAPI_discovery.m_wndClass.hInstance);
+#endif
+
+#if defined(__MACOSX__)
+ if (SDL_HIDAPI_discovery.m_notificationPort) {
+ IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
+ }
+#endif
+
+#if defined(SDL_USE_LIBUDEV)
+ if (linux_enumeration_method == ENUMERATION_LIBUDEV &&
+ usyms) {
+ if (SDL_HIDAPI_discovery.m_pUdevMonitor) {
+ usyms->udev_monitor_unref(SDL_HIDAPI_discovery.m_pUdevMonitor);
+ }
+ if (SDL_HIDAPI_discovery.m_pUdev) {
+ usyms->udev_unref(SDL_HIDAPI_discovery.m_pUdev);
+ }
+ SDL_UDEV_ReleaseUdevSyms();
+ usyms = NULL;
+ }
+#endif
+
+ SDL_HIDAPI_discovery.m_bInitialized = SDL_FALSE;
+}
+
/* Platform HIDAPI Implementation */
#define hid_device PLATFORM_hid_device
@@ -506,7 +979,7 @@ CopyHIDDeviceInfo(struct SDL_hid_device_info *pSrc, struct SDL_hid_device_info *
#endif /* !SDL_HIDAPI_DISABLED */
-static SDL_bool SDL_hidapi_wasinit = SDL_FALSE;
+static int SDL_hidapi_refcount = 0;
static void SDL_SetHIDAPIError( const wchar_t *error )
{
@@ -523,7 +996,8 @@ int SDL_hid_init(void)
{
int attempts = 0, success = 0;
- if (SDL_hidapi_wasinit == SDL_TRUE) {
+ if (SDL_hidapi_refcount > 0) {
+ ++SDL_hidapi_refcount;
return 0;
}
@@ -589,7 +1063,7 @@ int SDL_hid_init(void)
return -1;
}
- SDL_hidapi_wasinit = SDL_TRUE;
+ ++SDL_hidapi_refcount;
return 0;
}
@@ -597,10 +1071,18 @@ int SDL_hid_exit(void)
{
int result = 0;
- if (SDL_hidapi_wasinit == SDL_FALSE) {
+ if (SDL_hidapi_refcount == 0) {
return 0;
}
- SDL_hidapi_wasinit = SDL_FALSE;
+ if (SDL_hidapi_refcount > 0) {
+ --SDL_hidapi_refcount;
+ return 0;
+ }
+ SDL_hidapi_refcount = 0;
+
+#if !SDL_HIDAPI_DISABLED
+ HIDAPI_ShutdownDiscovery();
+#endif
#if HAVE_PLATFORM_BACKEND
if (udev_ctx) {
@@ -619,6 +1101,28 @@ int SDL_hid_exit(void)
return result;
}
+Uint32 SDL_hid_device_change_count(void)
+{
+ Uint32 counter = 0;
+
+#if !SDL_HIDAPI_DISABLED
+ if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
+ return 0;
+ }
+
+ HIDAPI_UpdateDiscovery();
+
+ if (SDL_HIDAPI_discovery.m_unDeviceChangeCounter == 0) {
+ /* Counter wrapped! */
+ ++SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+ }
+ counter = SDL_HIDAPI_discovery.m_unDeviceChangeCounter;
+
+#endif /* !SDL_HIDAPI_DISABLED */
+
+ return counter;
+}
+
struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id)
{
#if HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || defined(SDL_LIBUSB_DYNAMIC)
@@ -636,7 +1140,7 @@ struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned
#endif
struct SDL_hid_device_info *devs = NULL, *last = NULL, *new_dev;
- if (SDL_hid_init() != 0) {
+ if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
return NULL;
}
@@ -777,7 +1281,7 @@ SDL_hid_device *SDL_hid_open(unsigned short vendor_id, unsigned short product_id
#if HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || defined(SDL_LIBUSB_DYNAMIC)
void *pDevice = NULL;
- if (SDL_hid_init() != 0) {
+ if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
return NULL;
}
@@ -811,7 +1315,7 @@ SDL_hid_device *SDL_hid_open_path(const char *path, int bExclusive /* = false */
#if HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || defined(SDL_LIBUSB_DYNAMIC)
void *pDevice = NULL;
- if (SDL_hid_init() != 0) {
+ if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
return NULL;
}
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 455a2a4..0f4e46a 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -25,52 +25,17 @@
#include "SDL_atomic.h"
#include "SDL_endian.h"
#include "SDL_hints.h"
-#include "SDL_thread.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
-#include "SDL_log.h"
#include "../SDL_sysjoystick.h"
#include "SDL_hidapijoystick_c.h"
#include "SDL_hidapi_rumble.h"
#include "../../SDL_hints_c.h"
#if defined(__WIN32__)
-#include "../../core/windows/SDL_windows.h"
#include "../windows/SDL_rawinputjoystick_c.h"
#endif
-#if defined(__MACOSX__)
-#include <CoreFoundation/CoreFoundation.h>
-#include <mach/mach.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/hid/IOHIDDevice.h>
-#include <IOKit/usb/USBSpec.h>
-#endif
-
-#include "../../core/linux/SDL_udev.h"
-#ifdef SDL_USE_LIBUDEV
-#include <poll.h>
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_INOTIFY
-#include <unistd.h> /* just in case we didn't use that SDL_USE_LIBUDEV block... */
-#include <errno.h> /* errno, strerror */
-#include <fcntl.h>
-#include <limits.h> /* For the definition of NAME_MAX */
-#include <sys/inotify.h>
-#endif
-
-#if defined(SDL_USE_LIBUDEV)
-typedef enum
-{
- ENUMERATION_UNSET,
- ENUMERATION_LIBUDEV,
- ENUMERATION_FALLBACK
-} LinuxEnumerationMethod;
-
-static LinuxEnumerationMethod linux_enumeration_method = ENUMERATION_UNSET;
-#endif
struct joystick_hwdata
{
@@ -109,434 +74,12 @@ static SDL_HIDAPI_DeviceDriver *SDL_HIDAPI_drivers[] = {
};
static int SDL_HIDAPI_numdrivers = 0;
static SDL_SpinLock SDL_HIDAPI_spinlock;
+static Uint32 SDL_HIDAPI_change_count = 0;
static SDL_HIDAPI_Device *SDL_HIDAPI_devices;
static int SDL_HIDAPI_numjoysticks = 0;
static SDL_bool initialized = SDL_FALSE;
static SDL_bool shutting_down = SDL_FALSE;
-#if defined(HAVE_INOTIFY)
-static int inotify_fd = -1;
-#endif
-
-#if defined(SDL_USE_LIBUDEV)
-static const SDL_UDEV_Symbols * usyms = NULL;
-#endif
-
-static struct
-{
- SDL_bool m_bHaveDevicesChanged;
- SDL_bool m_bCanGetNotifications;
- Uint32 m_unLastDetect;
-
-#if defined(__WIN32__)
- SDL_threadID m_nThreadID;
- WNDCLASSEXA m_wndClass;
- HWND m_hwndMsg;
- HDEVNOTIFY m_hNotify;
- double m_flLastWin32MessageCheck;
-#endif
-
-#if defined(__MACOSX__)
- IONotificationPortRef m_notificationPort;
- mach_port_t m_notificationMach;
-#endif
-
-#if defined(SDL_USE_LIBUDEV)
- struct udev *m_pUdev;
- struct udev_monitor *m_pUdevMonitor;
- int m_nUdevFd;
-#endif
-} SDL_HIDAPI_discovery;
-
-
-#ifdef __WIN32__
-struct _DEV_BROADCAST_HDR
-{
- DWORD dbch_size;
- DWORD dbch_devicetype;
- DWORD dbch_reserved;
-};
-
-typedef struct _DEV_BROADCAST_DEVICEINTERFACE_A
-{
- DWORD dbcc_size;
- DWORD dbcc_devicetype;
- DWORD dbcc_reserved;
- GUID dbcc_classguid;
- char dbcc_name[ 1 ];
-} DEV_BROADCAST_DEVICEINTERFACE_A, *PDEV_BROADCAST_DEVICEINTERFACE_A;
-
-typedef struct _DEV_BROADCAST_HDR DEV_BROADCAST_HDR;
-#define DBT_DEVICEARRIVAL 0x8000 /* system detected a new device */
-#define DBT_DEVICEREMOVECOMPLETE 0x8004 /* device was removed from the system */
-#define DBT_DEVTYP_DEVICEINTERFACE 0x00000005 /* device interface class */
-#define DBT_DEVNODES_CHANGED 0x0007
-#define DBT_CONFIGCHANGED 0x0018
-#define DBT_DEVICETYPESPECIFIC 0x8005 /* type specific event */
-#define DBT_DEVINSTSTARTED 0x8008 /* device installed and started */
-
-#include <initguid.h>
-DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED);
-
-static LRESULT CALLBACK ControllerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- switch (message) {
- case WM_DEVICECHANGE:
- switch (wParam) {
- case DBT_DEVICEARRIVAL:
- case DBT_DEVICEREMOVECOMPLETE:
- if (((DEV_BROADCAST_HDR*)lParam)->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE) {
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_TRUE;
- }
- break;
- }
- return TRUE;
- }
-
- return DefWindowProc(hwnd, message, wParam, lParam);
-}
-#endif /* __WIN32__ */
-
-
-#if defined(__MACOSX__)
-static void CallbackIOServiceFunc(void *context, io_iterator_t portIterator)
-{
- /* Must drain the iterator, or we won't receive new notifications */
- io_object_t entry;
- while ((entry = IOIteratorNext(portIterator)) != 0) {
- IOObjectRelease(entry);
- *(SDL_bool*)context = SDL_TRUE;
- }
-}
-#endif /* __MACOSX__ */
-
-#ifdef HAVE_INOTIFY
-#ifdef HAVE_INOTIFY_INIT1
-static int SDL_inotify_init1(void) {
- return inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
-}
-#else
-static int SDL_inotify_init1(void) {
- int fd = inotify_init();
- if (fd < 0) return -1;
- fcntl(fd, F_SETFL, O_NONBLOCK);
- fcntl(fd, F_SETFD, FD_CLOEXEC);
- return fd;
-}
-#endif
-
-static int
-StrHasPrefix(const char *string, const char *prefix)
-{
- return (SDL_strncmp(string, prefix, SDL_strlen(prefix)) == 0);
-}
-
-static int
-StrIsInteger(const char *string)
-{
- const char *p;
-
- if (*string == '\0') {
- return 0;
- }
-
- for (p = string; *p != '\0'; p++) {
- if (*p < '0' || *p > '9') {
- return 0;
- }
- }
-
- return 1;
-}
-#endif
-
-static void
-HIDAPI_InitializeDiscovery()
-{
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_TRUE;
- SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_FALSE;
- SDL_HIDAPI_discovery.m_unLastDetect = 0;
-
-#if defined(__WIN32__)
- SDL_HIDAPI_discovery.m_nThreadID = SDL_ThreadID();
-
- SDL_zero(SDL_HIDAPI_discovery.m_wndClass);
- SDL_HIDAPI_discovery.m_wndClass.hInstance = GetModuleHandle(NULL);
- SDL_HIDAPI_discovery.m_wndClass.lpszClassName = "SDL_HIDAPI_DEVICE_DETECTION";
- SDL_HIDAPI_discovery.m_wndClass.lpfnWndProc = ControllerWndProc; /* This function is called by windows */
- SDL_HIDAPI_discovery.m_wndClass.cbSize = sizeof(WNDCLASSEX);
-
- RegisterClassExA(&SDL_HIDAPI_discovery.m_wndClass);
- SDL_HIDAPI_discovery.m_hwndMsg = CreateWindowExA(0, "SDL_HIDAPI_DEVICE_DETECTION", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
-
- {
- DEV_BROADCAST_DEVICEINTERFACE_A devBroadcast;
-
- SDL_zero(devBroadcast);
- devBroadcast.dbcc_size = sizeof( devBroadcast );
- devBroadcast.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
- devBroadcast.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
-
- /* DEVICE_NOTIFY_ALL_INTERFACE_CLASSES is important, makes GUID_DEVINTERFACE_USB_DEVICE ignored,
- * but that seems to be necessary to get a notice after each individual usb input device actually
- * installs, rather than just as the composite device is seen.
- */
- SDL_HIDAPI_discovery.m_hNotify = RegisterDeviceNotification( SDL_HIDAPI_discovery.m_hwndMsg, &devBroadcast, DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES );
- SDL_HIDAPI_discovery.m_bCanGetNotifications = ( SDL_HIDAPI_discovery.m_hNotify != 0 );
- }
-#endif /* __WIN32__ */
-
-#if defined(__MACOSX__)
- SDL_HIDAPI_discovery.m_notificationPort = IONotificationPortCreate(kIOMasterPortDefault);
- if (SDL_HIDAPI_discovery.m_notificationPort) {
- {
- io_iterator_t portIterator = 0;
- io_object_t entry;
- IOReturn result = IOServiceAddMatchingNotification(
- SDL_HIDAPI_discovery.m_notificationPort,
- kIOFirstMatchNotification,
- IOServiceMatching(kIOHIDDeviceKey),
- CallbackIOServiceFunc, &SDL_HIDAPI_discovery.m_bHaveDevicesChanged, &portIterator);
-
- if (result == 0) {
- /* Must drain the existing iterator, or we won't receive new notifications */
- while ((entry = IOIteratorNext(portIterator)) != 0) {
- IOObjectRelease(entry);
- }
- } else {
- IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
- SDL_HIDAPI_discovery.m_notificationPort = nil;
- }
- }
- {
- io_iterator_t portIterator = 0;
- io_object_t entry;
- IOReturn result = IOServiceAddMatchingNotification(
- SDL_HIDAPI_discovery.m_notificationPort,
- kIOTerminatedNotification,
- IOServiceMatching(kIOHIDDeviceKey),
- CallbackIOServiceFunc, &SDL_HIDAPI_discovery.m_bHaveDevicesChanged, &portIterator);
-
- if (result == 0) {
- /* Must drain the existing iterator, or we won't receive new notifications */
- while ((entry = IOIteratorNext(portIterator)) != 0) {
- IOObjectRelease(entry);
- }
- } else {
- IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
- SDL_HIDAPI_discovery.m_notificationPort = nil;
- }
- }
- }
-
- SDL_HIDAPI_discovery.m_notificationMach = MACH_PORT_NULL;
- if (SDL_HIDAPI_discovery.m_notificationPort) {
- SDL_HIDAPI_discovery.m_notificationMach = IONotificationPortGetMachPort(SDL_HIDAPI_discovery.m_notificationPort);
- }
-
- SDL_HIDAPI_discovery.m_bCanGetNotifications = (SDL_HIDAPI_discovery.m_notificationMach != MACH_PORT_NULL);
-
-#endif // __MACOSX__
-
-#if defined(SDL_USE_LIBUDEV)
- if (linux_enumeration_method == ENUMERATION_LIBUDEV) {
- SDL_HIDAPI_discovery.m_pUdev = NULL;
- SDL_HIDAPI_discovery.m_pUdevMonitor = NULL;
- SDL_HIDAPI_discovery.m_nUdevFd = -1;
-
- usyms = SDL_UDEV_GetUdevSyms();
- if (usyms) {
- SDL_HIDAPI_discovery.m_pUdev = usyms->udev_new();
- }
- if (SDL_HIDAPI_discovery.m_pUdev) {
- SDL_HIDAPI_discovery.m_pUdevMonitor = usyms->udev_monitor_new_from_netlink(SDL_HIDAPI_discovery.m_pUdev, "udev");
- if (SDL_HIDAPI_discovery.m_pUdevMonitor) {
- usyms->udev_monitor_enable_receiving(SDL_HIDAPI_discovery.m_pUdevMonitor);
- SDL_HIDAPI_discovery.m_nUdevFd = usyms->udev_monitor_get_fd(SDL_HIDAPI_discovery.m_pUdevMonitor);
- SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_TRUE;
- }
- }
- }
- else
-#endif /* SDL_USE_LIBUDEV */
- {
-#if defined(HAVE_INOTIFY)
- inotify_fd = SDL_inotify_init1();
-
- if (inotify_fd < 0) {
- SDL_LogWarn(SDL_LOG_CATEGORY_INPUT,
- "Unable to initialize inotify, falling back to polling: %s",
- strerror(errno));
- return;
- }
-
- /* We need to watch for attribute changes in addition to
- * creation, because when a device is first created, it has
- * permissions that we can't read. When udev chmods it to
- * something that we maybe *can* read, we'll get an
- * IN_ATTRIB event to tell us. */
- if (inotify_add_watch(inotify_fd, "/dev",
- IN_CREATE | IN_DELETE | IN_MOVE | IN_ATTRIB) < 0) {
- close(inotify_fd);
- inotify_fd = -1;
- SDL_LogWarn(SDL_LOG_CATEGORY_INPUT,
- "Unable to add inotify watch, falling back to polling: %s",
- strerror (errno));
- return;
- }
-
- SDL_HIDAPI_discovery.m_bCanGetNotifications = SDL_TRUE;
-#endif /* HAVE_INOTIFY */
- }
-}
-
-static void
-HIDAPI_UpdateDiscovery()
-{
- if (!SDL_HIDAPI_discovery.m_bCanGetNotifications) {
- const Uint32 SDL_HIDAPI_DETECT_INTERVAL_MS = 3000; /* Update every 3 seconds */
- Uint32 now = SDL_GetTicks();
- if (!SDL_HIDAPI_discovery.m_unLastDetect || SDL_TICKS_PASSED(now, SDL_HIDAPI_discovery.m_unLastDetect + SDL_HIDAPI_DETECT_INTERVAL_MS)) {
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_TRUE;
- SDL_HIDAPI_discovery.m_unLastDetect = now;
- }
- return;
- }
-
-#if defined(__WIN32__)
-#if 0 /* just let the usual SDL_PumpEvents loop dispatch these, fixing bug 4286. --ryan. */
- /* We'll only get messages on the same thread that created the window */
- if (SDL_ThreadID() == SDL_HIDAPI_discovery.m_nThreadID) {
- MSG msg;
- while (PeekMessage(&msg, SDL_HIDAPI_discovery.m_hwndMsg, 0, 0, PM_NOREMOVE)) {
- if (GetMessageA(&msg, SDL_HIDAPI_discovery.m_hwndMsg, 0, 0) != 0) {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
- }
- }
-#endif
-#endif /* __WIN32__ */
-
-#if defined(__MACOSX__)
- if (SDL_HIDAPI_discovery.m_notificationPort) {
- struct { mach_msg_header_t hdr; char payload[ 4096 ]; } msg;
- while (mach_msg(&msg.hdr, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0, sizeof(msg), SDL_HIDAPI_discovery.m_notificationMach, 0, MACH_PORT_NULL) == KERN_SUCCESS) {
- IODispatchCalloutFromMessage(NULL, &msg.hdr, SDL_HIDAPI_discovery.m_notificationPort);
- }
- }
-#endif
-
-#if defined(SDL_USE_LIBUDEV)
- if (linux_enumeration_method == ENUMERATION_LIBUDEV) {
- if (SDL_HIDAPI_discovery.m_nUdevFd >= 0) {
- /* Drain all notification events.
- * We don't expect a lot of device notifications so just
- * do a new discovery on any kind or number of notifications.
- * This could be made more restrictive if necessary.
- */
- for (;;) {
- struct pollfd PollUdev;
- struct udev_device *pUdevDevice;
-
- PollUdev.fd = SDL_HIDAPI_discovery.m_nUdevFd;
- PollUdev.events = POLLIN;
- if (poll(&PollUdev, 1, 0) != 1) {
- break;
- }
-
- pUdevDevice = usyms->udev_monitor_receive_device(SDL_HIDAPI_discovery.m_pUdevMonitor);
- if (pUdevDevice) {
- const char *action = NULL;
- action = usyms->udev_device_get_action(pUdevDevice);
- if (!action || SDL_strcmp(action, "add") == 0 || SDL_strcmp(action, "remove") == 0) {
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_TRUE;
- }
- usyms->udev_device_unref(pUdevDevice);
- }
- }
- }
- }
- else
-#endif /* SDL_USE_LIBUDEV */
- {
-#if defined(HAVE_INOTIFY)
- if (inotify_fd >= 0) {
- union
- {
- struct inotify_event event;
- char storage[4096];
- char enough_for_inotify[sizeof (struct inotify_event) + NAME_MAX + 1];
- } buf;
- ssize_t bytes;
- size_t remain = 0;
- size_t len;
-
- bytes = read(inotify_fd, &buf, sizeof (buf));
-
- if (bytes > 0) {
- remain = (size_t) bytes;
- }
-
- while (remain > 0) {
- if (buf.event.len > 0 &&
- !SDL_HIDAPI_discovery.m_bHaveDevicesChanged) {
- if (StrHasPrefix(buf.event.name, "hidraw") &&
- StrIsInteger(buf.event.name + SDL_strlen ("hidraw"))) {
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_TRUE;
- /* We found an hidraw change. We still continue to
- * drain the inotify fd to avoid leaving old
- * notifications in the queue. */
- }
- }
-
- len = sizeof (struct inotify_event) + buf.event.len;
- remain -= len;
-
- if (remain != 0) {
- SDL_memmove(&buf.storage[0], &buf.storage[len], remain);
- }
- }
- }
-#endif /* HAVE_INOTIFY */
- }
-}
-
-static void
-HIDAPI_ShutdownDiscovery()
-{
-#if defined(__WIN32__)
- if (SDL_HIDAPI_discovery.m_hNotify)
- UnregisterDeviceNotification(SDL_HIDAPI_discovery.m_hNotify);
-
- if (SDL_HIDAPI_discovery.m_hwndMsg) {
- DestroyWindow(SDL_HIDAPI_discovery.m_hwndMsg);
- }
-
- UnregisterClassA(SDL_HIDAPI_discovery.m_wndClass.lpszClassName, SDL_HIDAPI_discovery.m_wndClass.hInstance);
-#endif
-
-#if defined(__MACOSX__)
- if (SDL_HIDAPI_discovery.m_notificationPort) {
- IONotificationPortDestroy(SDL_HIDAPI_discovery.m_notificationPort);
- }
-#endif
-
-#if defined(SDL_USE_LIBUDEV)
- if (linux_enumeration_method == ENUMERATION_LIBUDEV &&
- usyms) {
- if (SDL_HIDAPI_discovery.m_pUdevMonitor) {
- usyms->udev_monitor_unref(SDL_HIDAPI_discovery.m_pUdevMonitor);
- }
- if (SDL_HIDAPI_discovery.m_pUdev) {
- usyms->udev_unref(SDL_HIDAPI_discovery.m_pUdev);
- }
- SDL_UDEV_ReleaseUdevSyms();
- usyms = NULL;
- }
-#endif
-}
-
void
HIDAPI_DumpPacket(const char *prefix, Uint8 *data, int size)
{
@@ -778,7 +321,6 @@ HIDAPI_JoystickInit(void)
}
SDL_AddHintCallback(SDL_HINT_JOYSTICK_HIDAPI,
SDL_HIDAPIDriverHintChanged, NULL);
- HIDAPI_InitializeDiscovery();
HIDAPI_JoystickDetect();
HIDAPI_UpdateDevices();
@@ -1192,11 +734,10 @@ static void
HIDAPI_JoystickDetect(void)
{
if (SDL_AtomicTryLock(&SDL_HIDAPI_spinlock)) {
- HIDAPI_UpdateDiscovery();
- if (SDL_HIDAPI_discovery.m_bHaveDevicesChanged) {
- /* FIXME: We probably need to schedule an update in a few seconds as well */
+ Uint32 count = SDL_hid_device_change_count();
+ if (SDL_HIDAPI_change_count != count) {
HIDAPI_UpdateDeviceList();
- SDL_HIDAPI_discovery.m_bHaveDevicesChanged = SDL_FALSE;
+ SDL_HIDAPI_change_count = count;
}
SDL_AtomicUnlock(&SDL_HIDAPI_spinlock);
}
@@ -1460,8 +1001,6 @@ HIDAPI_JoystickQuit(void)
shutting_down = SDL_TRUE;
- HIDAPI_ShutdownDiscovery();
-
SDL_HIDAPI_QuitRumble();
#if defined(HAVE_INOTIFY)