Merge lp:~robertcarr/mir/improve-cursor-configuration into lp:~mir-team/mir/trunk

[Robert Carr]

Extract DefaultServerConfiguration::the_cursor_listener from DefaultServerConfiguration::the_input_configuration

Make it easy to override the cursor listener for unity-system-compositor

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:829
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robertcarr/mir/improve-cursor-configuration/+merge/174003/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/971/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/209
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/609

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/971/rebuild

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

I don't know what needs to access this but the code makes sense.

review: Approve

[Robert Ancell (robert-ancell)]

There seems to be some additional indentation around lines 48-52 of the diff.

[Robert Ancell (robert-ancell)]

Oh, from the bug I guess this is so we ignore the cursor moving and don't move the cursor overlay? I would have thought we'd just turn the whole cursor off somewhere so we don't use a layer and the input system isn't running (for mouse inputs).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:829
http://jenkins.qa.ubuntu.com/job/mir-ci/978/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/216
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/615

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/978/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Alexandros Frantzis (afrantzis)]

As Robert mentioned the braces are indented too deeply:

48 + if (auto c = cursor.lock())
49 + {
50 + c->move_to(geom::Point{geom::X(abs_x), geom::Y(abs_y)});
51 + }

Also since geom::Point now has a new constructor, we can now just use geom::Point{abs_x, abs_y}

[Alan Griffiths (alan-griffiths)]

Would be OK, except it trivially conflicts with trunk

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/mir-ci/1001/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/239
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/637

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1001/rebuild

review: Approve (continuous-integration)

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-07-10 08:50:53 +0000
+++ include/server/mir/default_server_configuration.h	2013-07-12 20:53:27 +0000
@@ -90,6 +90,7 @@
 class EventFilter;
 class InputChannelFactory;
 class InputConfiguration;
+class CursorListener;
 }
 
 namespace logging
@@ -192,6 +193,7 @@
     virtual std::initializer_list<std::shared_ptr<input::EventFilter> const> the_event_filters();
     virtual std::shared_ptr<surfaces::InputRegistrar> the_input_registrar();
     virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
+    virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
     /** @} */
 
     /** @name logging configuration - customization
@@ -224,6 +226,7 @@
     CachedPtr<input::InputManager>    input_manager;
     CachedPtr<surfaces::InputRegistrar> input_registrar;
     CachedPtr<shell::InputTargeter> input_targeter;
+    CachedPtr<input::CursorListener> cursor_listener;
     CachedPtr<graphics::Platform>     graphics_platform;
     CachedPtr<graphics::BufferInitializer> buffer_initializer;
     CachedPtr<compositor::GraphicBufferAllocator> buffer_allocator;

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-07-11 09:51:41 +0000
+++ src/server/default_server_configuration.cpp	2013-07-12 20:53:27 +0000
@@ -466,35 +466,44 @@
         });
 }
 
+std::shared_ptr<mi::CursorListener>
+mir::DefaultServerConfiguration::the_cursor_listener()
+{
+    struct DefaultCursorListener : mi::CursorListener
+    {
+        DefaultCursorListener(std::weak_ptr<mg::Cursor> const& cursor) :
+            cursor(cursor)
+        {
+        }
+
+        void cursor_moved_to(float abs_x, float abs_y)
+        {
+            if (auto c = cursor.lock())
+            {
+                c->move_to(geom::Point{abs_x, abs_y});
+            }
+        }
+
+        std::weak_ptr<mg::Cursor> const cursor;
+    };
+    return cursor_listener(
+        [this]() -> std::shared_ptr<mi::CursorListener>
+        {
+            return std::make_shared<DefaultCursorListener>(the_display()->the_cursor());
+        });
+}
+
 std::shared_ptr<mi::InputConfiguration>
 mir::DefaultServerConfiguration::the_input_configuration()
 {
     if (!input_configuration)
     {
-        struct DefaultCursorListener : mi::CursorListener
-        {
-            DefaultCursorListener(std::weak_ptr<mg::Cursor> const& cursor) :
-                cursor(cursor)
-            {
-            }
-
-            void cursor_moved_to(float abs_x, float abs_y)
-            {
-                if (auto c = cursor.lock())
-                {
-                    c->move_to(geom::Point{abs_x, abs_y});
-                }
-            }
-
-            std::weak_ptr<mg::Cursor> const cursor;
-        };
-
         if (the_options()->get("enable-input", enable_input_default))
         {
             input_configuration = std::make_shared<mia::DefaultInputConfiguration>(
                 the_event_filters(),
                 the_display(),
-                std::make_shared<DefaultCursorListener>(the_display()->the_cursor()),
+                the_cursor_listener(),
                 the_input_report());
         }
         else