Merge lp:~dandrader/qtmir/cursorConfinement into lp:qtmir

[Daniel d'Andrada]

Implement cursor confinement

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/cursorConfinement/+merge/303984
https://code.launchpad.net/~dandrader/unity8/cursorConfinement/+merge/303986

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

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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:551
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/351/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2677/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2705
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2578
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2578
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2578
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2571/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2571/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/351/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

+#include "mirwindowmanager.moc"

Do we need to include the MOC files, are they not generated automatically?

---

Otherwise code looks good, didn't test yet though.

review: Needs Information

[Daniel d'Andrada (dandrader)]

On 26/08/2016 11:17, Lukáš Tinkl wrote:
> Review: Needs Information
>
> +#include "mirwindowmanager.moc"
>
> Do we need to include the MOC files, are they not generated automatically?

This is needed when you define a class containing a Q_OBJECT macro
inside a .cpp file. Otherwise compilation will fail with:

"""
AUTOGEN: error:
/home/dandrader/qtmir/cursorConfinement/src/platforms/mirserver/mirwindowmanager.cpp:
The file contains a Q_OBJECT macro, but does not include
"mirwindowmanager.moc" !
"""

[Lukáš Tinkl (lukas-kde)]

LGTM, code looks good, works too

review: Approve

[Lukáš Tinkl (lukas-kde)]

Conflicts ahead:

Text conflict in debian/control
Text conflict in debian/gles-patches/convert-to-gles.patch

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:557
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/361/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2744/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2772/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/361/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/qtmir/cursorConfinement]

559. By Daniel d'Andrada on 2016-09-05

merge lp:~gerboland/qtmir/use-mir-test-dev

560. By Daniel d'Andrada on 2016-09-05

Send relative pointer movement to Mir clients

561. By Daniel d'Andrada on 2016-09-05

Implement cursor confinement

[Daniel d'Andrada (dandrader)]

On 05/09/2016 15:12, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Conflicts ahead:
>
> Text conflict in debian/control
> Text conflict in debian/gles-patches/convert-to-gles.patch

Fixed.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:561
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/363/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2746/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2774/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/363/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Okay

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:561
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/364/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2749/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2777
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2645
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2645
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2645
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2637/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2637/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/364/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

561. By Daniel d'Andrada on 2016-09-05

Implement cursor confinement

560. By Daniel d'Andrada on 2016-09-05

Send relative pointer movement to Mir clients

559. By Daniel d'Andrada on 2016-09-05

merge lp:~gerboland/qtmir/use-mir-test-dev

=== modified file 'debian/control'
--- debian/control	2016-09-05 20:45:26 +0000
+++ debian/control	2016-09-05 20:45:26 +0000
@@ -24,7 +24,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.118),
+               libunity-api-dev (>= 7.119),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -98,7 +98,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-21,
+          unity-application-impl-22,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-08-31 01:51:14 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-09-05 20:45:26 +0000
@@ -84,7 +84,7 @@
 -Conflicts: libqtmir,
 -           libunity-mir1,
 -Provides: unity-application-impl,
--          unity-application-impl-21,
+-          unity-application-impl-22,
 -Description: Qt plugin for Unity specific Mir APIs
 - QtMir provides Qt/QML bindings for Mir features that are exposed through the
 - qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2016-09-05 20:45:26 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-09-05 20:45:26 +0000
@@ -91,6 +91,7 @@
             setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));
         });
         connect(observer.get(), &SurfaceObserver::inputBoundsChanged, this, &MirSurface::setInputBounds);
+        connect(observer.get(), &SurfaceObserver::confinesMousePointerChanged, this, &MirSurface::confinesMousePointerChanged);
         observer->setListener(this);
     }
 
@@ -876,6 +877,11 @@
     return m_inputBounds;
 }
 
+bool MirSurface::confinesMousePointer() const
+{
+    return m_surface->confine_pointer_state() == mir_pointer_confined_to_surface;
+}
+
 void MirSurface::requestFocus()
 {
     DEBUG_MSG << "()";

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2016-08-30 12:24:19 +0000
+++ src/modules/Unity/Application/mirsurface.h	2016-09-05 20:45:26 +0000
@@ -95,6 +95,8 @@
     bool focused() const override;
     QRect inputBounds() const override;
 
+    bool confinesMousePointer() const override;
+
     Q_INVOKABLE void requestFocus() override;
     Q_INVOKABLE void close() override;
     Q_INVOKABLE void raise() override;

=== modified file 'src/platforms/mirserver/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirwindowmanager.cpp	2016-08-08 13:55:43 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2016-09-05 20:45:26 +0000
@@ -207,6 +207,10 @@
         surface->set_input_region(modifications.input_shape.value());
     }
 
+    if (modifications.confine_pointer.is_set()) {
+        surface->set_confine_pointer_state(modifications.confine_pointer.value());
+    }
+
     SurfaceObserver *observer = SurfaceObserver::observerForSurface(surface.get());
     if (observer) {
         observer->notifySurfaceModifications(modifications);
@@ -220,4 +224,4 @@
     return std::make_shared<MirWindowManagerImpl>(displayLayout, sessionListener);
 }
 
-#include "mirwindowmanager.moc"
\ No newline at end of file
+#include "mirwindowmanager.moc"

=== modified file 'src/platforms/mirserver/surfaceobserver.cpp'
--- src/platforms/mirserver/surfaceobserver.cpp	2016-07-15 15:38:04 +0000
+++ src/platforms/mirserver/surfaceobserver.cpp	2016-09-05 20:45:26 +0000
@@ -175,6 +175,9 @@
         QRect qRect = calculateBoundingRect(modifications.input_shape.value());
         Q_EMIT inputBoundsChanged(qRect);
     }
+    if (modifications.confine_pointer.is_set()) {
+        Q_EMIT confinesMousePointerChanged(modifications.confine_pointer.value() == mir_pointer_confined_to_surface);
+    }
 }
 
 SurfaceObserver *SurfaceObserver::observerForSurface(const mir::scene::Surface *surface)

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2016-07-15 15:38:04 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2016-09-05 20:45:26 +0000
@@ -86,6 +86,7 @@
     void heightIncrementChanged(int);
     void shellChromeChanged(MirShellChrome);
     void inputBoundsChanged(const QRect &rect);
+    void confinesMousePointerChanged(bool);
 
 private:
     QCursor createQCursorFromMirCursorImage(const mir::graphics::CursorImage &cursorImage);

=== modified file 'tests/framework/fake_mirsurface.h'
--- tests/framework/fake_mirsurface.h	2016-08-30 12:24:19 +0000
+++ tests/framework/fake_mirsurface.h	2016-09-05 20:45:26 +0000
@@ -78,6 +78,7 @@
 
     bool focused() const override { return false; }
     QRect inputBounds() const override { return QRect(0,0,10,10); }
+    bool confinesMousePointer() const override { return false; }
 
     void requestFocus() override {
         Q_EMIT focusRequested();