summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/oinputsystem.cpp25
-rw-r--r--libopie2/opiecore/oinputsystem.h23
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
@@ -150,7 +150,10 @@ bool OInputDevice::hasFeature( Feature bit ) const
150 BIT_MASK( features, EV_MAX ); 150 BIT_MASK( features, EV_MAX );
151 151
152 if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) 152 if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
153 {
154 perror( "EVIOCGBIT" );
153 return false; 155 return false;
156 }
154 else 157 else
155 return BIT_TEST( features, bit ); 158 return BIT_TEST( features, bit );
156} 159}
@@ -170,3 +173,25 @@ bool OInputDevice::isHeld( Key bit ) const
170 return BIT_TEST( keys, bit ); 173 return BIT_TEST( keys, bit );
171 } 174 }
172} 175}
176
177
178QString OInputDevice::globalKeyMask() const
179{
180 BIT_MASK( keys, KEY_MAX );
181
182 if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
183 {
184 perror( "EVIOCGKEY" );
185 }
186 else
187 {
188 QString keymask;
189 for ( int i = 0; i < KEY_MAX; ++i )
190 {
191 if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) );
192 }
193 return keymask;
194
195 }
196}
197
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
@@ -76,7 +76,7 @@ class OInputSystem : public QObject
76 */ 76 */
77 void synchronize(); 77 void synchronize();
78 /** 78 /**
79 * @internal desctructor 79 * @internal destructor
80 */ 80 */
81 ~OInputSystem(); 81 ~OInputSystem();
82 82
@@ -97,11 +97,32 @@ class OInputDevice : public QObject
97 #include "oinputsystemenums.h" 97 #include "oinputsystemenums.h"
98 98
99 public: 99 public:
100 /**
101 * @returns the identity string of this input device
102 */
100 QString identity() const; 103 QString identity() const;
104 /**
105 * @returns the path of this input device
106 */
101 QString path() const; 107 QString path() const;
108 /**
109 * @returns a unique identifier for this input device
110 * @note Only a few devices support this
111 */
102 QString uniq() const; 112 QString uniq() const;
113 /**
114 * @returns whether a certain @a Feature is being supported by this device
115 */
103 bool hasFeature( Feature ) const; 116 bool hasFeature( Feature ) const;
117 /**
118 * @returns whether a given @a Key or Button is being held at the moment
119 */
104 bool isHeld( Key ) const; 120 bool isHeld( Key ) const;
121 /**
122 * @internal
123 * @returns a string containing a printable form of the global keymask
124 */
125 QString globalKeyMask() const;
105 126
106 private: 127 private:
107 int _fd; 128 int _fd;