-rw-r--r-- | examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp | 46 | ||||
-rw-r--r-- | libopie2/opiecore/oinputsystem.cpp | 17 | ||||
-rw-r--r-- | libopie2/opiecore/oinputsystem.h | 7 |
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 | |||
@@ -35,41 +35,66 @@ using namespace Opie::Core; | |||
35 | #include <stdio.h> | 35 | #include <stdio.h> |
36 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
38 | #include <sys/fcntl.h> | 38 | #include <sys/fcntl.h> |
39 | 39 | ||
40 | #if 1 | 40 | #if 1 |
41 | 41 | ||
42 | int main( int argc, char** argv ) | 42 | int main( int argc, char** argv ) |
43 | { | 43 | { |
44 | OInputSystem* sys = OInputSystem::instance(); | 44 | OInputSystem* sys = OInputSystem::instance(); |
45 | OInputSystem::DeviceIterator it = sys->iterator(); | 45 | OInputSystem::DeviceIterator it = sys->iterator(); |
46 | 46 | ||
47 | OInputDevice* dev = 0; | 47 | OInputDevice* dev = 0; |
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; |
63 | } | 88 | } |
64 | } | 89 | } |
65 | 90 | ||
66 | #else | 91 | #else |
67 | 92 | ||
68 | #include <fcntl.h> | 93 | #include <fcntl.h> |
69 | #include <unistd.h> | 94 | #include <unistd.h> |
70 | #include <cstdlib> | 95 | #include <cstdlib> |
71 | #include <cstdio> | 96 | #include <cstdio> |
72 | #include <string> | 97 | #include <string> |
73 | 98 | ||
74 | #include <sys/types.h> | 99 | #include <sys/types.h> |
75 | #include <linux/input.h> | 100 | #include <linux/input.h> |
@@ -125,51 +150,32 @@ int Open_cPad() | |||
125 | return -1; | 150 | return -1; |
126 | } | 151 | } |
127 | printf( "Bus: %#x, Vendor: %#x, Product: %#x, Version: %#x\n", | 152 | printf( "Bus: %#x, Vendor: %#x, Product: %#x, Version: %#x\n", |
128 | info.bustype, info.vendor, info.product, info.version ); | 153 | info.bustype, info.vendor, info.product, info.version ); |
129 | 154 | ||
130 | switch ( info.bustype) | 155 | switch ( info.bustype) |
131 | { | 156 | { |
132 | case BUS_PCI : | 157 | case BUS_PCI : |
133 | printf(" is on a PCI bus\n"); | 158 | printf(" is on a PCI bus\n"); |
134 | break; | 159 | break; |
135 | case BUS_USB : | 160 | case BUS_USB : |
136 | printf(" is on a Universal Serial Bus\n"); | 161 | printf(" is on a Universal Serial Bus\n"); |
137 | break; | 162 | break; |
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 ); |
163 | 169 | ||
164 | if( ioctl( fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) | 170 | if( ioctl( fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 ) |
165 | { | 171 | { |
166 | perror( "event device ioctl" ); | 172 | perror( "event device ioctl" ); |
167 | return -1; | 173 | return -1; |
168 | } | 174 | } |
169 | 175 | ||
170 | printf( "Supported features:\n" ); | 176 | printf( "Supported features:\n" ); |
171 | for( size_t bit = 0; bit < EV_MAX; ++bit ) | 177 | for( size_t bit = 0; bit < EV_MAX; ++bit ) |
172 | { | 178 | { |
173 | if( TEST_BIT( features, bit ) ) | 179 | if( TEST_BIT( features, bit ) ) |
174 | { | 180 | { |
175 | switch( bit ) | 181 | switch( bit ) |
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 | |||
@@ -26,33 +26,38 @@ | |||
26 | Boston, MA 02111-1307, USA. | 26 | Boston, MA 02111-1307, USA. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "oinputsystem.h" | 29 | #include "oinputsystem.h" |
30 | using namespace Opie::Core; | 30 | using namespace Opie::Core; |
31 | 31 | ||
32 | /* QT */ | 32 | /* QT */ |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | 34 | ||
35 | /* STD */ | 35 | /* STD */ |
36 | #include <errno.h> | 36 | #include <errno.h> |
37 | #include <string.h> | 37 | #include <string.h> |
38 | #include <linux/input.h> | 38 | #include <linux/input.h> |
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 |
46 | *======================================================================================*/ | 51 | *======================================================================================*/ |
47 | 52 | ||
48 | OInputSystem* OInputSystem::_instance = 0; | 53 | OInputSystem* OInputSystem::_instance = 0; |
49 | 54 | ||
50 | OInputSystem::OInputSystem() : QObject() | 55 | OInputSystem::OInputSystem() : QObject() |
51 | { | 56 | { |
52 | qDebug( "OInputSystem::OInputSystem()" ); | 57 | qDebug( "OInputSystem::OInputSystem()" ); |
53 | synchronize(); | 58 | synchronize(); |
54 | } | 59 | } |
55 | 60 | ||
56 | 61 | ||
57 | void OInputSystem::synchronize() | 62 | void OInputSystem::synchronize() |
58 | { | 63 | { |
@@ -127,16 +132,26 @@ QString OInputDevice::identity() const | |||
127 | 132 | ||
128 | QString OInputDevice::path() const | 133 | QString OInputDevice::path() const |
129 | { | 134 | { |
130 | char buf[BUFSIZE] = "<unknown>"; | 135 | char buf[BUFSIZE] = "<unknown>"; |
131 | ::ioctl( _fd, EVIOCGPHYS(sizeof buf), buf ); | 136 | ::ioctl( _fd, EVIOCGPHYS(sizeof buf), buf ); |
132 | return buf; | 137 | return buf; |
133 | } | 138 | } |
134 | 139 | ||
135 | 140 | ||
136 | QString OInputDevice::uniq() const | 141 | QString OInputDevice::uniq() const |
137 | { | 142 | { |
138 | char buf[BUFSIZE] = "<unknown>"; | 143 | char buf[BUFSIZE] = "<unknown>"; |
139 | ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf ); | 144 | ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf ); |
140 | return buf; | 145 | return buf; |
141 | } | 146 | } |
142 | 147 | ||
148 | bool 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 | |||
@@ -80,40 +80,40 @@ class OInputSystem : public QObject | |||
80 | * @internal desctructor | 80 | * @internal desctructor |
81 | */ | 81 | */ |
82 | ~OInputSystem(); | 82 | ~OInputSystem(); |
83 | 83 | ||
84 | protected: | 84 | protected: |
85 | OInputSystem(); | 85 | OInputSystem(); |
86 | 86 | ||
87 | static OInputSystem* _instance; | 87 | static OInputSystem* _instance; |
88 | DeviceMap _devices; | 88 | DeviceMap _devices; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | 91 | ||
92 | class OInputDevice : public QObject | 92 | 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, |
107 | PowerManagement = EV_PWR, | 107 | PowerManagement = EV_PWR, |
108 | ForceFeedbackStatus = EV_FF_STATUS, | 108 | ForceFeedbackStatus = EV_FF_STATUS, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | enum Bus | 111 | enum Bus |
112 | { | 112 | { |
113 | PCI = BUS_PCI, | 113 | PCI = BUS_PCI, |
114 | ISAPNP = BUS_ISAPNP, | 114 | ISAPNP = BUS_ISAPNP, |
115 | HIL = BUS_HIL, | 115 | HIL = BUS_HIL, |
116 | BLUETOOTH = BUS_BLUETOOTH, | 116 | BLUETOOTH = BUS_BLUETOOTH, |
117 | ISA = BUS_ISA, | 117 | ISA = BUS_ISA, |
118 | I8042 = BUS_I8042, | 118 | I8042 = BUS_I8042, |
119 | XTKBD = BUS_XTKBD, | 119 | XTKBD = BUS_XTKBD, |
@@ -121,28 +121,29 @@ class OInputDevice : public QObject | |||
121 | GAMEPORT = BUS_GAMEPORT, | 121 | GAMEPORT = BUS_GAMEPORT, |
122 | PARPORT = BUS_PARPORT, | 122 | PARPORT = BUS_PARPORT, |
123 | AMIGA = BUS_AMIGA, | 123 | AMIGA = BUS_AMIGA, |
124 | ADB = BUS_ADB, | 124 | ADB = BUS_ADB, |
125 | I2C = BUS_I2C, | 125 | I2C = BUS_I2C, |
126 | HOST = BUS_HOST, | 126 | HOST = BUS_HOST, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | public: | 129 | public: |
130 | OInputDevice( QObject* parent, const char* name = 0 ); | 130 | OInputDevice( QObject* parent, const char* name = 0 ); |
131 | ~OInputDevice(); | 131 | ~OInputDevice(); |
132 | 132 | ||
133 | public: | 133 | public: |
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; |
140 | input_id _id; | 141 | input_id _id; |
141 | 142 | ||
142 | }; | 143 | }; |
143 | 144 | ||
144 | } | 145 | } |
145 | } | 146 | } |
146 | 147 | ||
147 | #endif // OINPUTSYSTEM_H | 148 | #endif // OINPUTSYSTEM_H |
148 | 149 | ||