Merge lp:~dandrader/unity8/updateMouseTouchAdaptor into lp:unity8

[Daniel d'Andrada]

Have "make tryFoo" work with Qt 5.5

Update MouseTouchAdaptor to use XInput2, as per Qt 5.5
+ Don't build MouseTouchAdaptor on ARM
+ remove unused context property from unity8-dash

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

[lp:~dandrader/unity8/updateMouseTouchAdaptor]

2102. By Daniel d'Andrada on 2015-12-16

Sort

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2101
http://jenkins.qa.ubuntu.com/job/unity8-ci/6964/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5815/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1570/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1570/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/377/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5828
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5828/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26114
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/144/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26113

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6964/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

      Start 21: testUnityTest
21/23 Test #21: testUnityTest ....................***Exception: SegFault 0.04 sec

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2102
http://jenkins.qa.ubuntu.com/job/unity8-ci/6966/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1677/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4497/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26122
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26123

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6966/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/updateMouseTouchAdaptor]

2103. By Daniel d'Andrada on 2015-12-16

Test now needs a graphical environment

[Daniel d'Andrada (dandrader)]

On 16/12/2015 14:19, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Start 21: testUnityTest
> 21/23 Test #21: testUnityTest ....................***Exception: SegFault 0.04 sec
>

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2103
http://jenkins.qa.ubuntu.com/job/unity8-ci/6967/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5821/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/382/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1678
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/379
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4498/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5834
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5834/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26126
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/381
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6967/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
known broken tests fixed elsewhere

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-03 19:36:58 +0000
+++ CMakeLists.txt	2015-12-16 18:06:16 +0000
@@ -128,6 +128,16 @@
     set(STDOUT_LOGGER "-o" "-,txt")
 endif()
 
+execute_process(COMMAND arch OUTPUT_VARIABLE ARCH)
+if (NOT ARCH MATCHES "arm*")
+    set(ENABLE_TOUCH_EMULATION true)
+    add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)
+    pkg_check_modules(MOUSETOUCHADAPTOR_LIBS REQUIRED x11 xcb xi)
+else()
+    set(ENABLE_TOUCH_EMULATION false)
+    message(STATUS "Touch emulation support disabled.")
+endif()
+
 # add subdirectories to build
 add_subdirectory(include)
 add_subdirectory(libs)

=== modified file 'debian/control'
--- debian/control	2015-12-08 15:37:20 +0000
+++ debian/control	2015-12-16 18:06:16 +0000
@@ -31,7 +31,11 @@
                libudev-dev,
                libunity-api-dev (>= 7.104),
                libusermetricsoutput1-dev,
-               libxcb1-dev,
+# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
+               libx11-dev[!armhf],
+               libxcb1-dev[!armhf],
+               libxi-dev[!armhf],
+# End of X11 libs
                pkg-config,
                python3-all:any,
                python3-setuptools,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-10-02 21:50:07 +0000
