Add USB HID device feature to INTEGRITY
This change adds USB mouse handling support for INTEGRITY Change-Id: I8a2a51c8c3578898e90dd5bbb01f6aed6c64e2a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Nikola Velinov <nvelinov@ghs.com> Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Tero Alamaki <tero.alamaki@qt.io>bb10
Kimmo Ollila
parent
64a4216254
commit
88f30250eb
|
|
@ -0,0 +1,52 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the config.tests of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <device/hiddriver.h>
|
||||
|
||||
int main(int, char **)
|
||||
{
|
||||
HIDDriver *driver;
|
||||
uintptr_t devicecontext;
|
||||
uint32_t device_id;
|
||||
gh_hid_enum_devices(driver, &device_id, &devicecontext);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
SOURCES = integrityhid.cpp
|
||||
CONFIG -= qt
|
||||
|
|
@ -149,6 +149,13 @@
|
|||
{ "type": "pkgConfig", "args": "libinput" }
|
||||
]
|
||||
},
|
||||
"integrityhid": {
|
||||
"label": "integrityhid",
|
||||
"test": "qpa/integrityhid",
|
||||
"sources": [
|
||||
{ "libs": "-lhiddev -lusbhid -lusb" }
|
||||
]
|
||||
},
|
||||
"libjpeg": {
|
||||
"label": "libjpeg",
|
||||
"test": "unix/libjpeg",
|
||||
|
|
@ -528,6 +535,11 @@
|
|||
"condition": "features.libudev && libs.libinput",
|
||||
"output": [ "privateFeature" ]
|
||||
},
|
||||
"integrityhid": {
|
||||
"label": "INTEGRITY HID",
|
||||
"condition": "config.integrity && libs.integrityhid",
|
||||
"output": [ "privateFeature" ]
|
||||
},
|
||||
"libinput-axis-api": {
|
||||
"label": "axis API in libinput",
|
||||
"condition": "features.libinput && tests.libinput_axis_api",
|
||||
|
|
@ -1115,6 +1127,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
|
|||
"entries": [
|
||||
"evdev",
|
||||
"libinput",
|
||||
"integrityhid",
|
||||
"mtdev",
|
||||
"tslib",
|
||||
"xkbcommon-evdev"
|
||||
|
|
|
|||
|
|
@ -28,4 +28,8 @@ qtConfig(evdev)|qtConfig(libinput) {
|
|||
include($$PWD/shared/shared.pri)
|
||||
}
|
||||
|
||||
qtConfig(integrityhid) {
|
||||
include($$PWD/integrityhid/integrityhid.pri)
|
||||
}
|
||||
|
||||
load(qt_module)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
HEADERS += \
|
||||
$$PWD/qintegrityhidmanager.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/qintegrityhidmanager.cpp
|
||||
|
||||
QMAKE_USE_PRIVATE += integrityhid
|
||||
|
|
@ -0,0 +1,263 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 Green Hills Software
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qintegrityhidmanager.h"
|
||||
#include <QList>
|
||||
#include <QPoint>
|
||||
#include <QGuiApplication>
|
||||
#include <qpa/qwindowsysteminterface.h>
|
||||
#include <device/hiddriver.h>
|
||||
#include <private/qguiapplication_p.h>
|
||||
#include <private/qinputdevicemanager_p_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class IntNotifier
|
||||
{
|
||||
static const Value ActivityPriority = 2;
|
||||
protected:
|
||||
Activity act;
|
||||
public:
|
||||
IntNotifier()
|
||||
{
|
||||
CheckSuccess(CreateActivity(CurrentTask(), ActivityPriority, false, (Value)this, &act));
|
||||
};
|
||||
~IntNotifier()
|
||||
{
|
||||
CheckSuccess(CloseActivity(act));
|
||||
};
|
||||
virtual void process_event() = 0;
|
||||
virtual void async_wait() = 0;
|
||||
};
|
||||
|
||||
class HIDDeviceHandler : IntNotifier
|
||||
{
|
||||
public:
|
||||
HIDDeviceHandler(HIDDriver *hidd, HIDHandle hidh)
|
||||
: driver(hidd), handle(hidh), currentPos(0, 0) { }
|
||||
~HIDDeviceHandler()
|
||||
{
|
||||
CheckSuccess(gh_hid_close(handle));
|
||||
};
|
||||
void process_event(void) Q_DECL_OVERRIDE;
|
||||
void async_wait(void) Q_DECL_OVERRIDE;
|
||||
HIDDriver *get_driver(void) { return driver; };
|
||||
HIDHandle get_handle(void) { return handle; };
|
||||
private:
|
||||
HIDDriver *driver;
|
||||
HIDHandle handle;
|
||||
QPoint currentPos;
|
||||
Qt::MouseButtons buttons;
|
||||
};
|
||||
|
||||
class HIDDriverHandler : IntNotifier
|
||||
{
|
||||
public:
|
||||
HIDDriverHandler(HIDDriver *hidd) : IntNotifier(), driver(hidd) { }
|
||||
~HIDDriverHandler()
|
||||
{
|
||||
qDeleteAll(devices);
|
||||
};
|
||||
void process_event(void) Q_DECL_OVERRIDE;
|
||||
void async_wait(void) Q_DECL_OVERRIDE;
|
||||
void find_devices(void);
|
||||
private:
|
||||
QHash<Value, HIDDeviceHandler *> devices;
|
||||
HIDDriver *driver;
|
||||
};
|
||||
|
||||
void HIDDriverHandler::process_event()
|
||||
{
|
||||
find_devices();
|
||||
}
|
||||
|
||||
void HIDDriverHandler::async_wait()
|
||||
{
|
||||
gh_hid_wait_for_new_device(driver, act);
|
||||
}
|
||||
|
||||
void HIDDriverHandler::find_devices()
|
||||
{
|
||||
Error err;
|
||||
uintptr_t devicecontext;
|
||||
uint32_t device_id;
|
||||
HIDHandle handle;
|
||||
HIDDeviceHandler *hidnot;
|
||||
int deviceCount = 0;
|
||||
|
||||
devicecontext = 0;
|
||||
forever {
|
||||
err = gh_hid_enum_devices(driver, &device_id, &devicecontext);
|
||||
if (err == OperationNotImplemented)
|
||||
break;
|
||||
else if (err == Failure)
|
||||
break;
|
||||
if (!devices.contains(device_id)) {
|
||||
err = gh_hid_init_device(driver, device_id, &handle);
|
||||
if (err == Success) {
|
||||
hidnot = new HIDDeviceHandler(driver, handle);
|
||||
devices.insert(device_id, hidnot);
|
||||
QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
|
||||
QInputDeviceManager::DeviceTypePointer,++deviceCount);
|
||||
hidnot->async_wait();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (err == OperationNotImplemented) {
|
||||
/* fallback on legacy enumeration where we assume 0-based
|
||||
* contiguous indexes */
|
||||
device_id = 0;
|
||||
err = Success;
|
||||
do {
|
||||
if (!devices.contains(device_id)) {
|
||||
err = gh_hid_init_device(driver, device_id, &handle);
|
||||
if (err != Success)
|
||||
break;
|
||||
hidnot = new HIDDeviceHandler(driver, handle);
|
||||
devices.insert(device_id, hidnot);
|
||||
hidnot->async_wait();
|
||||
}
|
||||
device_id++;
|
||||
} while (err == Success);
|
||||
}
|
||||
|
||||
async_wait();
|
||||
}
|
||||
|
||||
|
||||
void HIDDeviceHandler::process_event()
|
||||
{
|
||||
HIDEvent event;
|
||||
uint32_t num_events = 1;
|
||||
|
||||
while (gh_hid_get_event(handle, &event, &num_events) == Success) {
|
||||
if (event.type == HID_TYPE_AXIS) {
|
||||
switch (event.index) {
|
||||
case HID_AXIS_ABSX:
|
||||
currentPos.setX(event.value);
|
||||
break;
|
||||
case HID_AXIS_ABSY:
|
||||
currentPos.setY(event.value);
|
||||
break;
|
||||
case HID_AXIS_RELX:
|
||||
currentPos.setX(currentPos.x() + event.value);
|
||||
break;
|
||||
case HID_AXIS_RELY:
|
||||
currentPos.setY(currentPos.y() + event.value);
|
||||
break;
|
||||
default:
|
||||
/* ignore the rest for now */
|
||||
break;
|
||||
}
|
||||
} else if (event.type == HID_TYPE_KEY) {
|
||||
switch (event.index) {
|
||||
case HID_BUTTON_LEFT:
|
||||
if (event.value)
|
||||
buttons |= Qt::LeftButton;
|
||||
else
|
||||
buttons &= ~Qt::LeftButton;
|
||||
break;
|
||||
case HID_BUTTON_MIDDLE:
|
||||
if (event.value)
|
||||
buttons |= Qt::MiddleButton;
|
||||
else
|
||||
buttons &= ~Qt::MiddleButton;
|
||||
break;
|
||||
case HID_BUTTON_RIGHT:
|
||||
if (event.value)
|
||||
buttons |= Qt::RightButton;
|
||||
else
|
||||
buttons &= ~Qt::RightButton;
|
||||
break;
|
||||
default:
|
||||
/* ignore the rest for now */
|
||||
break;
|
||||
}
|
||||
} else if (event.type == HID_TYPE_SYNC) {
|
||||
QWindowSystemInterface::handleMouseEvent(0, currentPos, currentPos, buttons,
|
||||
QGuiApplication::keyboardModifiers());
|
||||
} else if (event.type == HID_TYPE_DISCONNECT) {
|
||||
/* FIXME */
|
||||
}
|
||||
}
|
||||
async_wait();
|
||||
}
|
||||
|
||||
void HIDDeviceHandler::async_wait()
|
||||
{
|
||||
CheckSuccess(gh_hid_async_wait_for_event(handle, act));
|
||||
}
|
||||
|
||||
void QIntegrityHIDManager::open_devices()
|
||||
{
|
||||
HIDDriver *hidd;
|
||||
uintptr_t context = 0;
|
||||
HIDDriverHandler *hidnot;
|
||||
|
||||
while (gh_hid_enum_drivers(&hidd, &context) == Success) {
|
||||
hidnot = new HIDDriverHandler(hidd);
|
||||
m_drivers.append(hidnot);
|
||||
hidnot->find_devices();
|
||||
}
|
||||
}
|
||||
|
||||
void QIntegrityHIDManager::run()
|
||||
{
|
||||
IntNotifier *notifier;
|
||||
open_devices();
|
||||
/* main loop */
|
||||
forever {
|
||||
WaitForActivity((Value *)¬ifier);
|
||||
notifier->process_event();
|
||||
}
|
||||
}
|
||||
|
||||
QIntegrityHIDManager::QIntegrityHIDManager(const QString &key, const QString &spec, QObject *parent)
|
||||
: QThread(parent)
|
||||
{
|
||||
start();
|
||||
}
|
||||
|
||||
QIntegrityHIDManager::~QIntegrityHIDManager()
|
||||
{
|
||||
terminate();
|
||||
qDeleteAll(m_drivers);
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 Green Hills Software
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 3 requirements
|
||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 2.0 or (at your option) the GNU General
|
||||
** Public license version 3 or any later version approved by the KDE Free
|
||||
** Qt Foundation. The licenses are as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QINTEGRITYHIDMANAGER_P_H
|
||||
#define QINTEGRITYHIDMANAGER_P_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QList>
|
||||
#include <QThread>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class HIDDriverHandler;
|
||||
|
||||
class QIntegrityHIDManager : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = 0);
|
||||
~QIntegrityHIDManager();
|
||||
|
||||
void run(void);
|
||||
private:
|
||||
void open_devices(void);
|
||||
|
||||
QString m_spec;
|
||||
QList<HIDDriverHandler *> m_drivers;
|
||||
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QINTEGRITYHIDMANAGER_P_H
|
||||
|
|
@ -10,7 +10,7 @@ SUBDIRS = \
|
|||
qtConfig(freetype)|darwin|win32: \
|
||||
SUBDIRS += fontdatabases
|
||||
|
||||
qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput) {
|
||||
qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
|
||||
SUBDIRS += input
|
||||
input.depends += devicediscovery
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,6 +92,10 @@
|
|||
#include <QtInputSupport/private/qtslib_p.h>
|
||||
#endif
|
||||
|
||||
#if QT_CONFIG(integrityhid)
|
||||
#include <QtInputSupport/qintegrityhidmanager.h>
|
||||
#endif
|
||||
|
||||
#include <QtPlatformHeaders/qeglfsfunctions.h>
|
||||
|
||||
static void initResources()
|
||||
|
|
@ -466,6 +470,10 @@ void QEglFSIntegration::createInputHandlers()
|
|||
#endif
|
||||
new QEvdevTouchManager(QLatin1String("EvdevTouch"), QString() /* spec */, this);
|
||||
#endif
|
||||
|
||||
#if QT_CONFIG(integrityhid)
|
||||
new QIntegrityHIDManager("HID", "", this);
|
||||
#endif
|
||||
}
|
||||
|
||||
EGLNativeDisplayType QEglFSIntegration::nativeDisplay() const
|
||||
|
|
|
|||
Loading…
Reference in New Issue