AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add joystick/gamepad recognition to device discovery

Browse Source 
And to keep things readable, migrate to categorized logging.

Change-Id: Ie9d82bb4e93d3b96f1a7bf54a37cfde4a941bc7d
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2015-03-07 16:06:58 +01:00
parent 0fce009f1c
commit 3fea1e53a1
3 changed files with 37 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platformsupport/devicediscovery/qdevicediscovery_p.h
View File

@ -74,7 +74,8 @@ public:
Device_DRM = 0x10,
Device_DRM_PrimaryGPU = 0x20,
Device_Tablet = 0x40,
Device_InputMask = Device_Mouse | Device_Touchpad | Device_Touchscreen | Device_Keyboard | Device_Tablet,
Device_Joystick = 0x80,
Device_InputMask = Device_Mouse | Device_Touchpad | Device_Touchscreen | Device_Keyboard | Device_Tablet | Device_Joystick,
Device_VideoMask = Device_DRM
};
Q_DECLARE_FLAGS(QDeviceTypes, QDeviceType)

53
src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
View File

@ -38,6 +38,7 @@
#include <QObject>
#include <QHash>
#include <QDir>
#include <QLoggingCategory>
#include <QtCore/private/qcore_unix_p.h>
#include <linux/input.h>
@ -56,13 +57,6 @@
#define ABS_CNT (ABS_MAX+1)
#endif
//#define QT_QPA_DEVICE_DISCOVERY_DEBUG
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
#include <QtDebug>
#endif
#define LONG_BITS (sizeof(long) * 8 )
#define LONG_FIELD_SIZE(bits) ((bits / LONG_BITS) + 1)
@ -73,6 +67,8 @@ static bool testBit(long bit, const long *field)
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcDD, "qt.qpa.input")
QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent)
{
return new QDeviceDiscoveryStatic(types, parent);
@ -81,9 +77,7 @@ QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent)
QDeviceDiscoveryStatic::QDeviceDiscoveryStatic(QDeviceTypes types, QObject *parent)
: QDeviceDiscovery(types, parent)
{
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "New DeviceDiscovery created for type" << types;
#endif
qCDebug(lcDD) << "static device discovery for type" << types;
}
QStringList QDeviceDiscoveryStatic::scanConnectedDevices()
@ -112,9 +106,7 @@ QStringList QDeviceDiscoveryStatic::scanConnectedDevices()
}
}
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found matching devices" << devices;
#endif
qCDebug(lcDD) << "Found matching devices" << devices;
return devices;
}
@ -124,9 +116,7 @@ bool QDeviceDiscoveryStatic::checkDeviceType(const QString &device)
bool ret = false;
int fd = QT_OPEN(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
if (!fd) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery cannot open device" << device;
#endif
qWarning() << "Device discovery cannot open device" << device;
return false;
}
@ -134,9 +124,7 @@ bool QDeviceDiscoveryStatic::checkDeviceType(const QString &device)
if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(bitsKey)), bitsKey) >= 0 ) {
if (!ret && (m_types & Device_Keyboard)) {
if (testBit(KEY_Q, bitsKey)) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found keyboard at" << device;
#endif
qCDebug(lcDD) << "Found keyboard at" << device;
ret = true;
}
}
@ -145,9 +133,7 @@ bool QDeviceDiscoveryStatic::checkDeviceType(const QString &device)
long bitsRel[LONG_FIELD_SIZE(REL_CNT)];
if (ioctl(fd, EVIOCGBIT(EV_REL, sizeof(bitsRel)), bitsRel) >= 0 ) {
if (testBit(REL_X, bitsRel) && testBit(REL_Y, bitsRel) && testBit(BTN_MOUSE, bitsKey)) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found mouse at" << device;
#endif
qCDebug(lcDD) << "Found mouse at" << device;
ret = true;
}
}
@ -158,24 +144,29 @@ bool QDeviceDiscoveryStatic::checkDeviceType(const QString &device)
if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(bitsAbs)), bitsAbs) >= 0 ) {
if (testBit(ABS_X, bitsAbs) && testBit(ABS_Y, bitsAbs)) {
if ((m_types & Device_Touchpad) && testBit(BTN_TOOL_FINGER, bitsKey)) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found touchpad at" << device;
#endif
qCDebug(lcDD) << "Found touchpad at" << device;
ret = true;
} else if ((m_types & Device_Touchscreen) && testBit(BTN_TOUCH, bitsKey)) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found touchscreen at" << device;
#endif
qCDebug(lcDD) << "Found touchscreen at" << device;
ret = true;
} else if ((m_types & Device_Tablet) && (testBit(BTN_STYLUS, bitsKey) || testBit(BTN_TOOL_PEN, bitsKey))) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "DeviceDiscovery found tablet at" << device;
#endif
qCDebug(lcDD) << "Found tablet at" << device;
ret = true;
}
}
}
}
if (!ret && (m_types & Device_Joystick)) {
long bitsAbs[LONG_FIELD_SIZE(ABS_CNT)];
if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(bitsAbs)), bitsAbs) >= 0 ) {
if ((m_types & Device_Joystick)
&& (testBit(BTN_A, bitsKey) || testBit(BTN_TRIGGER, bitsKey) || testBit(ABS_RX, bitsAbs))) {
qCDebug(lcDD) << "Found joystick/gamepad at" << device;
ret = true;
}
}
}
}
if (!ret && (m_types & Device_DRM) && device.contains(QString::fromLatin1(QT_DRM_DEVICE_PREFIX)))

