summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-07-22 09:20:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-22 10:07:38 +0200
commit29fda24ca8abdf7179139f1f7f74f9147edddfac (patch)
treea98993031cef08348c1619285eff73f4925d8f04 /src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
parent16579e5b84ee3bc42b838e02b40f0b3f3262f2fb (diff)
added maximumTouchPoints to QTouchDevice
This was missing information which the driver can provide. Change-Id: I2574745635d6fdf608bc5617999aec46d9312c09 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection_xi2.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_xi2.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index b95d276c18..35c7af23a9 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -210,6 +210,7 @@ XInput2DeviceData *QXcbConnection::deviceForId(int id)
#ifdef XCB_USE_XINPUT22
case XITouchClass: {
XITouchClassInfo *tci = reinterpret_cast<XITouchClassInfo *>(classinfo);
+ dev->qtTouchDevice->setMaximumTouchPoints(tci->num_touches);
switch (tci->mode) {
case XIModeRelative:
dev->qtTouchDevice->setType(QTouchDevice::TouchPad);
@@ -236,8 +237,8 @@ XInput2DeviceData *QXcbConnection::deviceForId(int id)
if (caps != 0)
QWindowSystemInterface::registerTouchDevice(dev->qtTouchDevice);
#ifdef XI2_DEBUG
- qDebug("registered new device %s with %d classes",
- dev->xiDeviceInfo->name, dev->xiDeviceInfo->num_classes);
+ qDebug("registered new device %s with %d classes and %d maximum touch points",
+ dev->xiDeviceInfo->name, dev->xiDeviceInfo->num_classes, dev->qtTouchDevice->maximumTouchPoints());
#endif
m_touchDevices[id] = dev;
}