show which bits are set in global keymask

2 files changed, 47 insertions, 1 deletions

diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index 29de35c..d1a28f5 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -152,3 +152,6 @@ bool OInputDevice::hasFeature( Feature bit ) const
     if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+    {
+        perror( "EVIOCGBIT" );
         return false;
+    }
     else
@@ -172 +175,23 @@ bool OInputDevice::isHeld( Key bit ) const
 }
+
+
+QString OInputDevice::globalKeyMask() const
+{
+    BIT_MASK( keys, KEY_MAX );
+
+    if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
+    {
+        perror( "EVIOCGKEY" );
+    }
+    else
+    {
+        QString keymask;
+        for ( int i = 0; i < KEY_MAX; ++i )
+        {
+            if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) );
+        }
+        return keymask;
+        
+    }
+}
+
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 9020bc1..7919610 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -78,3 +78,3 @@ class OInputSystem : public QObject
     /**
-     * @internal desctructor
+     * @internal destructor
      */    
@@ -99,7 +99,28 @@ class OInputDevice : public QObject
   public:
+    /**
+     * @returns the identity string of this input device
+     */
     QString identity() const;
+    /**
+     * @returns the path of this input device
+     */
     QString path() const;
+    /**
+     * @returns a unique identifier for this input device
+     * @note Only a few devices support this
+     */
     QString uniq() const;
+    /**
+     * @returns whether a certain @a Feature is being supported by this device
+     */
     bool    hasFeature( Feature ) const;
+    /**
+     * @returns whether a given @a Key or Button is being held at the moment
+     */
     bool    isHeld( Key ) const;
+    /**
+     * @internal
+     * @returns a string containing a printable form of the global keymask
+     */
+    QString globalKeyMask() const;