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

[Daniel d'Andrada]

Make MouseTouchAdaptor controllable from within QML

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, but for better effect try this branch along with lp:~mzanetti/unity8/indicators-mouse and run "make tryPanel"

* 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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1638
http://jenkins.qa.ubuntu.com/job/unity8-ci/5370/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/534/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/535/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/535/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1579/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1639
http://jenkins.qa.ubuntu.com/job/unity8-ci/5372/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1585
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/537
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1583
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18439

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Functionality seems to work fine. Code-wise I'm ok too.

Does fail some tests in jenkins though.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> Functionality seems to work fine. Code-wise I'm ok too.
>
> Does fail some tests in jenkins though.

Those are old failures that should be fixed by now. I should probably resubmit to get a new jenkins run because I did "push --overwrite". :/

[lp:~dandrader/unity8/controlTouchEmulationFromQML]

1638. By Daniel d'Andrada on 2015-03-03

Will that empty commit make Jenkins rebuild?

1639. By Daniel d'Andrada on 2015-03-03

And one more for good measure

1640. By Daniel d'Andrada on 2015-03-10

Merge trunk + ~dandrader/unity8/unifyShellTests

[ Albert Astals ]
* Don't precache items that are outisde the 1.5*height buffering area
  (LP: #1410131)
[ Albert Astals Cid ]
* Don't precache items that are outisde the 1.5*height buffering area
  (LP: #1410131)
[ Chris Townsend ]
* Add a wrapper for handling the
  /org/gnome/SessionManager/EndSessionDialog DBus object used by
  indicator-session. This allows indicator-session to properly talk to
  the Unity 8 session management functions. (LP: #1392187)
* Allow for proper logout session management. This uses the
  EndSession() Upstart DBus method on the current session bus. (LP:
  #1360316)
* Make the Unity 8 session dialogs behave in the same fashion as Unity
  7. From indicator-session: Clicking "Log Out" will now present a
  dialog to "Lock", "Log Out", or "Cancel". Clicking "Shut Down" will
  now present a dialog to "Reboot", "Shut Down", or "Cancel". (LP:
  #1416074)
[ Daniel d'Andrada ]
* Add NO_TESTS cmake option to skip tests and therefore speed up
  builds
* Remove enums and properties that doesn't exist in the real
  ApplicationManager
* Stabilize some Shell qml tests
[ Josh Arenson ]
* Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:
  #1390393)
[ Michael Terry ]
* Make the draggable part of the right edge (during the tutorial) a
  constant size, instead of having it grow and shrink as the spread
  peeks out from the side.
[ Michał Sawicz ]
* Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:
  #1390393)
[ Robert Bruce Park ]
* Launchpad automatic translations update.
[ CI Train Bot ]
* New rebuild forced.
[ Pete Woods ]
* Only set scopes active when the screen is on (LP: #1422879)

Unmerged revisions

1636. By Launchpad Translations on behalf of unity-team on 2015-02-27

Launchpad automatic translations update.

=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2014-10-02 15:36:42 +0000
+++ src/Dash/main.cpp	2015-03-02 12:41:55 +0000
@@ -98,8 +98,7 @@
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
     if (parser.isSet(mousetouchOption)) {
-        mouseTouchAdaptor = new MouseTouchAdaptor;
-        application->installNativeEventFilter(mouseTouchAdaptor);
+        mouseTouchAdaptor = MouseTouchAdaptor::instance();
     }
 
     QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");
@@ -115,6 +114,7 @@
     int result = application->exec();
 
     delete view;
+    delete mouseTouchAdaptor;
     delete application;
 
     return result;

=== modified file 'src/MouseTouchAdaptor.cpp'
--- src/MouseTouchAdaptor.cpp	2013-12-17 14:56:25 +0000
+++ src/MouseTouchAdaptor.cpp	2015-03-02 12:41:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,15 @@
 
 #include <qpa/qwindowsysteminterface.h>
 
-#include <QtGui/QMouseEvent>
-#include <QtTest/QTest>
+#include <QCoreApplication>
+#include <QMouseEvent>
+#include <QTest>
 
 using QTest::QTouchEventSequence;
 
 namespace {
+MouseTouchAdaptor *g_instance = nullptr;
+
 Qt::MouseButton translateMouseButton(xcb_button_t detail)
 {
     switch (detail) {
@@ -39,16 +42,36 @@
 } // end of anonymous namespace
 
 MouseTouchAdaptor::MouseTouchAdaptor()
-    : m_leftButtonIsPressed(false)
+    : QObject(nullptr), m_leftButtonIsPressed(false), m_enabled(true)
 {
+    QCoreApplication::instance()->installNativeEventFilter(this);
+
     m_touchDevice = new QTouchDevice;
     m_touchDevice->setType(QTouchDevice::TouchScreen);
     QWindowSystemInterface::registerTouchDevice(m_touchDevice);
 }
 
+MouseTouchAdaptor::~MouseTouchAdaptor()
+{
+    g_instance = nullptr;
+}
+
+MouseTouchAdaptor* MouseTouchAdaptor::instance()
+{
+    if (!g_instance) {
+        g_instance = new MouseTouchAdaptor;
+    }
+
+    return g_instance;
+}
+
 bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
                                           void * message, long * /*result*/)
 {
+    if (!m_enabled) {
+        return false;
+    }
+
     if (eventType != "xcb_generic_event_t") {
         // wrong backend.
         qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
@@ -151,3 +174,16 @@
     Q_ASSERT(foundWindow);
     return foundWindow;
 }
+
+bool MouseTouchAdaptor::enabled() const
+{
+    return m_enabled;
+}
+
+void MouseTouchAdaptor::setEnabled(bool value)
+{
+    if (value != m_enabled) {
+        m_enabled = value;
+        Q_EMIT enabledChanged(value);
+    }
+}

=== modified file 'src/MouseTouchAdaptor.h'
--- src/MouseTouchAdaptor.h	2013-12-18 10:23:05 +0000
+++ src/MouseTouchAdaptor.h	2015-03-02 12:41:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,15 +27,26 @@
 class QTouchDevice;
 
 // Transforms QMouseEvents into single-finger QTouchEvents.
-class MouseTouchAdaptor : public QAbstractNativeEventFilter {
-
+class MouseTouchAdaptor : public QObject, public QAbstractNativeEventFilter {
+    Q_OBJECT
 public:
-    MouseTouchAdaptor();
+    virtual ~MouseTouchAdaptor();
+
+    static MouseTouchAdaptor* instance();
 
     // Filters mouse events and posts the equivalent QTouchEvents.
-    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);
+    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;
+
+    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+
+    bool enabled() const;
+    void setEnabled(bool value);
+
+Q_SIGNALS:
+    void enabledChanged(bool value);
 
 private:
+    MouseTouchAdaptor();
 
     bool handleButtonPress(xcb_button_press_event_t *pressEvent);
     bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
@@ -44,6 +55,8 @@
 
     QTouchDevice *m_touchDevice;
     bool m_leftButtonIsPressed;
+
+    bool m_enabled;
 };
 
 #endif // MOUSE_TOUCH_ADAPTOR_H

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-01-07 15:48:16 +0000
+++ src/main.cpp	2015-03-02 12:41:55 +0000
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Canonical, Ltd.
- *
- * Authors:
- *  Gerry Boland <[e-mail]>
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -130,8 +127,7 @@
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
     if (parser.isSet(mousetouchOption)) {
-        mouseTouchAdaptor = new MouseTouchAdaptor;
-        application->installNativeEventFilter(mouseTouchAdaptor);
+        mouseTouchAdaptor = MouseTouchAdaptor::instance();
     }
 
     QUrl source(::qmlDirectory()+"Shell.qml");

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-01-26 13:48:08 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2015-03-02 12:41:55 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import QtTest 1.0
-import Unity.Test 0.1 as UT
+import Unity.Test 0.1
 import Ubuntu.Components 0.1
 import Unity.Indicators 0.1 as Indicators
 import Ubuntu.Telephony 0.1 as Telephony
@@ -121,6 +121,14 @@
                     }
                 }
             }
+
+            Rectangle {
+                Layout.preferredHeight: units.dp(1);
+                Layout.fillWidth: true;
+                color: "black"
+            }
+
+            MouseTouchEmulationCheckbox {}
         }
     }
 
@@ -129,7 +137,7 @@
         phoneNumber: "[phone]"
     }
 
-    UT.UnityTestCase {
+    UnityTestCase {
         name: "Panel"
         when: windowShown
 

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/tst_Shell.qml	2015-03-02 12:41:55 +0000
@@ -29,14 +29,14 @@
 import Unity.Connectivity 0.1
 import Unity.Indicators 0.1
 import Unity.Notifications 1.0
-import Unity.Test 0.1 as UT
+import Unity.Test 0.1
 import Powerd 0.1
 
 import "../../qml"
 
 Item {
     id: root
-    width: units.gu(60)
+    width: units.gu(70)
     height: units.gu(71)
 
     Component.onCompleted: {
@@ -117,6 +117,7 @@
                         shellLoader.active = true;
                     }
                 }
+                MouseTouchEmulationCheckbox { color: "white" }
             }
         }
     }
@@ -178,7 +179,7 @@
         phoneNumber: "[phone]"
     }
 
-    UT.UnityTestCase {
+    UnityTestCase {
         id: testCase
         name: "Shell"
         when: windowShown

=== modified file 'tests/uqmlscene/CMakeLists.txt'
--- tests/uqmlscene/CMakeLists.txt	2015-01-28 12:59:21 +0000
+++ tests/uqmlscene/CMakeLists.txt	2015-03-02 12:41:55 +0000
@@ -2,7 +2,6 @@
     ${shellapplication_MOC_SRCS}
     ActiveFocusLogger.cpp
     main.cpp
-    ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp
     )
 
 qt5_use_modules(uqmlscene Qml Quick Test)

=== modified file 'tests/uqmlscene/main.cpp'
--- tests/uqmlscene/main.cpp	2015-01-28 12:59:21 +0000
+++ tests/uqmlscene/main.cpp	2015-03-02 12:41:55 +0000
@@ -63,8 +63,6 @@
 #include <QtCore/QTranslator>
 #include <QtCore/QLibraryInfo>
 
-#include <MouseTouchAdaptor.h>
-
 // UbuntuGestures lib
 #include <TouchRegistry.h>
 
@@ -436,8 +434,6 @@
     app.setOrganizationName("Qt Project");
     app.setOrganizationDomain("qt-project.org");
 
-    MouseTouchAdaptor mouseTouchAdaptor;
-    app.installNativeEventFilter(&mouseTouchAdaptor);
     // Create it before loading the module, so that TestUtil
     // doesn't create one with a fake timer factory.
     // When interacting manually with a test we want the real deal.

=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
--- tests/utils/modules/Unity/Test/CMakeLists.txt	2015-02-17 15:06:33 +0000
+++ tests/utils/modules/Unity/Test/CMakeLists.txt	2015-03-02 12:41:55 +0000
@@ -6,12 +6,14 @@
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
+    ${CMAKE_SOURCE_DIR}/src
 )
 
 set(UnityTestQML_SOURCES
     testutil.cpp
     plugin.cpp
     TouchEventSequenceWrapper.cpp
+    ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp
 )
 
 add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})