+++ src/CMakeLists.txt	2015-12-16 18:06:16 +0000
@@ -16,10 +16,9 @@
     ${CMAKE_SOURCE_DIR}/tests/*.svg
 )
 
-add_executable(${SHELL_APP}
+set(SOURCE_FILES
     ApplicationArguments.cpp
     main.cpp
-    MouseTouchAdaptor.cpp
     CachingNetworkManagerFactory.cpp
     SecondaryWindow.cpp
     ShellApplication.cpp
@@ -28,15 +27,22 @@
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
 )
 
+if (ENABLE_TOUCH_EMULATION)
+    set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)
+endif()
+
+pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
+add_executable(${SHELL_APP} ${SOURCE_FILES})
 qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
 
-pkg_check_modules(NEEDED_LIBS REQUIRED xcb libandroid-properties)
-if (NOT "${NEEDED_LIBS_INCLUDE_DIRS}" STREQUAL "")
-    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${NEEDED_LIBS_INCLUDE_DIRS})
+if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
+    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
 endif()
-target_link_libraries(${SHELL_APP} ${NEEDED_LIBS_LDFLAGS})
+target_link_libraries(${SHELL_APP} ${ANDROID_PROPERTIES_LDFLAGS} UbuntuGestures connectivity-qt1)
 
-target_link_libraries(${SHELL_APP} UbuntuGestures connectivity-qt1)
+if (ENABLE_TOUCH_EMULATION)
+    target_link_libraries(${SHELL_APP} ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
+endif()
 
 # For it to find libUbuntuGestures.so
 set_target_properties(${SHELL_APP} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2015-03-06 04:44:11 +0000
+++ src/Dash/CMakeLists.txt	2015-12-16 18:06:16 +0000
@@ -1,25 +1,25 @@
 set(DASH_SRCS
     main.cpp
-    ../ApplicationArguments.cpp
-    ../MouseTouchAdaptor.cpp
     ../CachingNetworkManagerFactory.cpp
 )
 
+if (ENABLE_TOUCH_EMULATION)
+    set(DASH_SRCS ${DASH_SRCS} ../MouseTouchAdaptor.cpp)
+endif()
+
 add_executable(unity8-dash ${DASH_SRCS})
 
 qt5_use_modules(unity8-dash Gui Qml Quick Test)
 
-pkg_check_modules(NEEDED_LIBS REQUIRED xcb libandroid-properties)
-if (NOT "${NEEDED_LIBS_INCLUDE_DIRS}" STREQUAL "")
-    set_target_properties(unity8-dash PROPERTIES INCLUDE_DIRECTORIES ${NEEDED_LIBS_INCLUDE_DIRS})
-endif()
-target_link_libraries(unity8-dash ${NEEDED_LIBS_LDFLAGS})
-
 # For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
 set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
 
 target_link_libraries(unity8-dash UbuntuGestures connectivity-qt1)
 
+if (ENABLE_TOUCH_EMULATION)
+    target_link_libraries(unity8-dash ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 
 # install binaries

=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2015-09-23 15:14:01 +0000
+++ src/Dash/main.cpp	2015-12-16 18:06:16 +0000
@@ -27,8 +27,9 @@
 #include <libintl.h>
 
 #include <paths.h>
-#include "../MouseTouchAdaptor.h"
-#include "../ApplicationArguments.h"
+#ifdef UNITY8_ENABLE_TOUCH_EMULATION
+    #include "../MouseTouchAdaptor.h"
+#endif
 #include "../CachingNetworkManagerFactory.h"
 
 int main(int argc, const char *argv[])
@@ -57,8 +58,6 @@
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.process(*application);
 
-    ApplicationArguments qmlArgs;
-
     if (getenv("QT_LOAD_TESTABILITY")) {
         QLibrary testLib(QStringLiteral("qttestability"));
         if (testLib.load()) {
@@ -92,14 +91,15 @@
     }
 
     view->setTitle(QStringLiteral("Scopes"));
-    view->rootContext()->setContextProperty(QStringLiteral("applicationArguments"), &qmlArgs);
 
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
     if (parser.isSet(mousetouchOption)) {
         mouseTouchAdaptor = MouseTouchAdaptor::instance();
     }
+    #endif
 
     QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
@@ -114,7 +114,11 @@
     int result = application->exec();
 
     delete view;
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     delete mouseTouchAdaptor;
+    #endif
+
     delete application;
 
     return result;

=== modified file 'src/MouseTouchAdaptor.cpp'
--- src/MouseTouchAdaptor.cpp	2015-06-07 14:52:39 +0000
+++ src/MouseTouchAdaptor.cpp	2015-12-16 18:06:16 +0000
@@ -16,14 +16,56 @@
  * Authored by: Daniel d'Andrada <[e-mail]>
  */
 
+
+/* Some parts of the code were copied from the XCB platform plugin of the Qt Toolkit,
+ * which is under the following license:
+ */
+
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the .
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 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
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** 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$
+**
+****************************************************************************/
+
 #include "MouseTouchAdaptor.h"
 
+#include <qpa/qplatformnativeinterface.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QCoreApplication>
 #include <QMouseEvent>
 #include <QTest>
 
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/XI2proto.h>
+
 using QTest::QTouchEventSequence;
 
 namespace {
@@ -49,6 +91,8 @@
     m_touchDevice = new QTouchDevice;
     m_touchDevice->setType(QTouchDevice::TouchScreen);
     QWindowSystemInterface::registerTouchDevice(m_touchDevice);
+
+    fetchXInput2Info();
 }
 
 MouseTouchAdaptor::~MouseTouchAdaptor()
