QtMir

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

resolveMirCursorNames
Merge into trunk

Proposed by Daniel d'Andrada on 2017-02-09

Status:

Merged

Approved by:

Albert Astals Cid on 2017-02-09

Approved revision:

596

Merged at revision:

605

Proposed branch:

lp:~dandrader/qtmir/resolveMirCursorNames

Merge into:

lp:qtmir

Diff against target:

64 lines (+22/-19)

1 file modified

src/modules/Unity/Application/mirsurface.cpp (+22/-19)

To merge this branch:

bzr merge lp:~dandrader/qtmir/resolveMirCursorNames

Undecided

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-02-09
Albert Astals Cid (community)		2017-02-09	Approve on 2017-02-09
Review via email: mp+316820@code.launchpad.net

Commit message

Resolve mir cursor names using mir symbols instead of plain strings

Since those names under the API symbols change regularly and should be considered opaque.

Description of the change

For instructions on how to test, see the bug description.

* 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

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

lp:~dandrader/qtmir/resolveMirCursorNames updated on 2017-02-09

596. By Daniel d'Andrada on 2017-02-09

Resolve mir cursor names using mir symbols instead of plain strings

Since those names under the API symbols change regularly and should be considered opaque.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-09:

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

* Did CI run pass? If not, please explain why.
Let's wait for it before top approval

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mir development team

 === modified file 'src/modules/Unity/Application/mirsurface.cpp'
 --- src/modules/Unity/Application/mirsurface.cpp	2017-02-06 09:11:04 +0000
 +++ src/modules/Unity/Application/mirsurface.cpp	2017-02-09 11:02:20 +0000
@@ -35,6 +35,7 @@
  #include <mir/scene/surface.h>
  #include <mir/scene/surface_observer.h>
  #include <mir/version.h>
++#include <mir_toolkit/cursors.h>
  // mirserver
  #include <logging.h>
@@ -1076,6 +1077,27 @@
      : m_listener(nullptr)
      , m_framesPosted(false)
+ {
++    // mir cursor names, used by the mir protocol
++
++    m_cursorNameToShape[mir_default_cursor_name] = Qt::ArrowCursor;
++    m_cursorNameToShape[mir_arrow_cursor_name] = Qt::ArrowCursor;
++    m_cursorNameToShape[mir_crosshair_cursor_name] = Qt::CrossCursor;
++    m_cursorNameToShape[mir_busy_cursor_name] =  Qt::WaitCursor;
++    m_cursorNameToShape[mir_caret_cursor_name] = Qt::IBeamCursor;
++    m_cursorNameToShape[mir_vertical_resize_cursor_name] = Qt::SizeVerCursor;
++    m_cursorNameToShape[mir_horizontal_resize_cursor_name] = Qt::SizeHorCursor;
++    m_cursorNameToShape[mir_diagonal_resize_bottom_to_top_cursor_name] = Qt::SizeBDiagCursor;
++    m_cursorNameToShape[mir_diagonal_resize_top_to_bottom_cursor_name] = Qt::SizeFDiagCursor;
++    m_cursorNameToShape[mir_omnidirectional_resize_cursor_name] = Qt::SizeAllCursor;
++    m_cursorNameToShape[mir_disabled_cursor_name] = Qt::BlankCursor;
++    m_cursorNameToShape[mir_vsplit_resize_cursor_name] = Qt::SplitVCursor;
++    m_cursorNameToShape[mir_hsplit_resize_cursor_name] = Qt::SplitHCursor;
++    m_cursorNameToShape[mir_pointing_hand_cursor_name] = Qt::PointingHandCursor;
++    m_cursorNameToShape[mir_open_hand_cursor_name] = Qt::OpenHandCursor;
++    m_cursorNameToShape[mir_closed_hand_cursor_name] = Qt::ClosedHandCursor;
++
++    // xcursor names, used by our cursor themes
++
      m_cursorNameToShape["left_ptr"] = Qt::ArrowCursor;
      m_cursorNameToShape["up_arrow"] = Qt::UpArrowCursor;
      m_cursorNameToShape["cross"] = Qt::CrossCursor;
@@ -1099,25 +1121,6 @@
      m_cursorNameToShape["dnd-move"] = Qt::DragMoveCursor;
      m_cursorNameToShape["dnd-link"] = Qt::DragLinkCursor;
--    // Used by Mir client API (mir_*_cursor_name strings)
--    m_cursorNameToShape["default"] = Qt::ArrowCursor;
--    m_cursorNameToShape["disabled"] = Qt::BlankCursor;
--    m_cursorNameToShape["arrow"] = Qt::ArrowCursor;
--    m_cursorNameToShape["busy"] = Qt::WaitCursor;
--    m_cursorNameToShape["caret"] = Qt::IBeamCursor;
--    m_cursorNameToShape["pointing-hand"] = Qt::PointingHandCursor;
--    m_cursorNameToShape["open-hand"] = Qt::OpenHandCursor;
--    m_cursorNameToShape["closed-hand"] = Qt::ClosedHandCursor;
--    m_cursorNameToShape["horizontal-resize"] = Qt::SizeHorCursor;
--    m_cursorNameToShape["vertical-resize"] = Qt::SizeVerCursor;
--    m_cursorNameToShape["diagonal-resize-bottom-to-top"] = Qt::SizeBDiagCursor;
--    m_cursorNameToShape["diagonal-resize-top_to_bottom"] = Qt::SizeFDiagCursor; // current string with typo
--    m_cursorNameToShape["diagonal-resize-top-to-bottom"] = Qt::SizeFDiagCursor; // how it will be when they fix it (if ever)
--    m_cursorNameToShape["omnidirectional-resize"] = Qt::SizeAllCursor;
--    m_cursorNameToShape["vsplit-resize"] = Qt::SplitVCursor;
--    m_cursorNameToShape["hsplit-resize"] = Qt::SplitHCursor;
--    m_cursorNameToShape["crosshair"] = Qt::CrossCursor;
--
      qRegisterMetaType<MirShellChrome>("MirShellChrome");
+ }