Merge lp:~robertcarr/mir/dedupe-null-input-managers into lp:~mir-team/mir/trunk

[Robert Carr]

Remove duplicate null input manager definitions.

Remove duplicate null input manager definitions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:552
http://jenkins.qa.ubuntu.com/job/mir-ci/285/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/290/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/96

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:553
http://jenkins.qa.ubuntu.com/job/mir-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/295
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/101

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

This does not need to be virtual but it doesn't hurt:
  virtual ~NullInputManager() {}

Also, isn't this server/testing code? If so then the license looks wrong: "GNU Lesser General Public License". It should probably be GPL for pure server components.

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> This does not need to be virtual but it doesn't hurt:
> virtual ~NullInputManager() {}

It is virtual regardless of how it is written, but it doesn't need to be written (and could be noexcept).

> Also, isn't this server/testing code? If so then the license looks wrong: "GNU
> Lesser General Public License". It should probably be GPL for pure server
> components.

It is in the server .so, so LGPL is correct.

review: Approve

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-04-02 09:36:09 +0000
+++ examples/render_surfaces.cpp	2013-04-02 19:32:21 +0000
@@ -23,7 +23,7 @@
 #include "mir/geometry/size.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/display.h"
-#include "mir/input/input_manager.h"
+#include "mir/input/null_input_manager.h"
 #include "mir/shell/surface_builder.h"
 #include "mir/surfaces/surface.h"
 #include "mir/default_server_configuration.h"
@@ -380,20 +380,6 @@
 // Stub out input.
 std::shared_ptr<mi::InputManager> RenderSurfacesServerConfiguration::the_input_manager()
 {
-    struct NullInputManager : public mi::InputManager
-    {
-        void start() {}
-        void stop() {}
-        std::shared_ptr<mi::InputChannel> make_input_channel()
-        {
-            return std::shared_ptr<mi::InputChannel>();
-        }
-        void set_input_focus_to(std::shared_ptr<mi::SessionTarget> const& /* session */,
-                                std::shared_ptr<mi::SurfaceTarget> const& /* surface */)
-        {
-        }
-    };
-
-    return std::make_shared<NullInputManager>();
+    return std::make_shared<mi::NullInputManager>();
 }
 ///\internal [NullInputManager_tag]

=== added file 'include/server/mir/input/null_input_manager.h'
--- include/server/mir/input/null_input_manager.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/null_input_manager.h	2013-04-02 19:32:21 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_INPUT_NULL_INPUT_MANAGER_H_
+#define MIR_INPUT_NULL_INPUT_MANAGER_H_
+
+#include "mir/input/input_manager.h"
+
+namespace mir
+{
+namespace input
+{
+
+class NullInputManager : public InputManager
+{
+public:
+    NullInputManager() {};
+    virtual ~NullInputManager() {}
+
+    void start() {}
+    void stop() {}
+
+    std::shared_ptr<InputChannel> make_input_channel()
+    {
+        return std::shared_ptr<InputChannel>();
+    }
+
+    virtual void set_input_focus_to(std::shared_ptr<input::SessionTarget> const& /* session */,
+                                    std::shared_ptr<input::SurfaceTarget> const& /* surface */)
+    {
+    }
+
+protected:
+    NullInputManager(const NullInputManager&) = delete;
+    NullInputManager& operator=(const NullInputManager&) = delete;
+};
+
+}
+}
+
+#endif // MIR_INPUT_NULL_INPUT_MANAGER

=== modified file 'src/server/input/CMakeLists.txt'
--- src/server/input/CMakeLists.txt	2013-03-13 04:54:15 +0000
+++ src/server/input/CMakeLists.txt	2013-04-02 19:32:21 +0000
@@ -9,7 +9,7 @@
 else()
 list(
   APPEND INPUT_SOURCES
-  dummy_input_manager.cpp
+  null_input_platform.cpp
 )
 endif()
 

=== renamed file 'src/server/input/dummy_input_manager.cpp' => 'src/server/input/null_input_platform.cpp'
--- src/server/input/dummy_input_manager.cpp	2013-03-29 16:51:35 +0000
+++ src/server/input/null_input_platform.cpp	2013-04-02 19:32:21 +0000
@@ -16,27 +16,14 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/input/input_manager.h"
+#include "mir/input/null_input_manager.h"
 
 namespace mg = mir::graphics;
 namespace mi = mir::input;
 
-namespace
-{
-class DummyInputManager : public mi::InputManager
-{
-    void stop() {}
-    void start() {}
-    virtual std::shared_ptr<mi::InputChannel> make_input_channel() { return std::shared_ptr<mi::InputChannel>(); }
-    void set_input_focus_to(std::shared_ptr<mi::SessionTarget> const& /* session */, std::shared_ptr<mi::SurfaceTarget> const& /* surface */)
-    {
-    }
-};
-}
-
 std::shared_ptr<mi::InputManager> mi::create_input_manager(
     const std::initializer_list<std::shared_ptr<mi::EventFilter> const>& ,
     std::shared_ptr<mg::ViewableArea> const& )
 {
-    return std::make_shared<DummyInputManager>();
+    return std::make_shared<mi::NullInputManager>();
 }