summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oinputsystem.cpp38
-rw-r--r--libopie2/opiecore/oinputsystem.h19
2 files changed, 43 insertions, 14 deletions
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index d1a28f5..a2306ca 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -21,60 +21,73 @@
21 -.   .:....=;==+<; You should have received a copy of the GNU 21 -.   .:....=;==+<; You should have received a copy of the GNU
22  -_. . .   )=.  = Library General Public License along with 22  -_. . .   )=.  = Library General Public License along with
23    --        :-=` this library; see the file COPYING.LIB. 23    --        :-=` this library; see the file COPYING.LIB.
24 If not, write to the Free Software Foundation, 24 If not, write to the Free Software Foundation,
25 Inc., 59 Temple Place - Suite 330, 25 Inc., 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA. 26 Boston, MA 02111-1307, USA.
27*/ 27*/
28 28
29#include "oinputsystem.h" 29#include "oinputsystem.h"
30using namespace Opie::Core; 30using namespace Opie::Core;
31 31
32/* QT */ 32/* QT */
33#include <qdir.h>
33#include <qfile.h> 34#include <qfile.h>
34 35
35/* STD */ 36/* STD */
36#include <errno.h> 37#include <errno.h>
37#include <string.h> 38#include <string.h>
38#include <sys/fcntl.h> 39#include <sys/fcntl.h>
39#include <sys/ioctl.h> 40#include <sys/ioctl.h>
41#include <unistd.h>
40 42
41#define BUFSIZE 256 43#define BUFSIZE 256
42#define BIT_MASK( name, numbits ) \ 44#define BIT_MASK( name, numbits ) \
43 unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \ 45 unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \
44 memset( name, 0, sizeof( name ) ) 46 memset( name, 0, sizeof( name ) )
45#define BIT_TEST( bitmask, bit ) \ 47#define BIT_TEST( bitmask, bit ) \
46 ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) ) 48 ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) )
47 49
48/*====================================================================================== 50/*======================================================================================
49 * OInputSystem 51 * OInputSystem
50 *======================================================================================*/ 52 *======================================================================================*/
51 53
52OInputSystem* OInputSystem::_instance = 0; 54OInputSystem* OInputSystem::_instance = 0;
53 55
54OInputSystem::OInputSystem() : QObject() 56OInputSystem::OInputSystem() : QObject()
55{ 57{
56 qDebug( "OInputSystem::OInputSystem()" ); 58 qDebug( "OInputSystem::OInputSystem()" );
57 synchronize(); 59 synchronize();
58} 60}
59 61
60 62
61void OInputSystem::synchronize() 63void OInputSystem::synchronize()
62{ 64{
63 qDebug( "OInputSystem::synchronize()" ); 65 qDebug( "OInputSystem::synchronize()" );
64 if ( QFile::exists( "/dev/input/event0" ) ) _devices.insert( "0", new OInputDevice( this, "/dev/input/event0" ) ); 66 QDir devInput( "/dev/input/" );
65 if ( QFile::exists( "/dev/input/event1" ) ) _devices.insert( "1", new OInputDevice( this, "/dev/input/event1" ) ); 67 if ( devInput.exists() )
66 if ( QFile::exists( "/dev/input/event2" ) ) _devices.insert( "2", new OInputDevice( this, "/dev/input/event2" ) ); 68 {
67 if ( QFile::exists( "/dev/input/event3" ) ) _devices.insert( "3", new OInputDevice( this, "/dev/input/event3" ) ); 69 QStringList devInputFiles = devInput.entryList( QDir::System, QDir::Name );
70 for ( QStringList::Iterator it = devInputFiles.begin(); it != devInputFiles.end(); ++it )
71 {
72 QString absPath = devInput.absFilePath( *it );
73 bool isValid = OInputDevice::isValid( absPath );
74 qDebug( "OInputSystem::synchronize() - checking if '%s' is a valid input system node... '%s'",
75 (const char*) absPath, isValid ? "yes" : "no" );
76 if ( isValid ) _devices.insert( *it, new OInputDevice( this, absPath ) );
77 }
78 }
68 qDebug( "OInputSystem::synchronize() done" ); 79 qDebug( "OInputSystem::synchronize() done" );
80 if ( !_devices.count() )
81 qWarning( "OInputSystem::no devices found" );
69} 82}
70 83
71 84
72OInputSystem::~OInputSystem() 85OInputSystem::~OInputSystem()
73{ 86{
74 qDebug( "OInputSystem::~OInputSystem()" ); 87 qDebug( "OInputSystem::~OInputSystem()" );
75} 88}
76 89
77 90
78int OInputSystem::count() const 91int OInputSystem::count() const
79{ 92{
80 return _devices.count(); 93 return _devices.count();
@@ -97,25 +110,25 @@ OInputSystem* OInputSystem::instance()
97OInputSystem::DeviceIterator OInputSystem::iterator() const 110OInputSystem::DeviceIterator OInputSystem::iterator() const
98{ 111{
99 return OInputSystem::DeviceIterator( _devices ); 112 return OInputSystem::DeviceIterator( _devices );
100} 113}
101 114
102/*====================================================================================== 115/*======================================================================================
103 * OInputDevice 116 * OInputDevice
104 *======================================================================================*/ 117 *======================================================================================*/
105 118
106OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name ) 119OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name )
107{ 120{
108 qDebug( "OInputDevice::OInputDevice( '%s' )", name ); 121 qDebug( "OInputDevice::OInputDevice( '%s' )", name );
109 122
110 _fd = ::open( name, O_RDONLY ); 123 _fd = ::open( name, O_RDONLY );
111 if ( _fd == -1 ) 124 if ( _fd == -1 )
112 { 125 {
113 qDebug( "OInputDevice::OInputDevice() - Warning: couldn't open %s (%s)", name, strerror( errno ) ); 126 qDebug( "OInputDevice::OInputDevice() - Warning: couldn't open %s (%s)", name, strerror( errno ) );
114 } 127 }
115} 128}
116 129
117 130
118OInputDevice::~OInputDevice() 131OInputDevice::~OInputDevice()
119{ 132{
120 qDebug( "OInputDevice::~OInputDevice()" ); 133 qDebug( "OInputDevice::~OInputDevice()" );
121} 134}
@@ -139,25 +152,25 @@ QString OInputDevice::path() const
139 152
140QString OInputDevice::uniq() const 153QString OInputDevice::uniq() const
141{ 154{
142 char buf[BUFSIZE] = "<unknown>"; 155 char buf[BUFSIZE] = "<unknown>";
143 ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf ); 156 ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf );
144 return buf; 157 return buf;
145} 158}
146 159
147 160
148bool OInputDevice::hasFeature( Feature bit ) const 161bool OInputDevice::hasFeature( Feature bit ) const
149{ 162{
150 BIT_MASK( features, EV_MAX ); 163 BIT_MASK( features, EV_MAX );
151 164
152 if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) 165 if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
153 { 166 {
154 perror( "EVIOCGBIT" ); 167 perror( "EVIOCGBIT" );
155 return false; 168 return false;
156 } 169 }
157 else 170 else
158 return BIT_TEST( features, bit ); 171 return BIT_TEST( features, bit );
159} 172}
160 173
161 174
162bool OInputDevice::isHeld( Key bit ) const 175bool OInputDevice::isHeld( Key bit ) const
163{ 176{
@@ -182,16 +195,27 @@ QString OInputDevice::globalKeyMask() const
182 if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 ) 195 if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
183 { 196 {
184 perror( "EVIOCGKEY" ); 197 perror( "EVIOCGKEY" );
185 } 198 }
186 else 199 else
187 { 200 {
188 QString keymask; 201 QString keymask;
189 for ( int i = 0; i < KEY_MAX; ++i ) 202 for ( int i = 0; i < KEY_MAX; ++i )
190 { 203 {
191 if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) ); 204 if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) );
192 } 205 }
193 return keymask; 206 return keymask;
194 207
195 } 208 }
196} 209}
197 210
211
212bool OInputDevice::isValid( const QString& path )
213{
214 char buf[BUFSIZE] = "<unknown>";
215 int fd = ::open( (const char*) path, O_RDONLY );
216 if ( fd < 0 ) return false;
217 int res = ::ioctl( fd, EVIOCGNAME(sizeof buf), buf );
218 ::close( fd );
219 return res >= 0;
220}
221
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 7919610..6f822a1 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -68,43 +68,43 @@ class OInputSystem : public QObject
68 /** 68 /**
69 * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found 69 * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
70 * @see OAudioInterface 70 * @see OAudioInterface
71 */ 71 */
72 OInputDevice* device( const QString& interface ) const; 72 OInputDevice* device( const QString& interface ) const;
73 /** 73 /**
74 * @internal Rebuild the internal interface database 74 * @internal Rebuild the internal interface database
75 * @note Sometimes it might be useful to call this from client code, 75 * @note Sometimes it might be useful to call this from client code,
76 */ 76 */
77 void synchronize(); 77 void synchronize();
78 /** 78 /**
79 * @internal destructor 79 * @internal destructor
80 */ 80 */
81 ~OInputSystem(); 81 ~OInputSystem();
82 82
83 protected: 83 protected:
84 OInputSystem(); 84 OInputSystem();
85 85
86 static OInputSystem* _instance; 86 static OInputSystem* _instance;
87 DeviceMap _devices; 87 DeviceMap _devices;
88}; 88};
89 89
90 90
91class OInputDevice : public QObject 91class OInputDevice : public QObject
92{ 92{
93 public: 93 public:
94 OInputDevice( QObject* parent, const char* name = 0 ); 94 OInputDevice( QObject* parent, const char* name = 0 );
95 ~OInputDevice(); 95 ~OInputDevice();
96 96
97 #include "oinputsystemenums.h" 97 #include "oinputsystemenums.h"
98 98
99 public: 99 public:
100 /** 100 /**
101 * @returns the identity string of this input device 101 * @returns the identity string of this input device
102 */ 102 */
103 QString identity() const; 103 QString identity() const;
104 /** 104 /**
105 * @returns the path of this input device 105 * @returns the path of this input device
106 */ 106 */
107 QString path() const; 107 QString path() const;
108 /** 108 /**
109 * @returns a unique identifier for this input device 109 * @returns a unique identifier for this input device
110 * @note Only a few devices support this 110 * @note Only a few devices support this
@@ -114,24 +114,29 @@ class OInputDevice : public QObject
114 * @returns whether a certain @a Feature is being supported by this device 114 * @returns whether a certain @a Feature is being supported by this device
115 */ 115 */
116 bool hasFeature( Feature ) const; 116 bool hasFeature( Feature ) const;
117 /** 117 /**
118 * @returns whether a given @a Key or Button is being held at the moment 118 * @returns whether a given @a Key or Button is being held at the moment
119 */ 119 */
120 bool isHeld( Key ) const; 120 bool isHeld( Key ) const;
121 /** 121 /**
122 * @internal 122 * @internal
123 * @returns a string containing a printable form of the global keymask 123 * @returns a string containing a printable form of the global keymask
124 */ 124 */
125 QString globalKeyMask() const; 125 QString globalKeyMask() const;
126 126 /**
127 * @internal
128 * @returns whether a certain @a path corresponds to an input device
129 */
130 static bool isValid( const QString& path );
131
127 private: 132 private:
128 int _fd; 133 int _fd;
129 input_id _id; 134 input_id _id;
130 135
131}; 136};
132 137
133} 138}
134} 139}
135 140
136#endif // OINPUTSYSTEM_H 141#endif // OINPUTSYSTEM_H
137 142