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

[Robert Carr]

Disable hardware cursor.

Pending https://code.launchpad.net/~robertcarr/mir/improve-cursor-configuration/+merge/174003

Disable the cursor.

The input stack is left on so it can later be used for VT handling.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/9/console

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

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks fine once the other merge lands.

review: Approve

[Robert Carr (robertcarr)]

Should be good to go. Requested another review from Jenkins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/14

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-07-03 04:22:42 +0000
+++ src/system_compositor.cpp	2013-07-10 17:18:28 +0000
@@ -22,11 +22,13 @@
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
 #include <mir/shell/focus_setter.h>
+#include <mir/input/cursor_listener.h>
 
 #include <iostream>
 #include <thread>
 
 namespace msh = mir::shell;
+namespace mi = mir::input;
 
 class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
 {
@@ -57,6 +59,17 @@
     {
         return the_options()->is_set ("version");
     }
+    
+    std::shared_ptr<mi::CursorListener> the_cursor_listener() override
+    {
+        struct NullCursorListener : public mi::CursorListener
+        {
+            void cursor_moved_to(float, float) override
+            {
+            }
+        };
+        return std::make_shared<NullCursorListener>();
+    }
 };
 
 void SystemCompositor::run(int argc, char const** argv)