Merge lp:~vanvugt/qtubuntu/fix-cursor into lp:qtubuntu

[Daniel van Vugt]

Implement named cursors that Mir understands (LP: #1625853)

The old strings probably worked in the past. But it appears mir-team changed the set of valid cursor names at some point and didn't tell anyone(?).

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

FAILED: Continuous integration, rev:343
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/121/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[lp:~vanvugt/qtubuntu/fix-cursor]

344. By Daniel van Vugt on 2016-09-26

Try again

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

PASSED: Continuous integration, rev:344
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/122/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2962
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2990
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2848/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2848
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2848/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

What about these changes? https://pastebin.kde.org/p2syqimva

(the only thing I'm slightly unsure is Qt::ForbiddenCursor)

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

Sorry, slightly more correct/complete version: https://pastebin.kde.org/pseu0vpuf

[Daniel d'Andrada (dandrader)]

unity8 and Qt knows more cursors than can be expressed by those mir_*_cursor_name symbols. Those FIXME fallbacks are not acceptable as they will cause regressions in Qt/QML based apps.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

xcursor is a pretty loose standard. a shell should take whatever the cursor name string is and see if the current cursor theme provides it. It could go an extra mile and have fallbacks for well-know cursor names in case the specified one isn't there (like unity8 does).

That's all there's to it. Don't see how using those mir string constants help with anything in that regard.

[Daniel van Vugt (vanvugt)]

I considered fallbacks to fill the gaps in the Mir API but it feels unclean because it's technically violating the Mir API in a way that Mir doesn't notice.

It's worth noting that your X cursor names will only work on Unity8. And soon may not even work on Unity8 since we'll start using the hardware cursor (unity-system-compositor). Basically we just need to fix Mir bug 1388987 ASAP.

[lp:~vanvugt/qtubuntu/fix-cursor]

345. By Daniel van Vugt on 2016-09-28

Best of both worlds (the missing cursors will now at least work in
Unity8)

346. By Daniel van Vugt on 2016-09-28

Remove blank line

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

FAILED: Continuous integration, rev:346
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/127/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2976/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3004
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2862/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2862/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2862/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2862/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2862/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2862/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2862/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2862/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2862
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2862/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~vanvugt/qtubuntu/fix-cursor]

347. By Daniel van Vugt on 2016-09-28

Try again, Jenkins

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

PASSED: Continuous integration, rev:347
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/128/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2977
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3005
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2863/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2863
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2863/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> It's worth noting that your X cursor names will only work on Unity8. And soon
> may not even work on Unity8 since we'll start using the hardware cursor
> (unity-system-compositor). Basically we just need to fix Mir bug 1388987
> ASAP.

Unity8 will still be deciding which image the hardware cursor will use. So my previous observations still hold.

[Daniel d'Andrada (dandrader)]

Thanks

review: Approve

=== modified file 'src/ubuntumirclient/cursor.cpp'
--- src/ubuntumirclient/cursor.cpp	2016-06-22 17:16:33 +0000
+++ src/ubuntumirclient/cursor.cpp	2016-09-28 09:28:51 +0000
@@ -26,25 +26,30 @@
 UbuntuCursor::UbuntuCursor(MirConnection *connection)
     : mConnection(connection)
 {
-    mShapeToCursorName[Qt::ArrowCursor] = "left_ptr";
+    /*
+     * TODO: Add the missing cursors to Mir (LP: #1388987)
+     *       Those are the ones without a mir_ prefix, which are X11 cursors
+     *       and won't be understood by any shell other than Unity8.
+     */
+    mShapeToCursorName[Qt::ArrowCursor] = mir_arrow_cursor_name;
     mShapeToCursorName[Qt::UpArrowCursor] = "up_arrow";
-    mShapeToCursorName[Qt::CrossCursor] = "cross";
-    mShapeToCursorName[Qt::WaitCursor] = "watch";
-    mShapeToCursorName[Qt::IBeamCursor] = "xterm";
-    mShapeToCursorName[Qt::SizeVerCursor] = "size_ver";
-    mShapeToCursorName[Qt::SizeHorCursor] = "size_hor";
-    mShapeToCursorName[Qt::SizeBDiagCursor] = "size_bdiag";
-    mShapeToCursorName[Qt::SizeFDiagCursor] = "size_fdiag";
-    mShapeToCursorName[Qt::SizeAllCursor] = "size_all";
-    mShapeToCursorName[Qt::BlankCursor] = "blank";
-    mShapeToCursorName[Qt::SplitVCursor] = "split_v";
-    mShapeToCursorName[Qt::SplitHCursor] = "split_h";
-    mShapeToCursorName[Qt::PointingHandCursor] = "hand";
+    mShapeToCursorName[Qt::CrossCursor] = mir_crosshair_cursor_name;
+    mShapeToCursorName[Qt::WaitCursor] = mir_busy_cursor_name;
+    mShapeToCursorName[Qt::IBeamCursor] = mir_caret_cursor_name;
+    mShapeToCursorName[Qt::SizeVerCursor] = mir_vertical_resize_cursor_name;
+    mShapeToCursorName[Qt::SizeHorCursor] = mir_horizontal_resize_cursor_name;
+    mShapeToCursorName[Qt::SizeBDiagCursor] = mir_diagonal_resize_bottom_to_top_cursor_name;
+    mShapeToCursorName[Qt::SizeFDiagCursor] = mir_diagonal_resize_top_to_bottom_cursor_name;
+    mShapeToCursorName[Qt::SizeAllCursor] = mir_omnidirectional_resize_cursor_name;
+    mShapeToCursorName[Qt::BlankCursor] = mir_disabled_cursor_name;
+    mShapeToCursorName[Qt::SplitVCursor] = mir_vsplit_resize_cursor_name;
+    mShapeToCursorName[Qt::SplitHCursor] = mir_hsplit_resize_cursor_name;
+    mShapeToCursorName[Qt::PointingHandCursor] = mir_pointing_hand_cursor_name;
     mShapeToCursorName[Qt::ForbiddenCursor] = "forbidden";
     mShapeToCursorName[Qt::WhatsThisCursor] = "whats_this";
     mShapeToCursorName[Qt::BusyCursor] = "left_ptr_watch";
-    mShapeToCursorName[Qt::OpenHandCursor] = "openhand";
-    mShapeToCursorName[Qt::ClosedHandCursor] = "closedhand";
+    mShapeToCursorName[Qt::OpenHandCursor] = mir_open_hand_cursor_name;
+    mShapeToCursorName[Qt::ClosedHandCursor] = mir_closed_hand_cursor_name;
     mShapeToCursorName[Qt::DragCopyCursor] = "dnd-copy";
     mShapeToCursorName[Qt::DragMoveCursor] = "dnd-move";
     mShapeToCursorName[Qt::DragLinkCursor] = "dnd-link";