SF.net SVN: alleg:[15813] allegro/branches/5.0/src/linux/ljoynu.c

[<tj...@us...>]

Revision: 15813
          http://alleg.svn.sourceforge.net/alleg/?rev=15813&view=rev
Author:   tjaden
Date:     2012-06-24 06:10:34 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
monitor /dev/input instead of /dev on linux for hotplugging joysticks

cherry-pick https://alleg.svn.sourceforge.net/svnroot/alleg/allegro/branches/5.1@15684

From: Jon Rafkind <ka...@ex...>

Modified Paths:
--------------
    allegro/branches/5.0/src/linux/ljoynu.c

Modified: allegro/branches/5.0/src/linux/ljoynu.c
===================================================================
--- allegro/branches/5.0/src/linux/ljoynu.c	2012-06-24 06:10:06 UTC (rev 15812)
+++ allegro/branches/5.0/src/linux/ljoynu.c	2012-06-24 06:10:34 UTC (rev 15813)
@@ -469,7 +469,10 @@
    struct itimerspec spec;
    (void)data;
 
-   /* Empty the event buffer.  Right now we don't use the information. */
+   /* Empty the event buffer. We only care that some inotify event was sent but it
+    * doesn't matter what it is since we are going to do a full scan anyway once
+    * the timer_fd fires.
+    */
    while (read(inotify_fd, buf, sizeof(buf)) > 0) {
    }
 
@@ -524,7 +527,7 @@
    timer_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK);
    if (inotify_fd != -1 && timer_fd != -1) {
       /* Modern Linux probably only needs to monitor /dev/input. */
-      inotify_add_watch(inotify_fd, "/dev", IN_CREATE|IN_DELETE);
+      inotify_add_watch(inotify_fd, "/dev/input", IN_CREATE|IN_DELETE);
       _al_unix_start_watching_fd(inotify_fd, ljoy_config_dev_changed, NULL);
       _al_unix_start_watching_fd(timer_fd, ljoy_config_rescan, NULL);
       ALLEGRO_INFO("Hotplugging enabled\n");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.