-rw-r--r-- | libopie2/opiecore/oinputsystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp index a2306ca..f9078d6 100644 --- a/libopie2/opiecore/oinputsystem.cpp +++ b/libopie2/opiecore/oinputsystem.cpp | |||
@@ -26,98 +26,98 @@ | |||
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 <qdir.h> | 33 | #include <qdir.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | 35 | ||
36 | /* STD */ | 36 | /* STD */ |
37 | #include <errno.h> | 37 | #include <errno.h> |
38 | #include <string.h> | 38 | #include <string.h> |
39 | #include <sys/fcntl.h> | 39 | #include <sys/fcntl.h> |
40 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
41 | #include <unistd.h> | 41 | #include <unistd.h> |
42 | 42 | ||
43 | #define BUFSIZE 256 | 43 | #define BUFSIZE 256 |
44 | #define BIT_MASK( name, numbits ) \ | 44 | #define BIT_MASK( name, numbits ) \ |
45 | unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \ | 45 | unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \ |
46 | memset( name, 0, sizeof( name ) ) | 46 | memset( name, 0, sizeof( name ) ) |
47 | #define BIT_TEST( bitmask, bit ) \ | 47 | #define BIT_TEST( bitmask, bit ) \ |
48 | ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) ) | 48 | ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) ) |
49 | 49 | ||
50 | /*====================================================================================== | 50 | /*====================================================================================== |
51 | * OInputSystem | 51 | * OInputSystem |
52 | *======================================================================================*/ | 52 | *======================================================================================*/ |
53 | 53 | ||
54 | OInputSystem* OInputSystem::_instance = 0; | 54 | OInputSystem* OInputSystem::_instance = 0; |
55 | 55 | ||
56 | OInputSystem::OInputSystem() : QObject() | 56 | OInputSystem::OInputSystem() : QObject() |
57 | { | 57 | { |
58 | qDebug( "OInputSystem::OInputSystem()" ); | 58 | qDebug( "OInputSystem::OInputSystem()" ); |
59 | synchronize(); | 59 | synchronize(); |
60 | } | 60 | } |
61 | 61 | ||
62 | 62 | ||
63 | void OInputSystem::synchronize() | 63 | void OInputSystem::synchronize() |
64 | { | 64 | { |
65 | qDebug( "OInputSystem::synchronize()" ); | 65 | qDebug( "OInputSystem::synchronize()" ); |
66 | QDir devInput( "/dev/input/" ); | 66 | QDir devInput( "/dev/input/" ); |
67 | if ( devInput.exists() ) | 67 | if ( devInput.exists() ) |
68 | { | 68 | { |
69 | QStringList devInputFiles = devInput.entryList( QDir::System, QDir::Name ); | 69 | QStringList devInputFiles = devInput.entryList( QDir::System, QDir::Name ); |
70 | for ( QStringList::Iterator it = devInputFiles.begin(); it != devInputFiles.end(); ++it ) | 70 | for ( QStringList::Iterator it = devInputFiles.begin(); it != devInputFiles.end(); ++it ) |
71 | { | 71 | { |
72 | QString absPath = devInput.absFilePath( *it ); | 72 | QString absPath = devInput.absFilePath( *it ); |
73 | bool isValid = OInputDevice::isValid( absPath ); | 73 | bool isValid = OInputDevice::isValid( absPath ); |
74 | qDebug( "OInputSystem::synchronize() - checking if '%s' is a valid input system node... '%s'", | 74 | qDebug( "OInputSystem::synchronize() - checking if '%s' is a valid input system node... '%s' [%s]", |
75 | (const char*) absPath, isValid ? "yes" : "no" ); | 75 | (const char*) absPath, isValid ? "yes" : "no", isValid ? "(ok)" : strerror( errno ) ); |
76 | if ( isValid ) _devices.insert( *it, new OInputDevice( this, absPath ) ); | 76 | if ( isValid ) _devices.insert( *it, new OInputDevice( this, absPath ) ); |
77 | } | 77 | } |
78 | } | 78 | } |
79 | qDebug( "OInputSystem::synchronize() done" ); | 79 | qDebug( "OInputSystem::synchronize() done" ); |
80 | if ( !_devices.count() ) | 80 | if ( !_devices.count() ) |
81 | qWarning( "OInputSystem::no devices found" ); | 81 | qWarning( "OInputSystem::no devices found" ); |
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
85 | OInputSystem::~OInputSystem() | 85 | OInputSystem::~OInputSystem() |
86 | { | 86 | { |
87 | qDebug( "OInputSystem::~OInputSystem()" ); | 87 | qDebug( "OInputSystem::~OInputSystem()" ); |
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||
91 | int OInputSystem::count() const | 91 | int OInputSystem::count() const |
92 | { | 92 | { |
93 | return _devices.count(); | 93 | return _devices.count(); |
94 | } | 94 | } |
95 | 95 | ||
96 | 96 | ||
97 | OInputDevice* OInputSystem::device( const QString& device ) const | 97 | OInputDevice* OInputSystem::device( const QString& device ) const |
98 | { | 98 | { |
99 | return _devices[device]; | 99 | return _devices[device]; |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | OInputSystem* OInputSystem::instance() | 103 | OInputSystem* OInputSystem::instance() |
104 | { | 104 | { |
105 | if ( !_instance ) _instance = new OInputSystem(); | 105 | if ( !_instance ) _instance = new OInputSystem(); |
106 | return _instance; | 106 | return _instance; |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
110 | OInputSystem::DeviceIterator OInputSystem::iterator() const | 110 | OInputSystem::DeviceIterator OInputSystem::iterator() const |
111 | { | 111 | { |
112 | return OInputSystem::DeviceIterator( _devices ); | 112 | return OInputSystem::DeviceIterator( _devices ); |
113 | } | 113 | } |
114 | 114 | ||
115 | /*====================================================================================== | 115 | /*====================================================================================== |
116 | * OInputDevice | 116 | * OInputDevice |
117 | *======================================================================================*/ | 117 | *======================================================================================*/ |
118 | 118 | ||
119 | OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name ) | 119 | OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name ) |
120 | { | 120 | { |
121 | qDebug( "OInputDevice::OInputDevice( '%s' )", name ); | 121 | qDebug( "OInputDevice::OInputDevice( '%s' )", name ); |
122 | 122 | ||
123 | _fd = ::open( name, O_RDONLY ); | 123 | _fd = ::open( name, O_RDONLY ); |