From bb4e8e37d2934147c3654d25c6688bb24f30a2f2 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 1 Jun 2012 10:17:28 +0300 Subject: Add QEvdev prefix in evdevtouch and update readme Now that the code is in platformsupport we need to avoid too generic names so rename the classes a bit. Change-Id: I7241aa1a3449be772de369ebd08df01e886dbfa3 Reviewed-by: Girish Ramakrishnan --- src/plugins/generic/evdevtouch/README | 19 ++++++++++++------- src/plugins/generic/evdevtouch/main.cpp | 14 +++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) (limited to 'src/plugins/generic') diff --git a/src/plugins/generic/evdevtouch/README b/src/plugins/generic/evdevtouch/README index 119f2a2c9e..fca2770106 100644 --- a/src/plugins/generic/evdevtouch/README +++ b/src/plugins/generic/evdevtouch/README @@ -1,12 +1,17 @@ -Generic plug-in for evdev touch (ABS_MT) events. +Generic plug-in for evdev multiple touch (ABS_MT) events. Supports protocol type A & B. Type B is supported both directly and via libmtdev. +Single-touch devices reporting ABS_X and Y only are not supported +by this plugin. Use tslib or evdevmouse instead. The protocol type will be detected automatically. To enable libmtdev support uncomment the USE_MTDEV define in evdevtouch.pro. -Tested with the following kernel drivers: bcm5974, hid_magicmouse. +Tested with the following kernel drivers: + bcm5974 (type A) + hid_magicmouse (type A with ABS_MT_TRACKING_ID) (type B over libmtdev) + wacom (type B) To use this "driver", pass -plugin EvdevTouch on the command line. @@ -24,9 +29,9 @@ Only touch events are generated, mouse events are not. Be aware however that ignored touch events will generate a mouse event from the first touch point by default. See AA_SynthesizeMouseForUnhandledTouchEvents. -If no evdev events are read, disable the synaptics driver from X or -temporarily disable the device by running -xinput set-prop 0. +If no evdev events are read, X may be grabbing the device. +Disable the synaptics driver from X or temporarily disable the device +by running xinput set-prop 0. Use xinput list and xinput list-props to figure out the values. When not running on a windowing system (eglfs, kms, etc.) and having a @@ -38,5 +43,5 @@ If the input device cannot be accessed, set up a udev rule. For example: sudo cp 70-qtouchscreen.rules /etc/udev/rules.d sudo udevadm trigger --subsystem-match=input -The udev rule matches any touchpad or touchscreen device. If there are -multiple ones, specify the device manually as described above. +The sample udev rule matches any touchpad or touchscreen device. +If there are multiple ones, specify the device manually as described above. diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index 0068ec88a8..2bdee0d332 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -44,32 +44,32 @@ QT_BEGIN_NAMESPACE -class QTouchScreenPlugin : public QGenericPlugin +class QEvdevTouchScreenPlugin : public QGenericPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtouch.json") public: - QTouchScreenPlugin(); + QEvdevTouchScreenPlugin(); QStringList keys() const; QObject* create(const QString &key, const QString &specification); }; -QTouchScreenPlugin::QTouchScreenPlugin() +QEvdevTouchScreenPlugin::QEvdevTouchScreenPlugin() { } -QStringList QTouchScreenPlugin::keys() const +QStringList QEvdevTouchScreenPlugin::keys() const { return QStringList() << "EvdevTouch"; } -QObject* QTouchScreenPlugin::create(const QString &key, - const QString &spec) +QObject* QEvdevTouchScreenPlugin::create(const QString &key, + const QString &spec) { if (!key.compare(QLatin1String("EvdevTouch"), Qt::CaseInsensitive)) - return new QTouchScreenHandlerThread(spec); + return new QEvdevTouchScreenHandlerThread(spec); return 0; } -- cgit v1.2.3