summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oinputsystem.cpp25
-rw-r--r--libopie2/opiecore/oinputsystem.h27
2 files changed, 49 insertions, 3 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
@@ -147,13 +147,16 @@ QString OInputDevice::uniq() const
bool OInputDevice::hasFeature( Feature bit ) const
{
BIT_MASK( features, EV_MAX );
if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+ {
+ perror( "EVIOCGBIT" );
return false;
+ }
else
return BIT_TEST( features, bit );
}
bool OInputDevice::isHeld( Key bit ) const
@@ -167,6 +170,28 @@ bool OInputDevice::isHeld( Key bit ) const
}
else
{
return BIT_TEST( keys, bit );
}
}
+
+
+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
@@ -73,13 +73,13 @@ class OInputSystem : public QObject
/**
* @internal Rebuild the internal interface database
* @note Sometimes it might be useful to call this from client code,
*/
void synchronize();
/**
- * @internal desctructor
+ * @internal destructor
*/
~OInputSystem();
protected:
OInputSystem();
@@ -94,17 +94,38 @@ class OInputDevice : public QObject
OInputDevice( QObject* parent, const char* name = 0 );
~OInputDevice();
#include "oinputsystemenums.h"
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;
- bool hasFeature( Feature ) const;
- bool isHeld( Key ) 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;
private:
int _fd;
input_id _id;
};