add skeleton for oinputsystem classes (thin wrapper of Linux Input Subsystem API)

8 files changed, 355 insertions, 3 deletions

diff --git a/examples/opiecore/oinputsystemdemo/.cvsignore b/examples/opiecore/oinputsystemdemo/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/examples/opiecore/oinputsystemdemo/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
new file mode 100644
index 0000000..89209a7
--- a/dev/null
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -0,0 +1,250 @@
+#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 */
+            printf("evdev driver version is %d.%d.%d\n",
+                version >> 16, (version >> 8) & 0xff,
+                version & 0xff);
+
+            // Get Identifying info
+
+            if( ioctl( fd, EVIOCGID, &info) )
+            {
+                perror( "event device ioctl" );
+                return -1;
+            }
+            printf( "Bus: %#x,  Vendor: %#x, Product: %#x, Version: %#x\n",
+                    info.bustype, info.vendor, info.product, info.version );
+
+            switch ( info.bustype)
+            {
+                case BUS_PCI :
+                    printf(" is on a PCI bus\n");
+                    break;
+                case BUS_USB :
+                    printf(" is on a Universal Serial Bus\n");
+                    break;
+                /* ... */
+            }
+
+            // Get device 'name'
+
+            char    name[256] = "Unknown";
+            if( ioctl( fd, EVIOCGNAME(sizeof name ), name) < 0 )
+            {
+                perror( "event device ioctl" );
+            }else
+            printf( "Device name '%s'\n", name );
+
+            if(ioctl(fd, EVIOCGPHYS(sizeof(name)), name) < 0) {
+                perror("event ioctl");
+            }else
+            printf("Device path '%s'\n", name );
+
+            if(ioctl(fd, EVIOCGUNIQ(sizeof(name)), name) < 0) {
+                perror("event ioctl");
+            }else
+            printf("Device identity '%s'\n", name );
+
+            // Get feature types
+
+            BITMASK( features, EV_MAX );
+
+            if( ioctl( fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+            {
+                perror( "event device ioctl" );
+                return -1;
+            }
+
+            printf( "Supported features:\n" );
+            for( size_t bit = 0; bit < EV_MAX; ++bit )
+            {
+                if( TEST_BIT( features, bit ) )
+                {
+                    switch( bit )
+                    {
+                        case EV_SYN :
+                            printf("  Sync. Events\n");
+                            break;
+                        //case EV_RST:
+                        //    printf( "  Reset?\n" );
+                        //    break;
+                        case EV_KEY:
+                            printf( "  Keys or buttons\n" );
+                            break;
+                        case EV_REL:
+                            printf( "  Relative axes\n" );
+                            break;
+                        case EV_ABS:
+                            printf( "  Absolute  axes\n" );
+                            break;
+                        case EV_MSC:
+                            printf( "  Misc\n" );
+                            break;
+                        case EV_LED:
+                            printf( "  Led's\n" );
+                            break;
+                        case EV_SND:
+                            printf( "  Sounds\n" );
+                            break;
+                        case EV_REP:
+                            printf( "  Repeat\n" );
+                            break;
+                        case EV_FF : // fallthrough
+                        case EV_FF_STATUS:
+                            printf("   Force Feedback\n");
+                            break;
+                        case EV_PWR:
+                            printf("   Power Management\n");
+                            break;
+                       default:
+                            printf( " Unknown (bit %d)\n", bit );
+                    }
+                }
+            }
+
+            // Check keystate
+
+            BITMASK( keys, KEY_MAX );
+
+            if( ioctl( fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
+            {
+                perror( "event device ioctl" );
+                return -1;
+            }
+
+            printf( "Key global status:\n" );
+            for( size_t bit = 0; bit < KEY_MAX; ++bit )
+            {
+                if( TEST_BIT( keys, bit ) )
+                {
+                    printf( "Key (bit %d) active\n", bit );
+                }
+            }
+        }
+        else
+            printf( "Failed to open device\n" );
+
+        close( fd );
+    }
+    return fd;
+}
+
+
+int main( int argc, char **argv )
+{
+    //printf(" Long: %d, int %d, short %d\n", sizeof( long ), sizeof( int ), sizeof(  short ) );
+    //printf( "num chars %d\n", snprintf( NULL, 0, 0 ) );
+    //exit( 0 );
+    Open_cPad();
+
+#if 1
+    int     fd = open( "/dev/input/event0", O_RDONLY );
+
+    if( fd == -1 )
+    {
+        printf( "Failed to open device\n" );
+        goto hell;
+    }
+
+    struct input_event  evbuf;
+
+    for(;;)
+    {
+        if( read( fd, &evbuf, sizeof evbuf ) == -1 )
+        {
+            printf( "Read error\n" );
+            goto hell;
+        }
+
+        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 );
+}
+
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.pro b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.pro
new file mode 100644
index 0000000..0a53a5e
--- a/dev/null
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.pro
@@ -0,0 +1,16 @@
+TEMPLATE        = app
+CONFIG          = qt warn_on
+HEADERS         =
+SOURCES         = oinputsystemdemo.cpp
+INCLUDEPATH     += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
+LIBS            += -lopiecore2 -lopieui2
+TARGET          = oinputsystemdemo
+
+!contains( platform, x11 ) {
+  include( $(OPIEDIR)/include.pro )
+}
+
+contains( platform, x11 ) {
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+}
diff --git a/examples/opiecore/onotifydemo/onotifydemo.pro b/examples/opiecore/onotifydemo/onotifydemo.pro
index d2c9138..1c1040c 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.pro
+++ b/examples/opiecore/onotifydemo/onotifydemo.pro
@@ -15,4 +15,3 @@ contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }
 
-MOC_DIR = moc
diff --git a/examples/opiecore/opiecore.pro b/examples/opiecore/opiecore.pro
index 39ffd3b..1f86a40 100644
--- a/examples/opiecore/opiecore.pro
+++ b/examples/opiecore/opiecore.pro
@@ -1,2 +1,2 @@
 TEMPLATE        = subdirs
-unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo onotifydemo oprocessdemo oplugins
+unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo onotifydemo oprocessdemo oplugins oinputsystemdemo
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
new file mode 100644
index 0000000..c33d5c8
--- a/dev/null
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -0,0 +1,31 @@
+/*
+                             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;
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
new file mode 100644
index 0000000..2bcdc3a
--- a/dev/null
+++ b/libopie2/opiecore/oinputsystem.h
@@ -0,0 +1,48 @@
+/*
+                             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
+
+#include <qobject.h>
+
+namespace Opie {
+namespace Core {
+
+/**
+  * ...
+  * 
+  */
+
+class OInputSystem : public QObject
+{
+};
+}
+}
+
+#endif // OINPUTSYSTEM_H
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index f133433..8f76c48 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -6,6 +6,7 @@ HEADERS     = oapplication.h            \
               odebug.h                  \
               oglobal.h                 \
               oglobalsettings.h         \
+              oinputsystem.h            \
               okeyconfigmanager.h       \
               okeyfilter.h              \
 	      opluginloader.h           \
@@ -21,6 +22,7 @@ SOURCES     = oapplication.cpp          \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp       \
+              oinputsystem.cpp          \
               okeyconfigmanager.cpp     \
               okeyfilter.cpp            \
 	      opluginloader.cpp         \
@@ -46,7 +48,7 @@ include( device/device.pro )
 
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.9.2
+VERSION     = 1.9.3
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include