Diffstat (limited to 'libopie2/opiecore/oinputsystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/oinputsystem.cpp | 38 |
1 files changed, 31 insertions, 7 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 @@ -31,4 +31,5 @@ using namespace Opie::Core; /* QT */ +#include <qdir.h> #include <qfile.h> @@ -38,4 +39,5 @@ using namespace Opie::Core; #include <sys/fcntl.h> #include <sys/ioctl.h> +#include <unistd.h> #define BUFSIZE 256 @@ -62,9 +64,20 @@ 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" ); } @@ -107,5 +120,5 @@ OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( paren { qDebug( "OInputDevice::OInputDevice( '%s' )", name ); - + _fd = ::open( name, O_RDONLY ); if ( _fd == -1 ) @@ -149,5 +162,5 @@ bool OInputDevice::hasFeature( Feature bit ) const { BIT_MASK( features, EV_MAX ); - + if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) { @@ -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; +} + |