Merge lp:~robertcarr/unity-system-compositor/add-cursor-option into lp:unity-system-compositor

[kevin gunn]

allow hw cursor option

allow hw cursor use, needed for unity8 desktop preview

[Stephen M. Webb (bregma)]

Stray character in line 9 of the diff. Conditional approval on fixing that.

This has been tested in a PPA.

review: Approve

[Andreas Pokorny (andreas-pokorny)]

looks fine

review: Approve

[lp:~robertcarr/unity-system-compositor/add-cursor-option]

128. By Robert Carr on 2014-04-02

Remove stray n

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/49

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/97/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/98/rebuild

review: Approve (continuous-integration)

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2014-03-17 14:59:24 +0000
+++ src/system_compositor.cpp	2014-04-02 18:54:38 +0000
@@ -144,6 +144,11 @@
     {
         return the_options()->get("power-off-delay", 0);
     }
+    
+    bool enable_hardware_cursor()
+    {
+        return the_options()->get("enable-hardware-cursor", false);
+    }
 
     std::string blacklist()
     {
@@ -165,7 +170,14 @@
             {
             }
         };
-        return std::make_shared<NullCursorListener>();
+        
+        // This is a workaround for u8 desktop preview in 14.04 for the lack of client cursor API.
+        // We need to disable the cursor for XMir but leave it on for the desktop preview.
+        // Luckily as it stands they run inside seperate instances of USC. ~racarr
+        if (enable_hardware_cursor())
+            return mir::DefaultServerConfiguration::the_cursor_listener();
+        else
+            return std::make_shared<NullCursorListener>();
     }
 
     std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override
@@ -232,7 +244,8 @@
             ("blacklist", po::value<std::string>(), "Video blacklist regex to use")
             ("version", "Show version of Unity System Compositor")
             ("public-socket", po::value<bool>(), "Make the socket file publicly writable")
-            ("power-off-delay", po::value<int>(), "Delay in milliseconds before powering off screen [int]");
+            ("power-off-delay", po::value<int>(), "Delay in milliseconds before powering off screen [int]")
+            ("enable-hardware-cursor", po::value<bool>(), "Enable the hardware cursor (disabled by default)");
     }
 
     void parse_config_file(