Merge lp:~alan-griffiths/miral/cursor-theme into lp:miral

[Alan Griffiths]

Make cursor theme configurable

[Gerry Boland (gerboland)]

Nice and easy, thank you

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:557
https://mir-jenkins.ubuntu.com/job/miral-ci/34/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/50
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4875
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4864
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4864
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4864
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial+overlay/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial+overlay/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial+overlay/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial+overlay/54/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/54
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/54/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/miral-ci/34/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2017-04-17 09:48:00 +0000
+++ debian/changelog	2017-06-20 08:51:47 +0000
@@ -6,6 +6,9 @@
     - Enhancements:
       . Support for passing messages to enable Drag & Drop
       . Support for client requested move
+      . Port to the undeprecated Mir APIs
+      . Added "--cursor-theme" option when configuring a cursor theme
+      . Drop support for Mir versions before 0.26
     - Bugs fixed:
 
  -- Alan Griffiths <[e-mail]>  Tue, 21 Mar 2017 17:57:20 +0000

=== modified file 'include/miral/cursor_theme.h'
--- include/miral/cursor_theme.h	2016-09-28 10:38:36 +0000
+++ include/miral/cursor_theme.h	2017-06-20 08:51:47 +0000
@@ -25,11 +25,11 @@
 
 namespace miral
 {
-/// Load a cursor theme
+/// Load an X-cursor theme, either the supplied default, or through the --cursor-theme config option
 class CursorTheme
 {
 public:
-    /// Specify a specific theme
+    /// Specify a default theme
     explicit CursorTheme(std::string const& theme);
     ~CursorTheme();
 

=== modified file 'miral/cursor_theme.cpp'
--- miral/cursor_theme.cpp	2016-09-28 10:57:41 +0000
+++ miral/cursor_theme.cpp	2017-06-20 08:51:47 +0000
@@ -19,6 +19,7 @@
 #include "miral/cursor_theme.h"
 #include "xcursor_loader.h"
 
+#include <mir/options/option.h>
 #include <mir/server.h>
 #include <mir_toolkit/cursors.h>
 
@@ -43,8 +44,14 @@
 
 void miral::CursorTheme::operator()(mir::Server& server) const
 {
+    static char const* const option = "cursor-theme";
+
+    server.add_configuration_option(option, "Cursor theme (e.g. \"DMZ-Black\")", theme);
+
     server.override_the_cursor_images([&]
         {
+            auto const theme = server.get_options()->get<std::string const>(option);
+
             std::shared_ptr<mi::CursorImages> const xcursor_loader{std::make_shared<XCursorLoader>(theme)};
 
             if (has_default_cursor(*xcursor_loader))