summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-02 15:23:01 (UTC)
committer mickeyl <mickeyl>2005-02-02 15:23:01 (UTC)
commit227d06128b74ef78b8268e18dabe454469b65cc8 (patch) (unidiff)
tree64632ebff3bb6df1ba81ce1e70638cbce15de33c
parent1a5dc271114432e0e598af499c076bfbf69ff972 (diff)
downloadopie-227d06128b74ef78b8268e18dabe454469b65cc8.zip
opie-227d06128b74ef78b8268e18dabe454469b65cc8.tar.gz
opie-227d06128b74ef78b8268e18dabe454469b65cc8.tar.bz2
first work on input system abstractions
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp68
-rw-r--r--libopie2/opiecore/oinputsystem.cpp113
-rw-r--r--libopie2/opiecore/oinputsystem.h108
-rw-r--r--libopie2/opiemm/osoundsystem.h4
4 files changed, 286 insertions, 7 deletions
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
index 89209a7..5450966 100644
--- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -1,3 +1,70 @@
1/*
2                 This file is part of the Opie Project
3 =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
4 .=l.
5           .>+-=
6 _;:,     .>    :=|. This program is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This program is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
18..}^=.=       =       ; Library General Public License for more
19++=   -.     .`     .: details.
20 :     =  ...= . :.=-
21 -.   .:....=;==+<; You should have received a copy of the GNU
22  -_. . .   )=.  = Library General Public License along with
23    --        :-=` this library; see the file COPYING.LIB.
24 If not, write to the Free Software Foundation,
25 Inc., 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA.
27*/
28
29#include <opie2/odebug.h>
30#include <opie2/oinputsystem.h>
31
32using namespace Opie::Core;
33
34#include <stdlib.h>
35#include <stdio.h>
36#include <unistd.h>
37#include <sys/ioctl.h>
38#include <sys/fcntl.h>
39
40#if 1
41
42int main( int argc, char** argv )
43{
44 OInputSystem* sys = OInputSystem::instance();
45 OInputSystem::DeviceIterator it = sys->iterator();
46
47 OInputDevice* dev = 0;
48
49 while ( it.current() )
50 {
51 odebug << "DEMO: OInputSystem contains Device '" << it.current()->name() << "'" << oendl;
52
53 dev = it.current();
54
55 odebug << "========================================"
56 << "\nDevice: " << dev->name()
57 << "\nName: " << dev->identity()
58 << "\nPath: " << dev->path()
59 << "\nUniq: " << dev->uniq()
60 << oendl;
61
62 ++it;
63 }
64}
65
66#else
67
1#include <fcntl.h> 68#include <fcntl.h>
2#include <unistd.h> 69#include <unistd.h>
3#include <cstdlib> 70#include <cstdlib>
@@ -248,3 +315,4 @@ hell:
248 exit( EXIT_FAILURE ); 315 exit( EXIT_FAILURE );
249} 316}
250 317
318#endif \ No newline at end of file
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index c33d5c8..bfdc31f 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -27,5 +27,116 @@
27*/ 27*/
28 28
29#include "oinputsystem.h" 29#include "oinputsystem.h"
30
31using namespace Opie::Core; 30using namespace Opie::Core;
31
32/* QT */
33#include <qfile.h>
34
35/* STD */
36#include <errno.h>
37#include <string.h>
38#include <linux/input.h>
39#include <sys/fcntl.h>
40#include <sys/ioctl.h>
41
42#define BUFSIZE 256
43
44/*======================================================================================
45 * OInputSystem
46 *======================================================================================*/
47
48OInputSystem* OInputSystem::_instance = 0;
49
50OInputSystem::OInputSystem() : QObject()
51{
52 qDebug( "OInputSystem::OInputSystem()" );
53 synchronize();
54}
55
56
57void OInputSystem::synchronize()
58{
59 qDebug( "OInputSystem::synchronize()" );
60 if ( QFile::exists( "/dev/input/event0" ) ) _devices.insert( "0", new OInputDevice( this, "/dev/input/event0" ) );
61 if ( QFile::exists( "/dev/input/event1" ) ) _devices.insert( "1", new OInputDevice( this, "/dev/input/event1" ) );
62 if ( QFile::exists( "/dev/input/event2" ) ) _devices.insert( "2", new OInputDevice( this, "/dev/input/event2" ) );
63 if ( QFile::exists( "/dev/input/event3" ) ) _devices.insert( "3", new OInputDevice( this, "/dev/input/event3" ) );
64 qDebug( "OInputSystem::synchronize() done" );
65}
66
67
68OInputSystem::~OInputSystem()
69{
70 qDebug( "OInputSystem::~OInputSystem()" );
71}
72
73
74int OInputSystem::count() const
75{
76 return _devices.count();
77}
78
79
80OInputDevice* OInputSystem::device( const QString& device ) const
81{
82 return _devices[device];
83}
84
85
86OInputSystem* OInputSystem::instance()
87{
88 if ( !_instance ) _instance = new OInputSystem();
89 return _instance;
90}
91
92
93OInputSystem::DeviceIterator OInputSystem::iterator() const
94{
95 return OInputSystem::DeviceIterator( _devices );
96}
97
98/*======================================================================================
99 * OInputDevice
100 *======================================================================================*/
101
102OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name )
103{
104 qDebug( "OInputDevice::OInputDevice( '%s' )", name );
105
106 _fd = ::open( name, O_RDONLY );
107 if ( _fd == -1 )
108 {
109 qDebug( "OInputDevice::OInputDevice() - Warning: couldn't open %s (%s)", name, strerror( errno ) );
110 }
111}
112
113
114OInputDevice::~OInputDevice()
115{
116 qDebug( "OInputDevice::~OInputDevice()" );
117}
118
119
120QString OInputDevice::identity() const
121{
122 char buf[BUFSIZE] = "<unknown>";
123 ::ioctl( _fd, EVIOCGNAME(sizeof buf), buf );
124 return buf;
125}
126
127
128QString OInputDevice::path() const
129{
130 char buf[BUFSIZE] = "<unknown>";
131 ::ioctl( _fd, EVIOCGPHYS(sizeof buf), buf );
132 return buf;
133}
134
135
136QString OInputDevice::uniq() const
137{
138 char buf[BUFSIZE] = "<unknown>";
139 ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf );
140 return buf;
141}
142
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 2bcdc3a..350656b 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -29,20 +29,120 @@
29#ifndef OINPUTSYSTEM_H 29#ifndef OINPUTSYSTEM_H
30#define OINPUTSYSTEM_H 30#define OINPUTSYSTEM_H
31 31
32/* QT */
32#include <qobject.h> 33#include <qobject.h>
34#include <qdict.h>
35
36/* STD */
37#include <linux/input.h>
33 38
34namespace Opie { 39namespace Opie {
35namespace Core { 40namespace Core {
36 41
37/** 42class OInputDevice;
38 * ...
39 *
40 */
41 43
44/**
45 * @brief A container class for all input devices
46 *
47 * This class provides access to all available input system devices of your computer.
48 *
49 * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
50 */
42class OInputSystem : public QObject 51class OInputSystem : public QObject
43{ 52{
53 public:
54 typedef QDict<OInputDevice> DeviceMap;
55 typedef QDictIterator<OInputDevice> DeviceIterator;
56
57 /**
58 * @returns the number of available input devices
59 */
60 int count() const;
61 /**
62 * @returns a pointer to the (one and only) @ref OInputSystem instance.
63 */
64 static OInputSystem* instance();
65 /**
66 * @returns an iterator usable for iterating through all network interfaces.
67 */
68 DeviceIterator iterator() const;
69 /**
70 * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
71 * @see OAudioInterface
72 */
73 OInputDevice* device( const QString& interface ) const;
74 /**
75 * @internal Rebuild the internal interface database
76 * @note Sometimes it might be useful to call this from client code,
77 */
78 void synchronize();
79 /**
80 * @internal desctructor
81 */
82 ~OInputSystem();
83
84 protected:
85 OInputSystem();
86
87 static OInputSystem* _instance;
88 DeviceMap _devices;
89};
90
91
92class OInputDevice : public QObject
93{
94 public:
95
96 enum EventType
97 {
98 Synchronous = EV_SYN,
99 Keyboard = EV_KEY,
100 Relative = EV_REL,
101 Absolute = EV_ABS,
102 Miscellaneous = EV_MSC,
103 Led = EV_LED,
104 Sound = EV_SND,
105 AutoRepeat = EV_REP,
106 ForceFeedback = EV_FF,
107 PowerManagement = EV_PWR,
108 ForceFeedbackStatus = EV_FF_STATUS,
109 };
110
111 enum Bus
112 {
113 PCI = BUS_PCI,
114 ISAPNP = BUS_ISAPNP,
115 HIL = BUS_HIL,
116 BLUETOOTH = BUS_BLUETOOTH,
117 ISA = BUS_ISA,
118 I8042 = BUS_I8042,
119 XTKBD = BUS_XTKBD,
120 RS232 = BUS_RS232,
121 GAMEPORT = BUS_GAMEPORT,
122 PARPORT = BUS_PARPORT,
123 AMIGA = BUS_AMIGA,
124 ADB = BUS_ADB,
125 I2C = BUS_I2C,
126 HOST = BUS_HOST,
127 };
128
129 public:
130 OInputDevice( QObject* parent, const char* name = 0 );
131 ~OInputDevice();
132
133 public:
134 QString identity() const;
135 QString path() const;
136 QString uniq() const;
137
138 private:
139 int _fd;
140 input_id _id;
141
44}; 142};
143
45} 144}
46} 145}
47 146
48#endif // OINPUTSYSTEM_H 147#endif // OINPUTSYSTEM_H
148
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h
index cce90c0..5f6fb7a 100644
--- a/libopie2/opiemm/osoundsystem.h
+++ b/libopie2/opiemm/osoundsystem.h
@@ -67,11 +67,11 @@ class OSoundSystem : public QObject
67 */ 67 */
68 int count() const; 68 int count() const;
69 /** 69 /**
70 * @returns a pointer to the (one and only) @ref ONetwork instance. 70 * @returns a pointer to the (one and only) @ref OSystem instance.
71 */ 71 */
72 static OSoundSystem* instance(); 72 static OSoundSystem* instance();
73 /** 73 /**
74 * @returns an iterator usable for iterating through all network interfaces. 74 * @returns an iterator usable for iterating through all sound cards.
75 */ 75 */
76 CardIterator iterator() const; 76 CardIterator iterator() const;
77 /** 77 /**