first work on input system abstractions

3 files changed, 216 insertions, 5 deletions

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
@@ -22,10 +22,121 @@
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "oinputsystem.h"
-
 using namespace Opie::Core;
+
+/* QT */
+#include <qfile.h>
+
+/* STD */
+#include <errno.h>
+#include <string.h>
+#include <linux/input.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+
+#define BUFSIZE 256
+
+/*======================================================================================
+ * OInputSystem
+ *======================================================================================*/
+
+OInputSystem* OInputSystem::_instance = 0;
+
+OInputSystem::OInputSystem() : QObject()
+{
+    qDebug( "OInputSystem::OInputSystem()" );
+    synchronize();
+}
+
+
+void OInputSystem::synchronize()
+{
+    qDebug( "OInputSystem::synchronize()" );
+    if ( QFile::exists( "/dev/input/event0" ) ) _devices.insert( "0", new OInputDevice( this, "/dev/input/event0" ) );
+    if ( QFile::exists( "/dev/input/event1" ) ) _devices.insert( "1", new OInputDevice( this, "/dev/input/event1" ) );
+    if ( QFile::exists( "/dev/input/event2" ) ) _devices.insert( "2", new OInputDevice( this, "/dev/input/event2" ) );
+    if ( QFile::exists( "/dev/input/event3" ) ) _devices.insert( "3", new OInputDevice( this, "/dev/input/event3" ) );
+    qDebug( "OInputSystem::synchronize() done" );
+}
+
+
+OInputSystem::~OInputSystem()
+{
+    qDebug( "OInputSystem::~OInputSystem()" );
+}
+
+
+int OInputSystem::count() const
+{
+    return _devices.count();
+}
+
+
+OInputDevice* OInputSystem::device( const QString& device ) const
+{
+    return _devices[device];
+}
+
+
+OInputSystem* OInputSystem::instance()
+{
+    if ( !_instance ) _instance = new OInputSystem();
+    return _instance;
+}
+
+
+OInputSystem::DeviceIterator OInputSystem::iterator() const
+{
+    return OInputSystem::DeviceIterator( _devices );
+}
+
+/*======================================================================================
+ * OInputDevice
+ *======================================================================================*/
+
+OInputDevice::OInputDevice( QObject* parent, const char* name ) : QObject( parent, name )
+{
+    qDebug( "OInputDevice::OInputDevice( '%s' )", name );
+    
+    _fd = ::open( name, O_RDONLY );
+    if ( _fd == -1 )
+    {
+        qDebug( "OInputDevice::OInputDevice() - Warning: couldn't open %s (%s)", name, strerror( errno ) );
+    }
+}
+
+
+OInputDevice::~OInputDevice()
+{
+    qDebug( "OInputDevice::~OInputDevice()" );
+}
+
+
+QString OInputDevice::identity() const
+{
+    char buf[BUFSIZE] = "<unknown>";
+    ::ioctl( _fd, EVIOCGNAME(sizeof buf), buf );
+    return buf;
+}
+
+
+QString OInputDevice::path() const
+{
+    char buf[BUFSIZE] = "<unknown>";
+    ::ioctl( _fd, EVIOCGPHYS(sizeof buf), buf );
+    return buf;
+}
+
+
+QString OInputDevice::uniq() const
+{
+    char buf[BUFSIZE] = "<unknown>";
+    ::ioctl( _fd, EVIOCGUNIQ(sizeof buf), buf );
+    return buf;
+}
+
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
@@ -24,25 +24,125 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OINPUTSYSTEM_H
 #define OINPUTSYSTEM_H
 
+/* QT */
 #include <qobject.h>
+#include <qdict.h>
+
+/* STD */
+#include <linux/input.h>
 
 namespace Opie {
 namespace Core {
 
+class OInputDevice;
+
 /**
-  * ...
+ * @brief A container class for all input devices
+ *
+ * This class provides access to all available input system devices of your computer.
   * 
+ * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
   */
-
 class OInputSystem : public QObject
 {
+  public:
+    typedef QDict<OInputDevice> DeviceMap;
+    typedef QDictIterator<OInputDevice> DeviceIterator;
+
+     /**
+     * @returns the number of available input devices
+     */
+    int count() const;
+    /**
+     * @returns a pointer to the (one and only) @ref OInputSystem instance.
+     */
+    static OInputSystem* instance();
+    /**
+     * @returns an iterator usable for iterating through all network interfaces.
+     */
+    DeviceIterator iterator() const;
+    /**
+     * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
+     * @see OAudioInterface
+     */
+    OInputDevice* device( const QString& interface ) const;
+    /**
+     * @internal Rebuild the internal interface database
+     * @note Sometimes it might be useful to call this from client code,
+     */
+    void synchronize();
+    /**
+     * @internal desctructor
+     */    
+     ~OInputSystem();
+ 
+ protected:
+    OInputSystem();
+    
+    static OInputSystem* _instance;
+    DeviceMap _devices;
 };
+
+
+class OInputDevice : public QObject
+{  
+  public:
+    
+    enum EventType
+    {
+        Synchronous     = EV_SYN,
+        Keyboard        = EV_KEY,
+        Relative        = EV_REL,
+        Absolute        = EV_ABS,
+        Miscellaneous   = EV_MSC,
+        Led             = EV_LED,
+        Sound           = EV_SND,
+        AutoRepeat      = EV_REP,
+        ForceFeedback   = EV_FF,
+        PowerManagement = EV_PWR,
+        ForceFeedbackStatus = EV_FF_STATUS,
+    };
+    
+    enum Bus
+    {
+        PCI             = BUS_PCI,
+        ISAPNP          = BUS_ISAPNP,
+        HIL             = BUS_HIL,
+        BLUETOOTH       = BUS_BLUETOOTH,
+        ISA             = BUS_ISA,
+        I8042           = BUS_I8042,
+        XTKBD           = BUS_XTKBD,
+        RS232           = BUS_RS232,
+        GAMEPORT        = BUS_GAMEPORT,
+        PARPORT         = BUS_PARPORT,
+        AMIGA           = BUS_AMIGA,
+        ADB             = BUS_ADB,
+        I2C             = BUS_I2C,
+        HOST            = BUS_HOST,
+    };
+  
+  public:
+    OInputDevice( QObject* parent, const char* name = 0 );
+    ~OInputDevice();
+    
+  public:
+    QString identity() const;
+    QString path() const;
+    QString uniq() const;
+    
+  private:
+    int _fd;
+    input_id _id;
+
+};
+
 }
 }
 
 #endif // OINPUTSYSTEM_H
+
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
@@ -62,21 +62,21 @@ class OSoundSystem : public QObject
     typedef QDictIterator<OSoundCard> CardIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
-     * @returns a pointer to the (one and only) @ref ONetwork instance.
+     * @returns a pointer to the (one and only) @ref OSystem instance.
      */
     static OSoundSystem* instance();
     /**
-     * @returns an iterator usable for iterating through all network interfaces.
+     * @returns an iterator usable for iterating through all sound cards.
      */
     CardIterator iterator() const;
     /**
      * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found
      * @see OAudioInterface
      */
     OSoundCard* card( const QString& interface ) const;
     /**