use a sane method to discover valid device nodes

2 files changed, 43 insertions, 14 deletions

diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index d1a28f5..a2306ca 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -17,68 +17,81 @@
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "oinputsystem.h"
 using namespace Opie::Core;
 
 /* QT */
+#include <qdir.h>
 #include <qfile.h>
 
 /* STD */
 #include <errno.h>
 #include <string.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #define     BUFSIZE 256
 #define     BIT_MASK( name, numbits )                                        \
     unsigned short  name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ];    \
     memset( name, 0, sizeof( name ) )
 #define     BIT_TEST( bitmask, bit )    \
     ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) )
 
 /*======================================================================================
  * OInputSystem
  *======================================================================================*/
 
 OInputSystem* OInputSystem::_instance = 0;
 
 OInputSystem::OInputSystem() : QObject()
 {
     qDebug( "OInputSystem::OInputSystem()" );
     synchronize();
 }
 
 
 void OInputSystem::synchronize()
 {
     qDebug( "OInputSystem::synchronize()" );
-    if ( QFile::exists( "/dev/input/event0" ) ) _devices.insert( "0", new OInputDevice( this, "/dev/input/event0" ) );
-    if ( QFile::exists( "/dev/input/event1" ) ) _devices.insert( "1", new OInputDevice( this, "/dev/input/event1" ) );
-    if ( QFile::exists( "/dev/input/event2" ) ) _devices.insert( "2", new OInputDevice( this, "/dev/input/event2" ) );
-    if ( QFile::exists( "/dev/input/event3" ) ) _devices.insert( "3", new OInputDevice( this, "/dev/input/event3" ) );
+    QDir devInput( "/dev/input/" );
+    if ( devInput.exists() )
+    {
+        QStringList devInputFiles = devInput.entryList( QDir::System, QDir::Name );
+        for ( QStringList::Iterator it = devInputFiles.begin(); it != devInputFiles.end(); ++it )
+        {
+            QString absPath = devInput.absFilePath( *it );
+            bool isValid = OInputDevice::isValid( absPath );
+            qDebug( "OInputSystem::synchronize() - checking if '%s' is a valid input system node... '%s'",
+            (const char*) absPath, isValid ? "yes" : "no" );
+            if ( isValid ) _devices.insert( *it, new OInputDevice( this, absPath ) );
+        }
+    }
     qDebug( "OInputSystem::synchronize() done" );
+    if ( !_devices.count() )
+    qWarning( "OInputSystem::no devices found" );
 }
 
 
 OInputSystem::~OInputSystem()
 {
     qDebug( "OInputSystem::~OInputSystem()" );
 }
 
 
 int OInputSystem::count() const
 {
     return _devices.count();
 }
 
 
 OInputDevice* OInputSystem::device( const QString& device ) const
@@ -93,33 +106,33 @@ OInputSystem* OInputSystem::instance()
     return _instance;
 }
 
 
 OInputSystem::DeviceIterator OInputSystem::iterator() const
 {
     return OInputSystem::DeviceIterator( _devices );
 }
 
 /*======================================================================================
  * OInputDevice
  *======================================================================================*/
 
 OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name )
 {
     qDebug( "OInputDevice::OInputDevice( '%s' )", name );
-    
+
     _fd = ::open( name, O_RDONLY );
     if ( _fd == -1 )
     {
         qDebug( "OInputDevice::OInputDevice() - Warning: couldn't open %s (%s)", name, strerror( errno ) );
     }
 }
 
 
 OInputDevice::~OInputDevice()
 {
     qDebug( "OInputDevice::~OInputDevice()" );
 }
 
 
 QString OInputDevice::identity() const
 {
@@ -135,33 +148,33 @@ QString OInputDevice::path() const
     ::ioctl( _fd, EVIOCGPHYS(sizeof buf), buf );
     return buf;
 }
 
 
 QString OInputDevice::uniq() const
 {
     char buf[BUFSIZE] = "<unknown>";
     ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf );
     return buf;
 }
 
 
 bool OInputDevice::hasFeature( Feature bit ) const
 {
     BIT_MASK( features, EV_MAX );
-            
+
     if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
     {
         perror( "EVIOCGBIT" );
         return false;
     }
     else
         return BIT_TEST( features, bit );
 }
 
 
 bool OInputDevice::isHeld( Key bit ) const
 {
     BIT_MASK( keys, KEY_MAX );
 
     if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
     {
@@ -178,20 +191,31 @@ bool OInputDevice::isHeld( Key bit ) const
 QString OInputDevice::globalKeyMask() const
 {
     BIT_MASK( keys, KEY_MAX );
 
     if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
     {
         perror( "EVIOCGKEY" );
     }
     else
     {
         QString keymask;
         for ( int i = 0; i < KEY_MAX; ++i )
         {
             if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) );
         }
         return keymask;
-        
+
     }
 }
 
+
+bool OInputDevice::isValid( const QString& path )
+{
+    char buf[BUFSIZE] = "<unknown>";
+    int fd = ::open( (const char*) path, O_RDONLY );
+    if ( fd < 0 ) return false;
+    int res = ::ioctl( fd, EVIOCGNAME(sizeof buf), buf );
+    ::close( fd );
+    return res >= 0;
+}
+
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 7919610..6f822a1 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -64,74 +64,79 @@ class OInputSystem : public QObject
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     DeviceIterator iterator() const;
     /**
      * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
      * @see OAudioInterface
      */
     OInputDevice* device( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      */
     void synchronize();
     /**
      * @internal destructor
-     */    
+     */
      ~OInputSystem();
- 
+
  protected:
     OInputSystem();
-    
+
     static OInputSystem* _instance;
     DeviceMap _devices;
 };
 
 
 class OInputDevice : public QObject
-{    
+{
   public:
     OInputDevice( QObject* parent, const char* name = 0 );
     ~OInputDevice();
 
-    #include "oinputsystemenums.h"    
-    
+    #include "oinputsystemenums.h"
+
   public:
     /**
      * @returns the identity string of this input device
      */
     QString identity() const;
     /**
      * @returns the path of this input device
      */
     QString path() const;
     /**
      * @returns a unique identifier for this input device
      * @note Only a few devices support this
      */
     QString uniq() const;
     /**
      * @returns whether a certain @a Feature is being supported by this device
      */
     bool hasFeature( Feature ) const;
     /**
      * @returns whether a given @a Key or Button is being held at the moment
      */
     bool isHeld( Key ) const;
     /**
      * @internal
      * @returns a string containing a printable form of the global keymask
      */
     QString globalKeyMask() const;
-    
+    /**
+     * @internal
+     * @returns whether a certain @a path corresponds to an input device
+     */
+    static bool isValid( const QString& path );
+
   private:
     int _fd;
     input_id _id;
 
 };
 
 }
 }
 
 #endif // OINPUTSYSTEM_H