Merge lp:~robertcarr/mir/fix-disabled-input into lp:~mir-team/mir/trunk

[Robert Carr]

Fix disabled input.

Fix disabled input.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/mir-ci/405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/410
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/189

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks right

review: Approve

[Chris Halse Rogers (raof)]

Looks right, fixes the bug.

review: Approve

=== added file 'include/server/mir/input/null_input_focus_selector.h'
--- include/server/mir/input/null_input_focus_selector.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/null_input_focus_selector.h	2013-04-17 02:05:30 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 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_FOCUS_SELECTOR_H_
+#define MIR_INPUT_NULL_INPUT_FOCUS_SELECTOR_H_
+
+#include "mir/shell/input_focus_selector.h"
+
+namespace mir
+{
+namespace input
+{
+
+class NullInputFocusSelector : public shell::InputFocusSelector
+{
+public:
+    NullInputFocusSelector() {};
+    virtual ~NullInputFocusSelector() {}
+    
+    virtual void set_input_focus_to(std::shared_ptr<input::SessionTarget> const&,
+                                    std::shared_ptr<input::SurfaceTarget> const&)
+    {
+    }
+
+protected:
+    NullInputFocusSelector(const NullInputFocusSelector&) = delete;
+    NullInputFocusSelector& operator=(const NullInputFocusSelector&) = delete;
+};
+
+}
+}
+
+#endif // MIR_INPUT_NULL_INPUT_FOCUS_SELECTOR_H_

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-04-17 01:08:27 +0000
+++ src/server/default_server_configuration.cpp	2013-04-17 02:05:30 +0000
@@ -45,6 +45,7 @@
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/null_display_report.h"
 #include "mir/input/null_input_manager.h"
+#include "mir/input/null_input_focus_selector.h"
 #include "input/android/default_android_input_configuration.h"
 #include "input/android/android_input_manager.h"
 #include "input/android/android_dispatcher_controller.h"
@@ -520,9 +521,12 @@
 std::shared_ptr<msh::InputFocusSelector> mir::DefaultServerConfiguration::the_input_focus_selector()
 {
     return input_focus_selector(
-        [&]()
+        [&]() -> std::shared_ptr<msh::InputFocusSelector>
         {
-            return std::make_shared<mia::DispatcherController>(the_input_configuration());
+            if (the_options()->get("enable-input", false))
+                return std::make_shared<mia::DispatcherController>(the_input_configuration());
+            else
+                return std::make_shared<mi::NullInputFocusSelector>();
         });
 }