36
src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp
View File

@ -38,22 +38,17 @@
#include <QObject>
#include <QHash>
#include <QSocketNotifier>
#include <QLoggingCategory>
#include <linux/input.h>
//#define QT_QPA_DEVICE_DISCOVERY_DEBUG
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
#include <QtDebug>
#endif
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcDD, "qt.qpa.input")
QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent)
{
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "Try to create new UDeviceHelper";
#endif
qCDebug(lcDD) << "udev device discovery for type" << types;
QDeviceDiscovery *helper = 0;
struct udev *udev;
@ -62,7 +57,7 @@ QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent)
if (udev) {
helper = new QDeviceDiscoveryUDev(types, udev, parent);
} else {
qWarning("Failed to get udev library context.");
qWarning("Failed to get udev library context");
}
return helper;
@ -72,18 +67,12 @@ QDeviceDiscoveryUDev::QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev
QDeviceDiscovery(types, parent),
m_udev(udev), m_udevMonitor(0), m_udevMonitorFileDescriptor(-1), m_udevSocketNotifier(0)
{
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "New UDeviceHelper created for type" << types;
#endif
if (!m_udev)
return;
m_udevMonitor = udev_monitor_new_from_netlink(m_udev, "udev");
if (!m_udevMonitor) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning("Unable to create an Udev monitor. No devices can be detected.");
#endif
qWarning("Unable to create an udev monitor. No devices can be detected.");
return;
}
@ -128,11 +117,11 @@ QStringList QDeviceDiscoveryUDev::scanConnectedDevices()
}
if (m_types & Device_Tablet)
udev_enumerate_add_match_property(ue, "ID_INPUT_TABLET", "1");
if (m_types & Device_Joystick)
udev_enumerate_add_match_property(ue, "ID_INPUT_JOYSTICK", "1");
if (udev_enumerate_scan_devices(ue) != 0) {
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "UDeviceHelper scan connected devices for enumeration failed";
#endif
qWarning("Failed to scan devices");
return devices;
}
@ -158,9 +147,7 @@ QStringList QDeviceDiscoveryUDev::scanConnectedDevices()
}
udev_enumerate_unref(ue);
#ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG
qWarning() << "UDeviceHelper found matching devices" << devices;
#endif
qCDebug(lcDD) << "Found matching devices" << devices;
return devices;
}
@ -251,6 +238,9 @@ bool QDeviceDiscoveryUDev::checkDeviceType(udev_device *dev)
if ((m_types & Device_Tablet) && (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0))
return true;
if ((m_types & Device_Joystick) && (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK"), "1") == 0))
return true;
if ((m_types & Device_DRM) && (qstrcmp(udev_device_get_subsystem(dev), "drm") == 0))
return true;