| -rw-r--r-- | libopie2/opiecore/oinputsystem.cpp | 38 | ||||
| -rw-r--r-- | libopie2/opiecore/oinputsystem.h | 19 |
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 @@ -30,6 +30,7 @@ using namespace Opie::Core; /* QT */ +#include <qdir.h> #include <qfile.h> /* STD */ @@ -37,6 +38,7 @@ using namespace Opie::Core; #include <string.h> #include <sys/fcntl.h> #include <sys/ioctl.h> +#include <unistd.h> #define BUFSIZE 256 #define BIT_MASK( name, numbits ) \ @@ -61,11 +63,22 @@ 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" ); } @@ -106,7 +119,7 @@ OInputSystem::DeviceIterator OInputSystem::iterator() const OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name ) { qDebug( "OInputDevice::OInputDevice( '%s' )", name ); - + _fd = ::open( name, O_RDONLY ); if ( _fd == -1 ) { @@ -148,7 +161,7 @@ QString OInputDevice::uniq() const bool OInputDevice::hasFeature( Feature bit ) const { BIT_MASK( features, EV_MAX ); - + if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) { perror( "EVIOCGBIT" ); @@ -191,7 +204,18 @@ QString OInputDevice::globalKeyMask() const 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 @@ -77,25 +77,25 @@ class OInputSystem : public QObject 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 @@ -123,7 +123,12 @@ class OInputDevice : public QObject * @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; |