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

Proposed by Robert Carr
Status: Merged
Approved by: Robert Ancell
Approved revision: 34
Merged at revision: 39
Proposed branch: lp:~robertcarr/unity-system-compositor/disable-cursor
Merge into: lp:unity-system-compositor
Diff against target: 35 lines (+13/-0)
1 file modified
src/system_compositor.cpp (+13/-0)
To merge this branch: bzr merge lp:~robertcarr/unity-system-compositor/disable-cursor
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Review via email: mp+174006@code.launchpad.net

Commit message

Disable hardware cursor.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks fine once the other merge lands.

review: Approve
Revision history for this message
Robert Carr (robertcarr) wrote :

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
22#include <mir/shell/session.h>22#include <mir/shell/session.h>
23#include <mir/shell/session_container.h>23#include <mir/shell/session_container.h>
24#include <mir/shell/focus_setter.h>24#include <mir/shell/focus_setter.h>
25#include <mir/input/cursor_listener.h>
2526
26#include <iostream>27#include <iostream>
27#include <thread>28#include <thread>
2829
29namespace msh = mir::shell;30namespace msh = mir::shell;
31namespace mi = mir::input;
3032
31class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration33class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
32{34{
@@ -57,6 +59,17 @@
57 {59 {
58 return the_options()->is_set ("version");60 return the_options()->is_set ("version");
59 }61 }
62
63 std::shared_ptr<mi::CursorListener> the_cursor_listener() override
64 {
65 struct NullCursorListener : public mi::CursorListener
66 {
67 void cursor_moved_to(float, float) override
68 {
69 }
70 };
71 return std::make_shared<NullCursorListener>();
72 }
60};73};
6174
62void SystemCompositor::run(int argc, char const** argv)75void SystemCompositor::run(int argc, char const** argv)

Subscribers

People subscribed via source and target branches