From 3aac6768f837da5df4924280ba2856106e647837 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 30 May 2012 21:38:22 -0700 Subject: Move evdev to platformsupport Also wraps various string literals with QLatin1String. Change-Id: Ia0681bfae00006d9e9ad51f05d0e0d0f45cf2cec Reviewed-by: Laszlo Agocs Reviewed-by: Donald Carr --- src/plugins/generic/evdevmouse/evdevmouse.pro | 10 +- src/plugins/generic/evdevmouse/main.cpp | 2 +- .../generic/evdevmouse/qevdevmousehandler.cpp | 233 --------------------- .../generic/evdevmouse/qevdevmousehandler.h | 86 -------- .../generic/evdevmouse/qevdevmousemanager.cpp | 163 -------------- .../generic/evdevmouse/qevdevmousemanager.h | 85 -------- 6 files changed, 2 insertions(+), 577 deletions(-) delete mode 100644 src/plugins/generic/evdevmouse/qevdevmousehandler.cpp delete mode 100644 src/plugins/generic/evdevmouse/qevdevmousehandler.h delete mode 100644 src/plugins/generic/evdevmouse/qevdevmousemanager.cpp delete mode 100644 src/plugins/generic/evdevmouse/qevdevmousemanager.h (limited to 'src/plugins/generic/evdevmouse') diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro index fb9c0e71b8..e61a187103 100644 --- a/src/plugins/generic/evdevmouse/evdevmouse.pro +++ b/src/plugins/generic/evdevmouse/evdevmouse.pro @@ -5,18 +5,10 @@ DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -HEADERS = qevdevmousehandler.h \ - qevdevmousemanager.h - QT += core-private platformsupport-private -SOURCES = main.cpp \ - qevdevmousehandler.cpp \ - qevdevmousemanager.cpp +SOURCES = main.cpp OTHER_FILES += \ evdevmouse.json -contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV -} diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index b49c183d7b..b1d4703902 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include "qevdevmousemanager.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp b/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp deleted file mode 100644 index 439d2c095a..0000000000 --- a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp +++ /dev/null @@ -1,233 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qevdevmousehandler.h" - -#include -#include -#include -#include -#include -#include - -#include -#include // overrides QT_OPEN - -#include - -#include -#include - -#include - -//#define QT_QPA_MOUSE_HANDLER_DEBUG - -QT_BEGIN_NAMESPACE - -QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QString &specification) -{ -#ifdef QT_QPA_MOUSE_HANDLER_DEBUG - qWarning() << "Try to create mouse handler for" << device << specification; -#endif - - bool compression = true; - int jitterLimit = 0; - - QStringList args = specification.split(QLatin1Char(':')); - foreach (const QString &arg, args) { - if (arg == "nocompress") - compression = false; - else if (arg.startsWith("dejitter=")) - jitterLimit = arg.mid(9).toInt(); - } - - int fd; - fd = qt_safe_open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0); - if (fd >= 0) { - return new QEvdevMouseHandler(device, fd, compression, jitterLimit); - } else { - qWarning("Cannot open mouse input device '%s': %s", qPrintable(device), strerror(errno)); - return 0; - } -} - -QEvdevMouseHandler::QEvdevMouseHandler(const QString &device, int fd, bool compression, int jitterLimit) - : m_device(device), m_fd(fd), m_notify(0), m_x(0), m_y(0), m_prevx(0), m_prevy(0), - m_compression(compression), m_buttons(0) -{ - setObjectName(QLatin1String("Evdev Mouse Handler")); - - m_jitterLimitSquared = jitterLimit * jitterLimit; - - // socket notifier for events on the mouse device - QSocketNotifier *notifier; - notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); - connect(notifier, SIGNAL(activated(int)), this, SLOT(readMouseData())); -} - -QEvdevMouseHandler::~QEvdevMouseHandler() -{ - if (m_fd >= 0) - qt_safe_close(m_fd); -} - -void QEvdevMouseHandler::sendMouseEvent() -{ - emit handleMouseEvent(m_x - m_prevx, m_y - m_prevy, m_buttons); - - m_prevx = m_x; - m_prevy = m_y; -} - -void QEvdevMouseHandler::readMouseData() -{ - struct ::input_event buffer[32]; - int n = 0; - bool posChanged = false; - bool pendingMouseEvent = false; - int eventCompressCount = 0; - forever { - int result = QT_READ(m_fd, reinterpret_cast(buffer) + n, sizeof(buffer) - n); - - if (result == 0) { - qWarning("Got EOF from the input device."); - return; - } else if (result < 0) { - if (errno != EINTR && errno != EAGAIN) { - qWarning("Could not read from input device: %s", strerror(errno)); - return; - } - } else { - n += result; - if (n % sizeof(buffer[0]) == 0) - break; - } - } - - n /= sizeof(buffer[0]); - - for (int i = 0; i < n; ++i) { - struct ::input_event *data = &buffer[i]; - //qDebug() << ">>" << hex << data->type << data->code << dec << data->value; - if (data->type == EV_ABS) { - if (data->code == ABS_X && m_x != data->value) { - m_x = data->value; - posChanged = true; - } else if (data->code == ABS_Y && m_y != data->value) { - m_y = data->value; - posChanged = true; - } - } else if (data->type == EV_REL) { - if (data->code == REL_X) { - m_x += data->value; - posChanged = true; - } else if (data->code == REL_Y) { - m_y += data->value; - posChanged = true; - } else if (data->code == ABS_WHEEL) { // vertical scroll - // data->value: 1 == up, -1 == down - int delta = 120 * data->value; - QWindowSystemInterface::handleWheelEvent(0, QPoint(m_x, m_y), - QPoint(m_x, m_y), - delta, Qt::Vertical); - } else if (data->code == ABS_THROTTLE) { // horizontal scroll - // data->value: 1 == right, -1 == left - int delta = 120 * -data->value; - QWindowSystemInterface::handleWheelEvent(0, QPoint(m_x, m_y), - QPoint(m_x, m_y), - delta, Qt::Horizontal); - } - } else if (data->type == EV_KEY && data->code == BTN_TOUCH) { - m_buttons = data->value ? Qt::LeftButton : Qt::NoButton; - - sendMouseEvent(); - pendingMouseEvent = false; - } else if (data->type == EV_KEY && data->code >= BTN_LEFT && data->code <= BTN_JOYSTICK) { - Qt::MouseButton button = Qt::NoButton; - // BTN_LEFT == 0x110 in kernel's input.h - // The range of possible mouse buttons ends just before BTN_JOYSTICK, value 0x120. - switch (data->code) { - case 0x110: button = Qt::LeftButton; break; // BTN_LEFT - case 0x111: button = Qt::RightButton; break; - case 0x112: button = Qt::MiddleButton; break; - case 0x113: button = Qt::ExtraButton1; break; // AKA Qt::BackButton - case 0x114: button = Qt::ExtraButton2; break; // AKA Qt::ForwardButton - case 0x115: button = Qt::ExtraButton3; break; // AKA Qt::TaskButton - case 0x116: button = Qt::ExtraButton4; break; - case 0x117: button = Qt::ExtraButton5; break; - case 0x118: button = Qt::ExtraButton6; break; - case 0x119: button = Qt::ExtraButton7; break; - case 0x11a: button = Qt::ExtraButton8; break; - case 0x11b: button = Qt::ExtraButton9; break; - case 0x11c: button = Qt::ExtraButton10; break; - case 0x11d: button = Qt::ExtraButton11; break; - case 0x11e: button = Qt::ExtraButton12; break; - case 0x11f: button = Qt::ExtraButton13; break; - } - if (data->value) - m_buttons |= button; - else - m_buttons &= ~button; - sendMouseEvent(); - pendingMouseEvent = false; - } else if (data->type == EV_SYN && data->code == SYN_REPORT) { - if (posChanged) { - posChanged = false; - if (m_compression) { - pendingMouseEvent = true; - eventCompressCount++; - } else { - sendMouseEvent(); - } - } - } else if (data->type == EV_MSC && data->code == MSC_SCAN) { - // kernel encountered an unmapped key - just ignore it - continue; - } - } - if (m_compression && pendingMouseEvent) { - int distanceSquared = (m_x - m_prevx)*(m_x - m_prevx) + (m_y - m_prevy)*(m_y - m_prevy); - if (distanceSquared > m_jitterLimitSquared) - sendMouseEvent(); - } -} - -QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevmouse/qevdevmousehandler.h b/src/plugins/generic/evdevmouse/qevdevmousehandler.h deleted file mode 100644 index e3444735fe..0000000000 --- a/src/plugins/generic/evdevmouse/qevdevmousehandler.h +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QEVDEVMOUSEHANDLER_H -#define QEVDEVMOUSEHANDLER_H - -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -class QSocketNotifier; - -class QEvdevMouseHandler : public QObject -{ - Q_OBJECT -public: - static QEvdevMouseHandler *create(const QString &device, const QString &specification); - ~QEvdevMouseHandler(); - -signals: - void handleMouseEvent(int x, int y, Qt::MouseButtons buttons); - -private slots: - void readMouseData(); - -private: - QEvdevMouseHandler(const QString &device, int fd, bool compression, int jitterLimit); - - void sendMouseEvent(); - - QString m_device; - int m_fd; - QSocketNotifier *m_notify; - int m_x, m_y; - int m_prevx, m_prevy; - bool m_compression; - Qt::MouseButtons m_buttons; - int m_jitterLimitSquared; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QEVDEVMOUSEHANDLER_H diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp b/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp deleted file mode 100644 index 132161c176..0000000000 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp +++ /dev/null @@ -1,163 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qevdevmousemanager.h" - -#include -#include -#include -#include - -//#define QT_QPA_MOUSEMANAGER_DEBUG - -#ifdef QT_QPA_MOUSEMANAGER_DEBUG -#include -#endif - -QT_BEGIN_NAMESPACE - -QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent) - : QObject(parent), m_x(0), m_y(0), m_xoffset(0), m_yoffset(0) -{ - Q_UNUSED(key); - - QStringList args = specification.split(QLatin1Char(':')); - QStringList devices; - - foreach (const QString &arg, args) { - if (arg.startsWith("/dev/")) { - // if device is specified try to use it - devices.append(arg); - args.removeAll(arg); - } else if (arg.startsWith("xoffset=")) { - m_xoffset = arg.mid(8).toInt(); - } else if (arg.startsWith("yoffset=")) { - m_yoffset = arg.mid(8).toInt(); - } - } - - // build new specification without /dev/ elements - m_spec = args.join(":"); - - // add all mice for devices specified in the argument list - foreach (const QString &device, devices) - addMouse(device); - - if (devices.isEmpty()) { -#ifdef QT_QPA_MOUSEMANAGER_DEBUG - qWarning() << "Use device discovery"; -#endif - - m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this); - if (m_deviceDiscovery) { - // scan and add already connected keyboards - QStringList devices = m_deviceDiscovery->scanConnectedDevices(); - foreach (QString device, devices) { - addMouse(device); - } - - connect(m_deviceDiscovery, SIGNAL(deviceDetected(QString)), this, SLOT(addMouse(QString))); - connect(m_deviceDiscovery, SIGNAL(deviceRemoved(QString)), this, SLOT(removeMouse(QString))); - } - } -} - -QEvdevMouseManager::~QEvdevMouseManager() -{ - qDeleteAll(m_mice); - m_mice.clear(); -} - -void QEvdevMouseManager::handleMouseEvent(int x, int y, Qt::MouseButtons buttons) -{ - // update current absolute coordinates - m_x += x; - m_y += y; - - // clamp to screen geometry - QRect g = QGuiApplication::primaryScreen()->virtualGeometry(); - if (m_x + m_xoffset < g.left()) - m_x = g.left() - m_xoffset; - else if (m_x + m_xoffset > g.right()) - m_x = g.right() - m_xoffset; - - if (m_y + m_yoffset < g.top()) - m_y = g.top() - m_yoffset; - else if (m_y + m_yoffset > g.bottom()) - m_y = g.bottom() - m_yoffset; - - QPoint pos(m_x + m_xoffset, m_y + m_yoffset); - QWindowSystemInterface::handleMouseEvent(0, pos, pos, buttons); - -#ifdef QT_QPA_MOUSEMANAGER_DEBUG - qDebug("mouse event %d %d %d", pos.x(), pos.y(), int(buttons)); -#endif -} - -void QEvdevMouseManager::addMouse(const QString &deviceNode) -{ -#ifdef QT_QPA_MOUSEMANAGER_DEBUG - qWarning() << "Adding mouse at" << deviceNode; -#endif - - QEvdevMouseHandler *handler; - handler = QEvdevMouseHandler::create(deviceNode, m_spec); - if (handler) { - connect(handler, SIGNAL(handleMouseEvent(int, int, Qt::MouseButtons)), this, SLOT(handleMouseEvent(int, int, Qt::MouseButtons))); - m_mice.insert(deviceNode, handler); - } else { - qWarning("Failed to open mouse"); - } -} - -void QEvdevMouseManager::removeMouse(const QString &deviceNode) -{ - if (m_mice.contains(deviceNode)) { -#ifdef QT_QPA_MOUSEMANAGER_DEBUG - qWarning() << "Removing mouse at" << deviceNode; -#endif - QEvdevMouseHandler *handler = m_mice.value(deviceNode); - m_mice.remove(deviceNode); - delete handler; - } -} - -QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.h b/src/plugins/generic/evdevmouse/qevdevmousemanager.h deleted file mode 100644 index ee528de15c..0000000000 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QEVDEVMOUSEMANAGER_H -#define QEVDEVMOUSEMANAGER_H - -#include "qevdevmousehandler.h" - -#include - -#include -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -class QEvdevMouseManager : public QObject -{ - Q_OBJECT -public: - QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent = 0); - ~QEvdevMouseManager(); - -public slots: - void handleMouseEvent(int x, int y, Qt::MouseButtons buttons); - -private slots: - void addMouse(const QString &deviceNode = QString()); - void removeMouse(const QString &deviceNode); - -private: - QString m_spec; - QHash m_mice; - QDeviceDiscovery *m_deviceDiscovery; - int m_x; - int m_y; - int m_xoffset; - int m_yoffset; -}; - -QT_END_HEADER - -QT_END_NAMESPACE - -#endif // QEVDEVMOUSEMANAGER_H -- cgit v1.2.3