more input system stuff

3 files changed, 46 insertions, 24 deletions

diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
index 5450966..a9c0fd2 100644
--- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -50,3 +50,3 @@ int main( int argc, char** argv )
     {
-        odebug << "DEMO: OInputSystem contains Device '" <<  it.current()->name() << "'" << oendl;
+        odebug << "DEMO: OInputSystem contains OInputDevice '" <<  it.current()->name() << "'" << oendl;
         
@@ -54,2 +54,26 @@ int main( int argc, char** argv )
         
+        QString features;
+        features += QString( "\nSynchronous:     " );
+        if ( dev->hasFeature( OInputDevice::Synchronous ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nKeys or Buttons: " );
+        if ( dev->hasFeature( OInputDevice::Keys ) ) features += "[ x ]"; else features += "[   ]";   
+        features += QString( "\nRelative Axes:   " );
+        if ( dev->hasFeature( OInputDevice::Relative ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nAbsolute Axes:   " );
+        if ( dev->hasFeature( OInputDevice::Absolute ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nMiscellaneous:   " );
+        if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nLeds:            " );
+        if ( dev->hasFeature( OInputDevice::Leds ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nSound:           " );
+        if ( dev->hasFeature( OInputDevice::Sound ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nAutoRepeat       " );
+        if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nForceFeedback:   " );
+        if ( dev->hasFeature( OInputDevice::ForceFeedback ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nPowerManagement: " );
+        if ( dev->hasFeature( OInputDevice::PowerManagement ) ) features += "[ x ]"; else features += "[   ]";
+        features += QString( "\nFeedbackStatus:  " );
+        if ( dev->hasFeature( OInputDevice::ForceFeedbackStatus ) ) features += "[ x ]"; else features += "[   ]";
+        
         odebug << "========================================"
@@ -59,2 +83,3 @@ int main( int argc, char** argv )
             << "\nUniq: " << dev->uniq()
+            << features << "\n"
             << oendl;
@@ -140,21 +165,2 @@ int Open_cPad()
 
-            // Get device 'name'
-
-            char    name[256] = "Unknown";
-            if( ioctl( fd, EVIOCGNAME(sizeof name ), name) < 0 )
-            {
-                perror( "event device ioctl" );
-            }else
-            printf( "Device name '%s'\n", name );
-
-            if(ioctl(fd, EVIOCGPHYS(sizeof(name)), name) < 0) {
-                perror("event ioctl");
-            }else
-            printf("Device path '%s'\n", name );
-
-            if(ioctl(fd, EVIOCGUNIQ(sizeof(name)), name) < 0) {
-                perror("event ioctl");
-            }else
-            printf("Device identity '%s'\n", name );
-
             // Get feature types
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index bfdc31f..fde36c3 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -41,3 +41,8 @@ using namespace Opie::Core;
 
-#define BUFSIZE 256
+#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))) )
 
@@ -142 +147,11 @@ QString OInputDevice::uniq() const
 
+bool OInputDevice::hasFeature( Feature bit ) const
+{
+    BIT_MASK( features, EV_MAX );
+            
+    if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+        return false;
+    else
+        return BIT_TEST( features, bit );
+}
+
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 350656b..4d913a1 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -95,6 +95,6 @@ class OInputDevice : public QObject
     
-    enum EventType
+    enum Feature
     {
         Synchronous     = EV_SYN,
-        Keyboard        = EV_KEY,
+        Keys            = EV_KEY,
         Relative        = EV_REL,
@@ -102,3 +102,3 @@ class OInputDevice : public QObject
         Miscellaneous   = EV_MSC,
-        Led             = EV_LED,
+        Leds            = EV_LED,
         Sound           = EV_SND,
@@ -136,2 +136,3 @@ class OInputDevice : public QObject
     QString uniq() const;
+    bool    hasFeature( Feature ) const;