@@ -65,9 +109,114 @@
     return g_instance;
 }
 
+void MouseTouchAdaptor::fetchXInput2Info()
+{
+    QPlatformNativeInterface *nativeInterface = qGuiApp->platformNativeInterface();
+    Display *xDisplay = static_cast<Display*>(nativeInterface->nativeResourceForIntegration("Display"));
+    if (xDisplay && XQueryExtension(xDisplay, "XInputExtension", &m_xiOpCode, &m_xiEventBase, &m_xiErrorBase)) {
+        int xiMajor = 2;
+        m_xi2Minor = 2; // try 2.2 first, needed for TouchBegin/Update/End
+        if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
+            m_xi2Minor = 1; // for smooth scrolling 2.1 is enough
+            if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
+                m_xi2Minor = 0; // for tablet support 2.0 is enough
+                m_xi2Enabled = XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) != BadRequest;
+            } else
+                m_xi2Enabled = true;
+        } else {
+            m_xi2Enabled = true;
+        }
+    }
+}
+
+// Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed:
+// - "pad0" became "extension"
+// - "pad1" and "pad" became "pad0"
+// New and old version of this struct share the following fields:
+// NOTE: API might change again in the next release of xcb in which case this comment will
+// need to be updated to reflect the reality.
+typedef struct qt_xcb_ge_event_t {
+    uint8_t  response_type;
+    uint8_t  extension;
+    uint16_t sequence;
+    uint32_t length;
+    uint16_t event_type;
+} qt_xcb_ge_event_t;
+
+bool xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *ev, int opCode)
+{
+    qt_xcb_ge_event_t *event = (qt_xcb_ge_event_t *)ev;
+    // xGenericEvent has "extension" on the second byte, the same is true for xcb_ge_event_t starting from
+    // the xcb version 1.9.3, prior to that it was called "pad0".
+    if (event->extension == opCode) {
+        // xcb event structs contain stuff that wasn't on the wire, the full_sequence field
+        // adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
+        // Move this data back to have the same layout in memory as it was on the wire
+        // and allow casting, overwriting the full_sequence field.
+        memmove((char*) event + 32, (char*) event + 36, event->length * 4);
+        return true;
+    }
+    return false;
+}
+
+static inline qreal fixed1616ToReal(FP1616 val)
+{
+    return qreal(val) / 0x10000;
+}
+
+bool MouseTouchAdaptor::xi2HandleEvent(xcb_ge_event_t *event)
+{
+    if (!xi2PrepareXIGenericDeviceEvent(event, m_xiOpCode)) {
+        return false;
+    }
+
+    xXIGenericDeviceEvent *xiEvent = reinterpret_cast<xXIGenericDeviceEvent *>(event);
+    xXIDeviceEvent *xiDeviceEvent = 0;
+
+    switch (xiEvent->evtype) {
+    case XI_ButtonPress:
+    case XI_ButtonRelease:
+    case XI_Motion:
+        xiDeviceEvent = reinterpret_cast<xXIDeviceEvent *>(event);
+        break;
+    default:
+        break;
+    }
+
+    if (!xiDeviceEvent) {
+        return false;
+    }
+
+    switch (xiDeviceEvent->evtype) {
+    case XI_ButtonPress:
+        return handleButtonPress(
+                static_cast<WId>(xiDeviceEvent->event),
+                xiDeviceEvent->detail,
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+    case XI_ButtonRelease:
+        return handleButtonRelease(
+                static_cast<WId>(xiDeviceEvent->event),
+                xiDeviceEvent->detail,
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+    case XI_Motion:
+        return handleMotionNotify(
+                static_cast<WId>(xiDeviceEvent->event),
+                fixed1616ToReal(xiDeviceEvent->event_x),
+                fixed1616ToReal(xiDeviceEvent->event_y));
+        return true;
+    default:
+        return false;
+    }
+}
+
+
 bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
                                           void * message, long * /*result*/)
 {
+    static int eventCount = 0;
+    eventCount++;
     if (!m_enabled) {
         return false;
     }
@@ -81,32 +230,42 @@
     xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
 
     switch (xcbEvent->response_type & ~0x80) {
-        case XCB_BUTTON_PRESS:
-            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
-            break;
-        case XCB_BUTTON_RELEASE:
-            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
-            break;
-        case XCB_MOTION_NOTIFY:
-            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
-            break;
+        case XCB_BUTTON_PRESS: {
+            auto pressEvent = reinterpret_cast<xcb_button_press_event_t *>(xcbEvent);
+            return handleButtonPress(static_cast<WId>(pressEvent->event), pressEvent->detail,
+                    pressEvent->event_x, pressEvent->event_y);
+        }
+        case XCB_BUTTON_RELEASE: {
+            auto releaseEvent = reinterpret_cast<xcb_button_release_event_t *>(xcbEvent);
+            return handleButtonRelease(static_cast<WId>(releaseEvent->event), releaseEvent->detail,
+                    releaseEvent->event_x, releaseEvent->event_y);
+        }
+        case XCB_MOTION_NOTIFY: {
+            auto motionEvent = reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent);
+            return handleMotionNotify(static_cast<WId>(motionEvent->event), motionEvent->event_x, motionEvent->event_y);
+        }
+        case XCB_GE_GENERIC:
+            if (m_xi2Enabled) {
+                return xi2HandleEvent(reinterpret_cast<xcb_ge_event_t *>(xcbEvent));
+            } else {
+                return false;
+            }
         default:
             return false;
-            break;
     };
 }
 
-bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
+bool MouseTouchAdaptor::handleButtonPress(WId windowId, uint32_t detail, int x, int y)
 {
-    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
+    Qt::MouseButton button = translateMouseButton(detail);
 
     // Just eat the event if it wasn't a left mouse press
     if (button != Qt::LeftButton)
         return true;
 
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
 
-    QPoint windowPos(pressEvent->event_x / targetWindow->devicePixelRatio(), pressEvent->event_y / targetWindow->devicePixelRatio());
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
@@ -117,17 +276,17 @@
     return true;
 }
 
-bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
+bool MouseTouchAdaptor::handleButtonRelease(WId windowId, uint32_t detail, int x, int y)
 {
-    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
+    Qt::MouseButton button = translateMouseButton(detail);
 
     // Just eat the event if it wasn't a left mouse release
     if (button != Qt::LeftButton)
         return true;
 
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
 
-    QPoint windowPos(releaseEvent->event_x / targetWindow->devicePixelRatio(), releaseEvent->event_y / targetWindow->devicePixelRatio());
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
@@ -138,15 +297,15 @@
     return true;
 }
 
-bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
+bool MouseTouchAdaptor::handleMotionNotify(WId windowId, int x, int y)
 {
     if (!m_leftButtonIsPressed) {
         return true;
     }
 
-    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
+    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
 
-    QPoint windowPos(event->event_x / targetWindow->devicePixelRatio(), event->event_y / targetWindow->devicePixelRatio());
+    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
 
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);

=== modified file 'src/MouseTouchAdaptor.h'
--- src/MouseTouchAdaptor.h	2015-03-02 12:41:17 +0000
+++ src/MouseTouchAdaptor.h	2015-12-16 18:06:16 +0000
@@ -21,6 +21,7 @@
 
 #include <QtCore/QAbstractNativeEventFilter>
 #include <QWindow>
+
 #include <xcb/xcb.h>
 
 class QMouseEvent;
@@ -47,16 +48,22 @@
 
 private:
     MouseTouchAdaptor();
+    void fetchXInput2Info();
+    bool xi2HandleEvent(xcb_ge_event_t *event);
 
-    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
-    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
-    bool handleMotionNotify(xcb_motion_notify_event_t *event);
+    bool handleButtonPress(WId windowId, uint32_t detail, int x, int y);
+    bool handleButtonRelease(WId windowId, uint32_t detail, int x, int y);
+    bool handleMotionNotify(WId windowId, int x, int y);
     QWindow *findQWindowWithXWindowID(WId windowId);
 
     QTouchDevice *m_touchDevice;
     bool m_leftButtonIsPressed;
 
     bool m_enabled;
