1 files changed, 4 insertions, 0 deletions

diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
index 6c95048..b49df99 100644
--- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -42,78 +42,82 @@ using namespace Opie::Core;
 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 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( "\nSwitches:        " );
+        if ( dev->hasFeature( OInputDevice::Switches ) ) 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;
             
         if ( dev->isHeld( OInputDevice::Key_LEFTSHIFT ) ) 
             odebug << "Left Shift is being held." << oendl;
         else odebug << "Left Shift is _not_ being held." << oendl;
         
         if ( dev->isHeld( OInputDevice::Button_LEFT ) ) 
             odebug << "Left Mouse Button is being held." << oendl;
         else odebug << "Left Mouse Button is _not_ being held." << oendl;
         
         odebug << "Global key mask: " << dev->globalKeyMask() << oendl;
+        odebug << "Global switch mask: " << dev->globalSwitchMask() << 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;