summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oinputsystem.cpp25
-rw-r--r--libopie2/opiecore/oinputsystem.h27
2 files changed, 49 insertions, 3 deletions
diff --git a/libopie2/opiecore/oinputsystem.cpp b/libopie2/opiecore/oinputsystem.cpp
index 29de35c..d1a28f5 100644
--- a/libopie2/opiecore/oinputsystem.cpp
+++ b/libopie2/opiecore/oinputsystem.cpp
@@ -105,68 +105,93 @@ OInputSystem::DeviceIterator OInputSystem::iterator() const
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;
}
bool OInputDevice::hasFeature( Feature bit ) const
{
BIT_MASK( features, EV_MAX );
if( ioctl( _fd, EVIOCGBIT( 0, EV_MAX ), features) < 0 )
+ {
+ perror( "EVIOCGBIT" );
return false;
+ }
else
return BIT_TEST( features, bit );
}
bool OInputDevice::isHeld( Key bit ) const
{
BIT_MASK( keys, KEY_MAX );
if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
{
perror( "EVIOCGKEY" );
return false;
}
else
{
return BIT_TEST( keys, bit );
}
}
+
+
+QString OInputDevice::globalKeyMask() const
+{
+ BIT_MASK( keys, KEY_MAX );
+
+ if( ioctl( _fd, EVIOCGKEY( sizeof(keys) ), keys ) < 0 )
+ {
+ perror( "EVIOCGKEY" );
+ }
+ else
+ {
+ QString keymask;
+ for ( int i = 0; i < KEY_MAX; ++i )
+ {
+ if ( BIT_TEST( keys, i ) ) keymask.append( QString().sprintf( "%0d, ", i ) );
+ }
+ return keymask;
+
+ }
+}
+
diff --git a/libopie2/opiecore/oinputsystem.h b/libopie2/opiecore/oinputsystem.h
index 9020bc1..7919610 100644
--- a/libopie2/opiecore/oinputsystem.h
+++ b/libopie2/opiecore/oinputsystem.h
@@ -31,86 +31,107 @@
#include "linux_input.h"
/* QT */
#include <qobject.h>
#include <qdict.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
+ * @internal destructor
*/
~OInputSystem();
protected:
OInputSystem();
static OInputSystem* _instance;
DeviceMap _devices;
};
class OInputDevice : public QObject
{
public:
OInputDevice( QObject* parent, const char* name = 0 );
~OInputDevice();
#include "oinputsystemenums.h"
public:
+ /**
+ * @returns the identity string of this input device
+ */
QString identity() const;
+ /**
+ * @returns the path of this input device
+ */
QString path() const;
+ /**
+ * @returns a unique identifier for this input device
+ * @note Only a few devices support this
+ */
QString uniq() const;
- bool hasFeature( Feature ) const;
- bool isHeld( Key ) const;
+ /**
+ * @returns whether a certain @a Feature is being supported by this device
+ */
+ bool hasFeature( Feature ) const;
+ /**
+ * @returns whether a given @a Key or Button is being held at the moment
+ */
+ bool isHeld( Key ) const;
+ /**
+ * @internal
+ * @returns a string containing a printable form of the global keymask
+ */
+ QString globalKeyMask() const;
private:
int _fd;
input_id _id;
};
}
}
#endif // OINPUTSYSTEM_H