Merge lp:~robertcarr/mir/remove-mir-disable-input into lp:~mir-team/mir/trunk

[Robert Carr]

Remove MIR_DISABLE_INPUT build option and replace with a runtime option.

Remove MIR_DISABLE_INPUT build option and replace with a runtime option.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/mir-ci/294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/299
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/106

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good as far as the scripts/docs/android etc go. this also reminded me that our android install script isn't working too well... I can take care of that though.

only issue, and its pre-existing, so i'll +1 the mp, but:
170: pre-existing issue, but we return an empty shared_ptr. is there anything else we could do?

review: Approve

[Daniel van Vugt (vanvugt)]

You forgot to set prereqisite = lp:~robertcarr/mir/dedupe-null-input-managers

Changes from that branch should not be visible in this proposal.

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

Also, I thought bug 1157613 would hold this back. But that bug has magically been resolved at some point.

[Alan Griffiths (alan-griffiths)]

Fine apart from the incorrect dependency on lp:~robertcarr/mir/dedupe-null-input-managers - but if that lands, I'm happy with this.

review: Approve

=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt	2013-03-21 03:32:59 +0000
+++ 3rd_party/CMakeLists.txt	2013-04-02 21:14:24 +0000
@@ -28,10 +28,8 @@
   add_subdirectory(android-fbtype)
 endif()
 
-if (NOT MIR_DISABLE_INPUT)
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
-  add_subdirectory(android-input)
-endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
+add_subdirectory(android-input)
 
 set(MIR_ANDROID_INCLUDE_DIRECTORIES ${MIR_ANDROID_INCLUDE_DIRECTORIES} PARENT_SCOPE)
 set(
@@ -39,9 +37,7 @@
   ${MIR_ANDROID_INPUT_COMPILE_FLAGS}
   PARENT_SCOPE)
   
-if (NOT MIR_DISABLE_INPUT)
 target_link_libraries(
   3rd_party
 
   android-input)
-endif()
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-28 14:20:06 +0000
+++ CMakeLists.txt	2013-04-02 21:14:24 +0000
@@ -103,13 +103,6 @@
   "graphics backend to build (options are 'gbm' or 'android')"
 )
 
-set (MIR_DISABLE_INPUT
-  false
-  CACHE
-  BOOL
-  "Don't build the input subsystem"
-)
-
 set (MIR_INPUT_USE_ANDROID_TYPES
   false
   CACHE
 
=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2013-03-26 15:55:51 +0000
+++ cross-compile-chroot.sh	2013-04-02 21:14:24 +0000
@@ -26,7 +26,6 @@
       -DBoost_COMPILER=-gcc \
       -DMIR_ENABLE_DEATH_TESTS=NO \
       -DMIR_PLATFORM=android \
-      -DMIR_DISABLE_INPUT=true \
       .. 
 
     cmake --build .
 
=== modified file 'debian/rules'
--- debian/rules	2013-03-13 04:54:15 +0000
+++ debian/rules	2013-04-02 21:14:24 +0000
@@ -15,7 +15,6 @@
 
 COMMON_CONFIGURE_OPTIONS = \
   -DMIR_DISABLE_EPOLL_REACTOR=YES \
-  -DMIR_DISABLE_INPUT=YES \
   -DBUILD_DOXYGEN=YES
 
 # We need to rely on the select-based reactor to fix the ppa builds.
 
=== modified file 'doc/building_source_for_android.md'
--- doc/building_source_for_android.md	2013-03-26 16:30:53 +0000
+++ doc/building_source_for_android.md	2013-04-02 21:14:24 +0000
@@ -42,7 +42,7 @@
 
        $ bzr branch lp:mir
        $ mkdir mir/build; cd mir/build
-       $ cmake -DBoost_COMPILER=-gcc -DMIR_ENABLE_DEATH_TESTS=NO -DMIR_PLATFORM=android -DMIR_DISABLE_INPUT=yes ..
+       $ cmake -DBoost_COMPILER=-gcc -DMIR_ENABLE_DEATH_TESTS=NO -DMIR_PLATFORM=android ..
 
 Cross Compile
 -------------
@@ -63,7 +63,7 @@
 
         $ bzr branch lp:mir
         $ mkdir mir/build; cd mir/build
-        $ MIR_NDK_PATH=/path/to/depenendcies/chroot cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake -DBoost_COMPILER=-gcc -DMIR_ENABLE_DEATH_TESTS=NO -DMIR_PLATFORM=android -DMIR_DISABLE_INPUT=yes ..
+        $ MIR_NDK_PATH=/path/to/depenendcies/chroot cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake -DBoost_COMPILER=-gcc -DMIR_ENABLE_DEATH_TESTS=NO -DMIR_PLATFORM=android ..
         $ make
 
 N.B. The `cross-compile-android.sh` script in mir's top level directory
 
=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-04-02 09:36:09 +0000
+++ examples/render_surfaces.cpp	2013-04-02 21:14:24 +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 21:14:24 +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/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-03-28 14:20:06 +0000
+++ src/server/default_server_configuration.cpp	2013-04-02 21:14:24 +0000
@@ -44,6 +44,7 @@
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/null_display_report.h"
 #include "mir/input/input_manager.h"
+#include "mir/input/null_input_manager.h"
 #include "mir/logging/logger.h"
 #include "mir/logging/dumb_console_logger.h"
 #include "mir/logging/glog_logger.h"
@@ -140,6 +141,7 @@
         "Environment variables capitalise long form with prefix \"MIR_SERVER_\" and \"_\" in place of \"-\"");
     desc.add_options()
         ("file,f", po::value<std::string>(),    "Socket filename")
