summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp46
-rw-r--r--libopie2/opiecore/oinputsystem.cpp17
-rw-r--r--libopie2/opiecore/oinputsystem.h7
3 files changed, 46 insertions, 24 deletions
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
index 5450966..a9c0fd2 100644
--- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -48,15 +48,40 @@ int main( int argc, char** argv )
48 48
49 while ( it.current() ) 49 while ( it.current() )
50 { 50 {
51 odebug << "DEMO: OInputSystem contains Device '" << it.current()->name() << "'" << oendl; 51 odebug << "DEMO: OInputSystem contains OInputDevice '" << it.current()->name() << "'" << oendl;
52 52
53 dev = it.current(); 53 dev = it.current();
54 54
55 QString features;
56 features += QString( "\nSynchronous: " );
57 if ( dev->hasFeature( OInputDevice::Synchronous ) ) features += "[ x ]"; else features += "[ ]";
58 features += QString( "\nKeys or Buttons: " );
59 if ( dev->hasFeature( OInputDevice::Keys ) ) features += "[ x ]"; else features += "[ ]";
60 features += QString( "\nRelative Axes: " );
61 if ( dev->hasFeature( OInputDevice::Relative ) ) features += "[ x ]"; else features += "[ ]";
62 features += QString( "\nAbsolute Axes: " );
63 if ( dev->hasFeature( OInputDevice::Absolute ) ) features += "[ x ]"; else features += "[ ]";
64 features += QString( "\nMiscellaneous: " );
65 if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) features += "[ x ]"; else features += "[ ]";
66 features += QString( "\nLeds: " );
67 if ( dev->hasFeature( OInputDevice::Leds ) ) features += "[ x ]"; else features += "[ ]";
68 features += QString( "\nSound: " );
69 if ( dev->hasFeature( OInputDevice::Sound ) ) features += "[ x ]"; else features += "[ ]";
70 features += QString( "\nAutoRepeat " );
71 if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) features += "[ x ]"; else features += "[ ]";
72 features += QString( "\nForceFeedback: " );
73 if ( dev->hasFeature( OInputDevice::ForceFeedback ) ) features += "[ x ]"; else features += "[ ]";
74 features += QString( "\nPowerManagement: " );
75 if ( dev->hasFeature( OInputDevice::PowerManagement ) ) features += "[ x ]"; else features += "[ ]";
76 features += QString( "\nFeedbackStatus: " );
77 if ( dev->hasFeature( OInputDevice::ForceFeedbackStatus ) ) features += "[ x ]"; else features += "[ ]";
78
55 odebug << "========================================" 79 odebug << "========================================"
56 << "\nDevice: " << dev->name() 80 << "\nDevice: " << dev->name()
57 << "\nName: " << dev->identity() 81 << "\nName: " << dev->identity()
58 << "\nPath: " << dev->path() 82 << "\nPath: " << dev->path()
59 << "\nUniq: " << dev->uniq() 83 << "\nUniq: " << dev->uniq()
84 << features << "\n"
60 << oendl; 85 << oendl;
61 86
62 ++it; 87 ++it;
@@ -138,25 +163,6 @@ int Open_cPad()
138 /* ... */ 163 /* ... */
139 } 164 }
140 165
141 // Get device 'name'
142
143 char name[256] = "Unknown";
144 if( ioctl( fd, EVIOCGNAME(sizeof name ), name) < 0 )
145 {
146 perror( "event device ioctl" );
147 }else
148 printf( "Device name '%s'\n", name );
149
150 if(ioctl(fd, EVIOCGPHYS(sizeof(name)), name) < 0) {
151 perror("event ioctl");
152 }else
153 printf("Device path '%s'\n", name );
154
155 if(ioctl(fd, EVIOCGUNIQ(sizeof(name)), name) < 0) {
156 perror("event ioctl");
157 }else
158 printf("Device identity '%s'\n", name );
159
160 // Get feature types 166 // Get feature types
161 167
162 BITMASK( features, EV_MAX ); 168 BITMASK( features, EV_MAX );
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index bfdc31f..fde36c3 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -39,7 +39,12 @@ using namespace Opie::Core;
39#include <sys/fcntl.h> 39#include <sys/fcntl.h>
40#include <sys/ioctl.h> 40#include <sys/ioctl.h>
41 41
42#define BUFSIZE 256 42#define BUFSIZE 256
43#define BIT_MASK( name, numbits ) \
44 unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \
45 memset( name, 0, sizeof( name ) )
46#define BIT_TEST( bitmask, bit ) \
47 ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) )
43 48
44/*====================================================================================== 49/*======================================================================================
45 * OInputSystem 50 * OInputSystem
@@ -140,3 +145,13 @@ QString OInputDevice::uniq() const
140 return buf; 145 return buf;
141} 146}
142 147
148bool OInputDevice::hasFeature( Feature bit ) const
149{
150 BIT_MASK( features, EV_MAX );
151
152 if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
153 return false;
154 else
155 return BIT_TEST( features, bit );
156}
157
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 350656b..4d913a1 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -93,14 +93,14 @@ class OInputDevice : public QObject
93{ 93{
94 public: 94 public:
95 95
96 enum EventType 96 enum Feature
97 { 97 {
98 Synchronous = EV_SYN, 98 Synchronous = EV_SYN,
99 Keyboard = EV_KEY, 99 Keys = EV_KEY,
100 Relative = EV_REL, 100 Relative = EV_REL,
101 Absolute = EV_ABS, 101 Absolute = EV_ABS,
102 Miscellaneous = EV_MSC, 102 Miscellaneous = EV_MSC,
103 Led = EV_LED, 103 Leds = EV_LED,
104 Sound = EV_SND, 104 Sound = EV_SND,
105 AutoRepeat = EV_REP, 105 AutoRepeat = EV_REP,
106 ForceFeedback = EV_FF, 106 ForceFeedback = EV_FF,
@@ -134,6 +134,7 @@ class OInputDevice : public QObject
134 QString identity() const; 134 QString identity() const;
135 QString path() const; 135 QString path() const;
136 QString uniq() const; 136 QString uniq() const;
137 bool hasFeature( Feature ) const;
137 138
138 private: 139 private:
139 int _fd; 140 int _fd;