From 7b4e718b849b20b4dc98fa2e14c7f541ee36fc15 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 14 Feb 2012 13:09:46 +0100 Subject: Add UDev helper class for evdev plugins Adopt evdevkeyboard plugin to use new UDev helper Change-Id: Ie914c77dde9a28a8cf7f7cd972acd963c13bc698 Reviewed-by: Laszlo Agocs --- .../generic/evdevkeyboard/evdevkeyboard.pro | 2 +- .../evdevkeyboard/qevdevkeyboardmanager.cpp | 188 ++++----------------- .../generic/evdevkeyboard/qevdevkeyboardmanager.h | 21 +-- 3 files changed, 43 insertions(+), 168 deletions(-) (limited to 'src/plugins/generic/evdevkeyboard') diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro index 47608b7154..82edf170a8 100644 --- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro +++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro @@ -10,7 +10,7 @@ HEADERS = \ qevdevkeyboardhandler.h \ qevdevkeyboardmanager.h -QT += core-private +QT += core-private platformsupport-private LIBS += -ludev diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp index cb23d3a49c..0938fdc2e4 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -42,28 +42,27 @@ #include "qevdevkeyboardmanager.h" #include -#include #include -#include -#include - //#define QT_QPA_KEYMAP_DEBUG +#ifdef QT_QPA_KEYMAP_DEBUG +#include +#endif + QT_BEGIN_NAMESPACE QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &specification) - : m_udev(0), m_udevMonitor(0), m_udevMonitorFileDescriptor(-1), m_udevSocketNotifier(0) { Q_UNUSED(key); - bool useUDev = false; + bool useUDev = true; QStringList args = specification.split(QLatin1Char(':')); QStringList devices; foreach (const QString &arg, args) { - if (arg.startsWith("udev") && !arg.contains("no")) { - useUDev = true; + if (arg.startsWith("udev") && arg.contains("no")) { + useUDev = false; } else if (arg.startsWith("/dev/")) { // if device is specified try to use it devices.append(arg); @@ -71,182 +70,69 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString & } } + // build new specification without /dev/ elements m_spec = args.join(":"); // add all keyboards for devices specified in the argument list foreach (const QString &device, devices) addKeyboard(device); - // no udev and no devices specified, try a fallback - if (!useUDev && devices.isEmpty()) { - addKeyboard(); - return; - } + if (useUDev) { +#ifdef QT_QPA_KEYMAP_DEBUG + qWarning() << "Use UDev for device discovery"; +#endif + + m_udeviceHelper = QUDeviceHelper::createUDeviceHelper(QUDeviceHelper::UDev_Keyboard, this); + if (m_udeviceHelper) { + // scan and add already connected keyboards + QStringList devices = m_udeviceHelper->scanConnectedDevices(); + foreach (QString device, devices) { + addKeyboard(device); + } - m_udev = udev_new(); - if (!m_udev) { - qWarning() << "Failed to read udev configuration. Try to open a keyboard without it"; - addKeyboard(); - } else { - // Look for already attached devices: - parseConnectedDevices(); - // Watch for device add/remove - startWatching(); + connect(m_udeviceHelper, SIGNAL(deviceDetected(QString,QUDeviceTypes)), this, SLOT(addKeyboard(QString))); + connect(m_udeviceHelper, SIGNAL(deviceRemoved(QString,QUDeviceTypes)), this, SLOT(removeKeyboard(QString))); + } } } QEvdevKeyboardManager::~QEvdevKeyboardManager() { - // cleanup udev related resources - stopWatching(); - if (m_udev) - udev_unref(m_udev); - - // cleanup all resources of connected keyboards qDeleteAll(m_keyboards); m_keyboards.clear(); } -void QEvdevKeyboardManager::addKeyboard(const QString &devnode) +void QEvdevKeyboardManager::addKeyboard(const QString &deviceNode) { +#ifdef QT_QPA_KEYMAP_DEBUG + qWarning() << "Adding keyboard at" << deviceNode; +#endif + QString specification = m_spec; - QString deviceString = devnode; - if (!deviceString.isEmpty()) { + if (!deviceNode.isEmpty()) { specification.append(":"); - specification.append(deviceString); - } else { - deviceString = "default"; + specification.append(deviceNode); } -#ifdef QT_QPA_KEYMAP_DEBUG - qWarning() << "Adding keyboard at" << deviceString; -#endif - QEvdevKeyboardHandler *keyboard; keyboard = QEvdevKeyboardHandler::createLinuxInputKeyboardHandler("EvdevKeyboard", specification); if (keyboard) - m_keyboards.insert(deviceString, keyboard); + m_keyboards.insert(deviceNode, keyboard); else - qWarning() << "Failed to open keyboard"; + qWarning("Failed to open keyboard"); } -void QEvdevKeyboardManager::removeKeyboard(const QString &devnode) +void QEvdevKeyboardManager::removeKeyboard(const QString &deviceNode) { - if (m_keyboards.contains(devnode)) { + if (m_keyboards.contains(deviceNode)) { #ifdef QT_QPA_KEYMAP_DEBUG - qWarning() << "Removing keyboard at" << devnode; + qWarning() << "Removing keyboard at" << deviceNode; #endif - QEvdevKeyboardHandler *keyboard = m_keyboards.value(devnode); - m_keyboards.remove(devnode); + QEvdevKeyboardHandler *keyboard = m_keyboards.value(deviceNode); + m_keyboards.remove(deviceNode); delete keyboard; } } -void QEvdevKeyboardManager::startWatching() -{ - m_udevMonitor = udev_monitor_new_from_netlink(m_udev, "udev"); - if (!m_udevMonitor) { -#ifdef QT_QPA_KEYMAP_DEBUG - qWarning("Unable to create an Udev monitor. No devices can be detected."); -#endif - return; - } - - udev_monitor_filter_add_match_subsystem_devtype(m_udevMonitor, "input", NULL); - udev_monitor_enable_receiving(m_udevMonitor); - m_udevMonitorFileDescriptor = udev_monitor_get_fd(m_udevMonitor); - - m_udevSocketNotifier = new QSocketNotifier(m_udevMonitorFileDescriptor, QSocketNotifier::Read, this); - connect(m_udevSocketNotifier, SIGNAL(activated(int)), this, SLOT(deviceDetected())); -} - -void QEvdevKeyboardManager::stopWatching() -{ - if (m_udevSocketNotifier) - delete m_udevSocketNotifier; - - if (m_udevMonitor) - udev_monitor_unref(m_udevMonitor); - - m_udevSocketNotifier = 0; - m_udevMonitor = 0; - m_udevMonitorFileDescriptor = 0; -} - -void QEvdevKeyboardManager::deviceDetected() -{ - if (!m_udevMonitor) - return; - - struct udev_device *dev; - dev = udev_monitor_receive_device(m_udevMonitor); - if (!dev) - return; - - if (qstrcmp(udev_device_get_action(dev), "add") == 0) { - checkDevice(dev); - } else { - // We can't determine what the device was, so we handle false positives outside of this class - QString str = udev_device_get_devnode(dev); - if (!str.isEmpty()) - removeKeyboard(str); - } - - udev_device_unref(dev); -} - -void QEvdevKeyboardManager::parseConnectedDevices() -{ - struct udev_enumerate *enumerate; - struct udev_list_entry *devices; - struct udev_list_entry *dev_list_entry; - struct udev_device *dev; - const char *str; - - enumerate = udev_enumerate_new(m_udev); - udev_enumerate_add_match_subsystem(enumerate, "input"); - udev_enumerate_scan_devices(enumerate); - devices = udev_enumerate_get_list_entry(enumerate); - - udev_list_entry_foreach(dev_list_entry, devices) { - str = udev_list_entry_get_name(dev_list_entry); - dev = udev_device_new_from_syspath(m_udev, str); - checkDevice(dev); - } - - udev_enumerate_unref(enumerate); -} - -void QEvdevKeyboardManager::checkDevice(udev_device *dev) -{ - const char *str; - QString devnode; - - str = udev_device_get_devnode(dev); - if (!str) - return; - - devnode = str; - - dev = udev_device_get_parent_with_subsystem_devtype(dev, "input", NULL); - if (!dev) - return; - - str = udev_device_get_sysattr_value(dev, "capabilities/key"); - QStringList val = QString(str).split(' ', QString::SkipEmptyParts); - - bool ok; - unsigned long long keys = val.last().toULongLong(&ok, 16); - if (!ok) - return; - - // Tests if the letter Q is valid for the device. We may want to alter this test, but it seems mostly reliable. - bool test = (keys >> KEY_Q) & 1; - if (test) { - addKeyboard(devnode); - return; - } -} - QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h index 3caed6ff43..c776af2ec5 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h @@ -44,12 +44,12 @@ #include "qevdevkeyboardhandler.h" +#include + #include #include #include -#include - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -62,24 +62,13 @@ public: ~QEvdevKeyboardManager(); private slots: - void deviceDetected(); + void addKeyboard(const QString &deviceNode = QString()); + void removeKeyboard(const QString &deviceNode); private: - void startWatching(); - void stopWatching(); - void parseConnectedDevices(); - void checkDevice(struct udev_device *dev); - - void addKeyboard(const QString &devnode = QString()); - void removeKeyboard(const QString &devnode); - QString m_spec; QHash m_keyboards; - - struct udev *m_udev; - struct udev_monitor *m_udevMonitor; - int m_udevMonitorFileDescriptor; - QSocketNotifier *m_udevSocketNotifier; + QUDeviceHelper *m_udeviceHelper; }; QT_END_HEADER -- cgit v1.2.3