1 files changed, 33 insertions, 26 deletions

diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index 60ae062586..d1b3ead11c 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -274,21 +274,23 @@ void QXcbConnection::xi2Select(xcb_window_t window)
     unsigned char *xiBitMask = reinterpret_cast<unsigned char *>(&bitMask);
 
 #ifdef XCB_USE_XINPUT22
-    bitMask |= XI_TouchBeginMask;
-    bitMask |= XI_TouchUpdateMask;
-    bitMask |= XI_TouchEndMask;
-    XIEventMask mask;
-    mask.mask_len = sizeof(bitMask);
-    mask.mask = xiBitMask;
-    if (!m_touchDevices.isEmpty()) {
-        mask.deviceid = XIAllMasterDevices;
-        Status result = XISelectEvents(xDisplay, window, &mask, 1);
-        // If we select for touch events on the master pointer, XInput2
-        // will not synthesize mouse events. This means Qt must do it,
-        // which is also preferable, since Qt can control better when
-        // to do so.
-        if (m_xi2Minor >= 2 && result == Success)
-            has_touch_without_mouse_emulation = true;
+    if (isUsingXInput22()) {
+        bitMask |= XI_TouchBeginMask;
+        bitMask |= XI_TouchUpdateMask;
+        bitMask |= XI_TouchEndMask;
+        XIEventMask mask;
+        mask.mask_len = sizeof(bitMask);
+        mask.mask = xiBitMask;
+        if (!m_touchDevices.isEmpty()) {
+            // If we select for touch events on the master pointer, XInput2
+            // will not synthesize mouse events. This means Qt must do it,
+            // which is also preferable, since Qt can control better when
+            // to do so.
+            mask.deviceid = XIAllMasterDevices;
+            Status result = XISelectEvents(xDisplay, window, &mask, 1);
+            if (result != Success)
+                qCDebug(lcQpaXInput, "XInput 2.2: failed to select touch events, window %x, result %d", window, result);
+        }
     }
 #endif // XCB_USE_XINPUT22
 
@@ -356,8 +358,11 @@ void QXcbConnection::xi2Select(xcb_window_t window)
 
 XInput2TouchDeviceData *QXcbConnection::touchDeviceForId(int id)
 {
-    XInput2TouchDeviceData *dev = m_touchDevices[id];
-    if (!dev) {
+    XInput2TouchDeviceData *dev = Q_NULLPTR;
+    QHash<int, XInput2TouchDeviceData*>::const_iterator devIt = m_touchDevices.find(id);
+    if ( devIt != m_touchDevices.end() ) {
+        dev = devIt.value();
+    } else {
         int nrDevices = 0;
         QTouchDevice::Capabilities caps = 0;
         dev = new XInput2TouchDeviceData;
@@ -419,9 +424,12 @@ XInput2TouchDeviceData *QXcbConnection::touchDeviceForId(int id)
                     dev->size.width() > 10000 || dev->size.height() > 10000)
                 dev->size = QSizeF(130, 110);
         }
+        if (!isUsingXInput22() || type == QTouchDevice::TouchPad)
+            caps |= QTouchDevice::MouseEmulation;
+
         if (type >= QTouchDevice::TouchScreen && type <= QTouchDevice::TouchPad) {
             dev->qtTouchDevice = new QTouchDevice;
-            dev->qtTouchDevice->setName(dev->xiDeviceInfo->name);
+            dev->qtTouchDevice->setName(QString::fromUtf8(dev->xiDeviceInfo->name));
             dev->qtTouchDevice->setType((QTouchDevice::DeviceType)type);
             dev->qtTouchDevice->setCapabilities(caps);
             dev->qtTouchDevice->setMaximumTouchPoints(maxTouchPoints);
@@ -429,7 +437,6 @@ XInput2TouchDeviceData *QXcbConnection::touchDeviceForId(int id)
                 QWindowSystemInterface::registerTouchDevice(dev->qtTouchDevice);
             m_touchDevices[id] = dev;
         } else {
-            m_touchDevices.remove(id);
             XIFreeDeviceInfo(dev->xiDeviceInfo);
             delete dev;
             dev = 0;