summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp46
-rw-r--r--libopie2/opiecore/oinputsystem.cpp15
-rw-r--r--libopie2/opiecore/oinputsystem.h7
3 files changed, 45 insertions, 23 deletions
diff --git a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
index 5450966..a9c0fd2 100644
--- a/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
+++ b/examples/opiecore/oinputsystemdemo/oinputsystemdemo.cpp
@@ -35,41 +35,66 @@ using namespace Opie::Core;
#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;
+ odebug << "DEMO: OInputSystem contains OInputDevice '" << it.current()->name() << "'" << oendl;
dev = it.current();
+ QString features;
+ features += QString( "\nSynchronous: " );
+ if ( dev->hasFeature( OInputDevice::Synchronous ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nKeys or Buttons: " );
+ if ( dev->hasFeature( OInputDevice::Keys ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nRelative Axes: " );
+ if ( dev->hasFeature( OInputDevice::Relative ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nAbsolute Axes: " );
+ if ( dev->hasFeature( OInputDevice::Absolute ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nMiscellaneous: " );
+ if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nLeds: " );
+ if ( dev->hasFeature( OInputDevice::Leds ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nSound: " );
+ if ( dev->hasFeature( OInputDevice::Sound ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nAutoRepeat " );
+ if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nForceFeedback: " );
+ if ( dev->hasFeature( OInputDevice::ForceFeedback ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nPowerManagement: " );
+ if ( dev->hasFeature( OInputDevice::PowerManagement ) ) features += "[ x ]"; else features += "[ ]";
+ features += QString( "\nFeedbackStatus: " );
+ if ( dev->hasFeature( OInputDevice::ForceFeedbackStatus ) ) features += "[ x ]"; else features += "[ ]";
+
odebug << "========================================"
<< "\nDevice: " << dev->name()
<< "\nName: " << dev->identity()
<< "\nPath: " << dev->path()
<< "\nUniq: " << dev->uniq()
+ << features << "\n"
<< oendl;
++it;
}
}
#else
#include <fcntl.h>
#include <unistd.h>
#include <cstdlib>
#include <cstdio>
#include <string>
#include <sys/types.h>
#include <linux/input.h>
@@ -125,51 +150,32 @@ int Open_cPad()
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 )
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index bfdc31f..fde36c3 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -27,32 +27,37 @@
*/
#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
+#define BIT_MASK( name, numbits ) \
+ unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \
+ memset( name, 0, sizeof( name ) )
+#define BIT_TEST( bitmask, bit ) \
+ ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) * 8))) )
/*======================================================================================
* OInputSystem
*======================================================================================*/
OInputSystem* OInputSystem::_instance = 0;
OInputSystem::OInputSystem() : QObject()
{
qDebug( "OInputSystem::OInputSystem()" );
synchronize();
}
void OInputSystem::synchronize()
{
@@ -127,16 +132,26 @@ QString OInputDevice::identity() const
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;
}
+bool OInputDevice::hasFeature( Feature bit ) const
+{
+ BIT_MASK( features, EV_MAX );
+
+ if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+ return false;
+ else
+ return BIT_TEST( features, bit );
+}
+
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 350656b..4d913a1 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -80,40 +80,40 @@ class OInputSystem : public QObject
* @internal desctructor
*/
~OInputSystem();
protected:
OInputSystem();
static OInputSystem* _instance;
DeviceMap _devices;
};
class OInputDevice : public QObject
{
public:
- enum EventType
+ enum Feature
{
Synchronous = EV_SYN,
- Keyboard = EV_KEY,
+ Keys = EV_KEY,
Relative = EV_REL,
Absolute = EV_ABS,
Miscellaneous = EV_MSC,
- Led = EV_LED,
+ Leds = 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,
@@ -121,28 +121,29 @@ class OInputDevice : public QObject
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;
+ bool hasFeature( Feature ) const;
private:
int _fd;
input_id _id;
};
}
}
#endif // OINPUTSYSTEM_H