=== added file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	1970-01-01 00:00:00 +0000
+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-03-02 12:41:55 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.1
+import Unity.Test 0.1
+
+RowLayout {
+    id: root
+    property alias color: label.color
+
+    Binding {
+        target: MouseTouchAdaptor
+        property: "enabled"
+        value: checkbox.checked
+    }
+
+    Layout.fillWidth: true
+    CheckBox {
+        id: checkbox
+        checked: true
+        activeFocusOnPress: false
+    }
+    Label {
+        id: label
+        text: "Mouse emulates touch"
+        anchors.verticalCenter: parent.verticalCenter
+    }
+}

=== modified file 'tests/utils/modules/Unity/Test/plugin.cpp'
--- tests/utils/modules/Unity/Test/plugin.cpp	2013-06-05 22:03:08 +0000
+++ tests/utils/modules/Unity/Test/plugin.cpp	2015-03-02 12:41:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013 Canonical, Ltd.
+ * Copyright (C) 2012, 2013, 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,20 +17,33 @@
 
 #include "plugin.h"
 #include "testutil.h"
+#include <MouseTouchAdaptor.h>
 #include "TouchEventSequenceWrapper.h"
 
 #include <qqml.h>
 
-static QObject *testutil_provider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+namespace {
+QObject *testutil_provider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
 {
     return new TestUtil();
 }
+QObject *getMouseTouchAdaptorQMLSingleton(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return MouseTouchAdaptor::instance();
+}
+} // 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.");
+    qmlRegisterSingletonType<MouseTouchAdaptor>(uri, 0, 1, "MouseTouchAdaptor",
+                                                getMouseTouchAdaptorQMLSingleton);
 }

=== modified file 'tests/utils/modules/Unity/Test/qmldir'
--- tests/utils/modules/Unity/Test/qmldir	2014-05-02 22:57:42 +0000
+++ tests/utils/modules/Unity/Test/qmldir	2015-03-02 12:41:55 +0000
@@ -3,3 +3,4 @@
 typeinfo Test.qmltypes
 
 UnityTestCase 0.1 UnityTestCase.qml
+MouseTouchEmulationCheckbox 0.1 MouseTouchEmulationCheckbox.qml