+
+    bool m_xi2Enabled{false};
+    int m_xi2Minor{-1};
+    int m_xiOpCode, m_xiEventBase, m_xiErrorBase;
 };
 
 #endif // MOUSE_TOUCH_ADAPTOR_H

=== modified file 'src/ShellApplication.cpp'
--- src/ShellApplication.cpp	2015-11-20 15:31:46 +0000
+++ src/ShellApplication.cpp	2015-12-16 18:06:16 +0000
@@ -28,15 +28,10 @@
 // local
 #include <paths.h>
 #include "CachingNetworkManagerFactory.h"
-#include "MouseTouchAdaptor.h"
 #include "UnityCommandLineParser.h"
 
 ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
     : QGuiApplication(argc, argv)
-    , m_shellView(nullptr)
-    , m_secondaryWindow(nullptr)
-    , m_mouseTouchAdaptor(nullptr)
-    , m_qmlEngine(nullptr)
 {
 
     setApplicationName(QStringLiteral("unity8"));
@@ -89,11 +84,14 @@
         m_shellView->setFlags(Qt::FramelessWindowHint);
     }
 
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     if (parser.hasMouseToTouch()) {
         m_mouseTouchAdaptor = MouseTouchAdaptor::instance();
     }
+    #endif
 
 
     // Some hard-coded policy for now.
@@ -134,8 +132,10 @@
     delete m_secondaryWindow;
     m_secondaryWindow = nullptr;
 
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     delete m_mouseTouchAdaptor;
     m_mouseTouchAdaptor = nullptr;
+    #endif
 
     delete m_qmlEngine;
     m_qmlEngine = nullptr;

=== modified file 'src/ShellApplication.h'
--- src/ShellApplication.h	2015-10-20 15:19:42 +0000
+++ src/ShellApplication.h	2015-12-16 18:06:16 +0000
@@ -23,7 +23,11 @@
 #include <QScopedPointer>
 
 #include "ApplicationArguments.h"
+
+#ifdef UNITY8_ENABLE_TOUCH_EMULATION
 #include "MouseTouchAdaptor.h"
+#endif
+
 #include "SecondaryWindow.h"
 #include "ShellView.h"
 
@@ -46,10 +50,14 @@
     void setupQmlEngine(bool isMirServer);
     QString m_deviceName;
     ApplicationArguments m_qmlArgs;
-    ShellView *m_shellView;
-    SecondaryWindow *m_secondaryWindow;
-    MouseTouchAdaptor *m_mouseTouchAdaptor;
-    QQmlEngine *m_qmlEngine;
+    ShellView *m_shellView{nullptr};
+    SecondaryWindow *m_secondaryWindow{nullptr};
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
+    MouseTouchAdaptor *m_mouseTouchAdaptor{nullptr};
+    #endif
+
+    QQmlEngine *m_qmlEngine{nullptr};
 };
 
 #endif // SHELLAPPLICATION_H

=== modified file 'src/UnityCommandLineParser.cpp'
--- src/UnityCommandLineParser.cpp	2015-09-14 09:11:08 +0000
+++ src/UnityCommandLineParser.cpp	2015-12-16 18:06:16 +0000
@@ -37,9 +37,11 @@
         QStringLiteral("Run without window borders"));
     parser.addOption(framelessOption);
 
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     QCommandLineOption mousetouchOption(QStringLiteral("mousetouch"),
         QStringLiteral("Allow the mouse to provide touch input"));
     parser.addOption(mousetouchOption);
+    #endif
 
     QCommandLineOption windowGeometryOption(QStringList() << QStringLiteral("windowgeometry"),
             QStringLiteral("Specify the window geometry as [<width>x<height>]"), QStringLiteral("windowgeometry"), QStringLiteral("1"));
@@ -75,7 +77,11 @@
 
     m_hasTestability = parser.isSet(testabilityOption);
     m_hasFrameless = parser.isSet(framelessOption);
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     m_hasMouseToTouch = parser.isSet(mousetouchOption);
+    #endif
+
     m_hasFullscreen = parser.isSet(fullscreenOption);
     m_deviceName = parser.value(devicenameOption);
     resolveMode(parser, modeOption);

