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,48 +1,115 @@
+/*
+                             This file is part of the Opie Project
+              =.             (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           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 <opie2/odebug.h>
+#include <opie2/oinputsystem.h>
+
+using namespace Opie::Core;
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+
+#if 1
+
+int main( int argc, char** argv )
+{
+    OInputSystem* sys = OInputSystem::instance();
+    OInputSystem::DeviceIterator it = sys->iterator();
+
+    OInputDevice* dev = 0;
+    
+    while ( it.current() )
+    {
+        odebug << "DEMO: OInputSystem contains Device '" <<  it.current()->name() << "'" << oendl;
+        
+        dev = it.current();
+        
+        odebug << "========================================"
+            << "\nDevice: " << dev->name()
+            << "\nName: " << dev->identity()
+            << "\nPath: " << dev->path()
+            << "\nUniq: " << dev->uniq()
+            << oendl;
+    
+        ++it;
+    }
+}
+
+#else
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <cstdlib>
 #include <cstdio>
 #include <string>
 
 #include <sys/types.h>
 #include <linux/input.h>
 
 using std::string;
 
 const unsigned char     BUT1 = 0x01;
 const unsigned char     BUT2 = 0x04;
 const unsigned char     BUT3 = 0x02;
 const unsigned char     BUT4 = 0x40;
 const unsigned char     BUT5 = 0x80;
 
 #define     BITMASK( name, numbits )                                        \
     unsigned short  name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ];    \
     memset( name, 0, sizeof( name ) )
 
 #define     TEST_BIT( bitmask, bit )    \
     ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) )
 
 int Open_cPad()
 {
     size_t          MAX_DEVICES = 1;
     int             fd = -1;
     input_id        info;
 
     for( size_t i = 0; i < MAX_DEVICES; ++i )
     {
         string      devpath( "/dev/input/event0" );
 
         //devpath << (int)i;
 
         fd = open( devpath.c_str(), O_RDONLY, &info );
 
         if( fd >= 0 )
         {
             int version = -1;
             /* ioctl() accesses the underlying driver */
             if (ioctl(fd, EVIOCGVERSION, &version)) {
                 perror("evdev ioctl");
             }
 
             /* the EVIOCGVERSION ioctl() returns an int */
             /* so we unpack it and display it */
@@ -203,48 +270,49 @@ int main( int argc, char **argv )
 
         printf( "Type: %d, Code: %d, Value: %d\n", evbuf.type, evbuf.code, evbuf.value );
     }
 
 #endif
 #if 0
     unsigned char   buf[ 4 ];
 
     for(;;)
     {
         if( read( fd, buf, sizeof buf ) == -1 )
         {
             printf( "Read error\n" );
             goto hell;
         }
 
         printf( "Raw:\t%#x\t%#x\t%#x\t%#x\n", buf[ 0 ], buf[ 1 ], buf[ 2 ], buf[ 3 ] );
 
         int     dx = buf[ 1 ];
 
         if( ( buf[ 0 ] & 0x10 ) != 0 )
             dx -= 256;
 
         int     dy = - buf[ 2 ];
 
         if( ( buf[ 0 ] & 0x20 ) != 0 )
             dy += 256;
 
         printf( "( %d, %d )\t", dx, dy );
 
         if( buf[ 0 ] & BUT1 )
             printf( "Left\t" );
         if( buf[ 0 ] & BUT2 )
             printf( "Middle\t" );
         if( buf[ 0 ] & BUT3 )
             printf( "Right\t" );
 
         printf( "\n" );
     }
 #endif
 
     //close( fd );
 
     exit( EXIT_SUCCESS );
 hell:
     exit( EXIT_FAILURE );
 }
 
+#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
@@ -1,31 +1,142 @@
 /*
                              This file is part of the Opie Project
               =.             (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           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
@@ -1,48 +1,148 @@
 /*
                              This file is part of the Opie Project
               =.             (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           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.
 */
 
 #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
@@ -22,101 +22,101 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           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.
 
 */
 
 #ifndef OSOUNDSYSTEM_H
 #define OSOUNDSYSTEM_H
 
 #include <qobject.h>
 #include <qdict.h>
 #include <qmap.h>
 
 namespace Opie {
 namespace MM {
 
 class OAudioInterface;
 class OMixerInterface;
 class OSoundCard;
 
 /*======================================================================================
  * OSoundSystem
  *======================================================================================*/
 
 /**
  * @brief A container class for all audio interfaces
  *
  * This class provides access to all available audio/midi/sequencer interfaces of your computer.
  *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class OSoundSystem : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<OSoundCard> CardMap;
     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;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
 
   protected:
     OSoundSystem();
 
   private:
     static OSoundSystem* _instance;
     CardMap _interfaces;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OSoundCard
  *======================================================================================*/
 
 class OSoundCard : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor. Normally you don't create @ref OSoundCard objects yourself,
      * but access them via @ref OSoundSystem::card().
      */
     OSoundCard( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OSoundCard();
 
     bool hasMixer() const { return _audio; };
     bool hasAudio() const { return _mixer; };
 
     OAudioInterface* audio() const { return _audio; };