Merge lp:~robertcarr/mir/enable-input-by-default into lp:~mir-team/mir/trunk

[Robert Carr]

Enable input by default.

Enable input option by default (currently half enabled!)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/mir-ci/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/518
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/252

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Just curious - I thought a while back that we decided the default should be "off". What has changed?

review: Needs Information

[Daniel van Vugt (vanvugt)]

I think the option should be removed completely. Always on.

review: Needs Fixing

[Kevin DuBois (kdub)]

this shouldn't be the default until that ownership problem that was mentioned yesterday is fixed
on ctrl-c of the eglapp clients: http://pastebin.ubuntu.com/5623397/ with only --enable-input=true

review: Needs Fixing

[Kevin DuBois (kdub)]

also, the input stack is pretty chatty... its probably non-trivial to work the android input logging into our logging stack, but surely we can silence it somehow?

[Robert Carr (robertcarr)]

The ctrl-c issue is fixed. Do we remove the option or keep the default?

[Robert Ancell (robert-ancell)]

Make a second MP if the option should be removed

review: Approve

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-04-26 12:21:57 +0000
+++ src/server/default_server_configuration.cpp	2013-04-29 23:25:30 +0000
@@ -142,6 +142,7 @@
 char const* const glog_minloglevel     = "glog-minloglevel";
 char const* const glog_log_dir         = "glog-log-dir";
 
+bool const enable_input_default = true;
 
 void parse_arguments(
     boost::program_options::options_description desc,
@@ -198,7 +199,7 @@
 
     add_options()
         ("file,f", po::value<std::string>(),    "Socket filename")
-        ("enable-input,i", po::value<bool>(),   "Enable input. [bool:default=false]")
+        ("enable-input,i", po::value<bool>(),   "Enable input. [bool:default=true]")
         (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")
@@ -395,7 +396,7 @@
     return input_manager(
         [&, this]() -> std::shared_ptr<mi::InputManager>
         {
-            if (the_options()->get("enable-input", true))
+            if (the_options()->get("enable-input", enable_input_default))
                 return std::make_shared<mia::InputManager>(the_input_configuration());
             else 
                 return std::make_shared<mi::NullInputManager>();
@@ -602,7 +603,7 @@
     return input_target_listener(
         [&]() -> std::shared_ptr<msh::InputTargetListener>
         {
-            if (the_options()->get("enable-input", false))
+            if (the_options()->get("enable-input", enable_input_default))
                 return std::make_shared<mia::DispatcherController>(the_input_configuration());
             else
                 return std::make_shared<mi::NullInputTargetListener>();