=== modified file 'src/UnityCommandLineParser.h'
--- src/UnityCommandLineParser.h	2015-04-20 13:20:10 +0000
+++ src/UnityCommandLineParser.h	2015-12-16 18:06:16 +0000
@@ -28,7 +28,11 @@
     QSize windowGeometry() const { return m_windowGeometry; }
     bool hasTestability() const { return m_hasTestability; }
     bool hasFrameless() const { return m_hasFrameless; }
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     bool hasMouseToTouch() const { return m_hasMouseToTouch; }
+    #endif
+
     bool hasFullscreen() const { return m_hasFullscreen; }
     QString deviceName() const { return m_deviceName; }
     QString mode() const { return m_mode; }
@@ -43,7 +47,11 @@
     QSize m_windowGeometry;
     bool m_hasTestability;
     bool m_hasFrameless;
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
     bool m_hasMouseToTouch;
+    #endif
+
     bool m_hasFullscreen;
     QString m_deviceName;
     QString m_mode;

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-11-26 16:36:53 +0000
+++ tests/qmltests/CMakeLists.txt	2015-12-16 18:06:16 +0000
@@ -87,4 +87,4 @@
 add_unity8_qmltest(Stages Splash)
 add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
 add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
-add_unity8_qmlunittest(utils/Unity/Test UnityTest)
+add_unity8_qmltest(utils/Unity/Test UnityTest)

=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
--- tests/utils/modules/Unity/Test/CMakeLists.txt	2015-03-02 12:41:17 +0000
+++ tests/utils/modules/Unity/Test/CMakeLists.txt	2015-12-16 18:06:16 +0000
@@ -13,12 +13,19 @@
     testutil.cpp
     plugin.cpp
     TouchEventSequenceWrapper.cpp
-    ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp
 )
 
+if (ENABLE_TOUCH_EMULATION)
+    set(UnityTestQML_SOURCES ${UnityTestQML_SOURCES} ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp)
+endif()
+
 add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})
 target_link_libraries(UnityTestQml UbuntuGestures)
 
+if (ENABLE_TOUCH_EMULATION)
+    target_link_libraries(UnityTestQml ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
+endif()
+
 qt5_use_modules(UnityTestQml Core Quick Test)
 
 export_qmlfiles(Unity.Test Unity/Test)

=== modified file 'tests/utils/modules/Unity/Test/plugin.cpp'
--- tests/utils/modules/Unity/Test/plugin.cpp	2015-03-02 12:41:17 +0000
+++ tests/utils/modules/Unity/Test/plugin.cpp	2015-12-16 18:06:16 +0000
@@ -17,7 +17,11 @@
 
 #include "plugin.h"
 #include "testutil.h"
+
+#ifdef UNITY8_ENABLE_TOUCH_EMULATION
 #include <MouseTouchAdaptor.h>
+#endif
+
 #include "TouchEventSequenceWrapper.h"
 
 #include <qqml.h>
@@ -27,23 +31,29 @@
 {
     return new TestUtil();
 }
+
+#ifdef UNITY8_ENABLE_TOUCH_EMULATION
 QObject *getMouseTouchAdaptorQMLSingleton(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
 {
     return MouseTouchAdaptor::instance();
 }
+#endif
+
 } // anonymous namespace
 
 void UnityTestPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("Unity.Test"));
 
-    // Ensure the instance gets created
-    MouseTouchAdaptor::instance();
-
     // @uri Unity.Test
     qmlRegisterSingletonType<TestUtil>(uri, 0, 1, "Util", testutil_provider);
     qmlRegisterUncreatableType<TouchEventSequenceWrapper>(uri, 0, 1, "TouchEventSequence",
             "You cannot directly create a TouchEventSequence object.");
+
+    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
+    // Ensure the instance gets created
+    MouseTouchAdaptor::instance();
     qmlRegisterSingletonType<MouseTouchAdaptor>(uri, 0, 1, "MouseTouchAdaptor",
                                                 getMouseTouchAdaptorQMLSingleton);
+    #endif
 }