| -rw-r--r-- | libopie2/opiecore/oinputsystem.cpp | 32 | ||||
| -rw-r--r-- | libopie2/opiecore/oinputsystem.h | 5 |
2 files changed, 33 insertions, 4 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 @@ -27,19 +27,21 @@ */ #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 ) \ @@ -58,17 +60,28 @@ OInputSystem::OInputSystem() : QObject() } 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()" ); @@ -192,6 +205,17 @@ QString OInputDevice::globalKeyMask() const } 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 @@ -120,12 +120,17 @@ class OInputDevice : public QObject 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; }; |