+        ("enable-input,i", po::value<bool>(),   "Enable input. [bool:default=false]")
         (log_display, po::value<bool>(),        "Log the Display report. [bool:default=false]")
         (log_app_mediator, po::value<bool>(),   "Log the ApplicationMediator report. [bool:default=false]")
         (log_msg_processor, po::value<bool>(), "log the MessageProcessor report")
@@ -316,9 +318,12 @@
 mir::DefaultServerConfiguration::the_input_manager()
 {
     return input_manager(
-        [&, this]()
+        [&, this]() -> std::shared_ptr<mi::InputManager>
         {
-            return mi::create_input_manager(the_event_filters(), the_display());
+            if (the_options()->get("enable-input", false))
+                return mi::create_input_manager(the_event_filters(), the_display());
+            else 
+                return std::make_shared<mi::NullInputManager>();
         });
 }
 
 
=== 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 21:14:24 +0000
@@ -4,14 +4,7 @@
   event_filter_chain.cpp
 )
 
-if (NOT MIR_DISABLE_INPUT)
 add_subdirectory(android)
-else()
-list(
-  APPEND INPUT_SOURCES
-  dummy_input_manager.cpp
-)
-endif()
 
 add_library(
   mirinput STATIC
 
=== removed file 'src/server/input/dummy_input_manager.cpp'
--- src/server/input/dummy_input_manager.cpp	2013-03-29 16:51:35 +0000
+++ src/server/input/dummy_input_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2012 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: Alan Griffiths <[e-mail]>
- */
-
-#include "mir/input/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>();
-}
 
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2013-03-29 22:30:35 +0000
+++ tests/integration-tests/CMakeLists.txt	2013-04-02 21:14:24 +0000
@@ -12,9 +12,7 @@
 add_subdirectory(frontend/)
 add_subdirectory(shell/)
 add_subdirectory(process/)
-if (NOT MIR_DISABLE_INPUT)
 add_subdirectory(input/)
-endif()
 
 if (MIR_PLATFORM STREQUAL "android")
   include_directories(${PROJECT_SOURCE_DIR}/include/accessory)
 
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2013-03-28 09:50:09 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2013-04-02 21:14:24 +0000
@@ -10,12 +10,10 @@
   event_factory.cpp
 )
 
-if (NOT MIR_DISABLE_INPUT)
 list(APPEND TEST_UTILS_SRCS
   fake_event_hub.cpp
   fake_event_hub_input_configuration.cpp
 )
-endif()
 
 list(APPEND TEST_UTILS_SRCS
   test_protobuf_socket_server.cpp
 
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2013-03-29 22:30:35 +0000
+++ tests/unit-tests/CMakeLists.txt	2013-04-02 21:14:24 +0000
@@ -11,11 +11,8 @@
 add_subdirectory(shell/)
 add_subdirectory(geometry/)
 add_subdirectory(graphics/)
-#TODO stubbed out to run tests on emulator 
-if (NOT MIR_DISABLE_INPUT)
 add_subdirectory(input/)
 add_subdirectory(android_input/)
-endif()
 add_subdirectory(surfaces/)
 add_subdirectory(draw/)