more input system stuff

1 files changed, 26 insertions, 20 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
@@ -27,57 +27,82 @@
 */
 
 #include <opie2/odebug.h>
 #include <opie2/oinputsystem.h>
 
 using namespace Opie::Core;
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 
 #if 1
 
 int main( int argc, char** argv )
 {
     OInputSystem* sys = OInputSystem::instance();
     OInputSystem::DeviceIterator it = sys->iterator();
 
     OInputDevice* dev = 0;
     
     while ( it.current() )
     {
-        odebug << "DEMO: OInputSystem contains Device '" <<  it.current()->name() << "'" << oendl;
+        odebug << "DEMO: OInputSystem contains OInputDevice '" <<  it.current()->name() << "'" << oendl;
         
         dev = it.current();
         
+        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 << "========================================"
             << "\nDevice: " << dev->name()
             << "\nName: " << dev->identity()
             << "\nPath: " << dev->path()
             << "\nUniq: " << dev->uniq()
+            << features << "\n"
             << oendl;
     
         ++it;
     }
 }
 
 #else
 
 #include <fcntl.h>
 #include <unistd.h>
 #include <cstdlib>
 #include <cstdio>
 #include <string>
 
 #include <sys/types.h>
 #include <linux/input.h>
 
 using std::string;
 
 const unsigned char     BUT1 = 0x01;
 const unsigned char     BUT2 = 0x04;
 const unsigned char     BUT3 = 0x02;
 const unsigned char     BUT4 = 0x40;
 const unsigned char     BUT5 = 0x80;
@@ -117,67 +142,48 @@ int Open_cPad()
                 version >> 16, (version >> 8) & 0xff,
                 version & 0xff);
 
             // Get Identifying info
 
             if( ioctl( fd, EVIOCGID, &info) )
             {
                 perror( "event device ioctl" );
                 return -1;
             }
             printf( "Bus: %#x,  Vendor: %#x, Product: %#x, Version: %#x\n",
                     info.bustype, info.vendor, info.product, info.version );
 
             switch ( info.bustype)
             {
                 case BUS_PCI :
                     printf(" is on a PCI bus\n");
                     break;
                 case BUS_USB :
                     printf(" is on a Universal Serial Bus\n");
                     break;
                 /* ... */
             }
 
-            // 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
 
             BITMASK( features, EV_MAX );
 
             if( ioctl( fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
             {
                 perror( "event device ioctl" );
                 return -1;
             }
 
             printf( "Supported features:\n" );
             for( size_t bit = 0; bit < EV_MAX; ++bit )
             {
                 if( TEST_BIT( features, bit ) )
                 {
                     switch( bit )
                     {
                         case EV_SYN :
                             printf("  Sync. Events\n");
                             break;
                         //case EV_RST:
                         //    printf( "  Reset?\n" );
                         //    break;
                         case EV_KEY: