Merge lp:~albaguirre/unity-system-compositor/no-inactivity-handling-desktop into lp:unity-system-compositor

[Alberto Aguirre]

Disable inactivity and power key handling for desktop. Fixes LP: #1337325

Disable inactivity and power key handling for desktop

Also:
Some version numbers were not updated
powerd is not needed on desktop so changed it to suggests instead of recommends

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/130/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

LGTM

review: Approve

[lp:~albaguirre/unity-system-compositor/no-inactivity-handling-desktop]

153. By Alberto Aguirre on 2014-07-03

Make bool options consistent in use (i.e. avoid bool_switch)

154. By Alberto Aguirre on 2014-07-03

Undo version bump in replaces/breaks

[Michael Terry (mterry)]

LGTM

review: Approve

[lp:~albaguirre/unity-system-compositor/no-inactivity-handling-desktop]

155. By Alberto Aguirre on 2014-07-03

Update command line since we are not using bool_switch anymore

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-06 20:06:27 +0000
+++ CMakeLists.txt	2014-07-03 21:24:57 +0000
@@ -18,7 +18,7 @@
 set(PACKAGE "unity-system-compositor")
 set(USC_VERSION_MAJOR 0)
 set(USC_VERSION_MINOR 0)
-set(USC_VERSION_PATCH 2)
+set(USC_VERSION_PATCH 4)
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8)

=== modified file 'debian/control'
--- debian/control	2014-06-27 00:49:05 +0000
+++ debian/control	2014-07-03 21:24:57 +0000
@@ -36,7 +36,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Recommends: powerd,
+Suggests: powerd,
 Description: System compositor for Ubuntu
  System compositor used by the Mir display server in Ubuntu. If the Unity
  System Compositor can't start, LightDM will fallback to plain Xorg display

=== modified file 'debian/unity-system-compositor.sleep'
--- debian/unity-system-compositor.sleep	2013-08-28 07:28:30 +0000
+++ debian/unity-system-compositor.sleep	2014-07-03 21:24:57 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 sleep .1
-exec /usr/sbin/unity-system-compositor $@
+exec /usr/sbin/unity-system-compositor --disable-inactivity-policy=true $@

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2014-06-27 00:49:05 +0000
+++ src/system_compositor.cpp	2014-07-03 21:24:57 +0000
@@ -568,6 +568,11 @@
         return the_options()->get("enable-hardware-cursor", false);
     }
 
+    bool disable_inactivity_policy()
+    {
+        return the_options()->get("disable-inactivity-policy", false);
+    }
+
     std::string blacklist()
     {
         auto x = the_options()->get("blacklist", "");
@@ -696,7 +701,8 @@
             ("inactivity-display-off-timeout", po::value<int>(), "The time in seconds before the screen is turned off when there are no active sessions")
             ("inactivity-display-dim-timeout", po::value<int>(), "The time in seconds before the screen is dimmed when there are no active sessions")
             ("shutdown-timeout", po::value<int>(), "The time in milli-seconds the power key must be held to initiate a clean system shutdown")
-            ("power-key-ignore-timeout", po::value<int>(), "The time in milli-seconds the power key must be held to ignore - must be less than shutdown-timeout");
+            ("power-key-ignore-timeout", po::value<int>(), "The time in milli-seconds the power key must be held to ignore - must be less than shutdown-timeout")
+            ("disable-inactivity-policy", po::value<bool>(), "Disables handling user inactivity and power key");
     }
 
     void parse_config_file(
@@ -857,23 +863,26 @@
 {
     QCoreApplication app(argc, argv);
 
-    std::chrono::seconds inactivity_display_off_timeout{config->inactivity_display_off_timeout()};
-    std::chrono::seconds inactivity_display_dim_timeout{config->inactivity_display_dim_timeout()};
-    std::chrono::milliseconds power_key_ignore_timeout{config->power_key_ignore_timeout()};
-    std::chrono::milliseconds shutdown_timeout{config->shutdown_timeout()};
-
-    screen_state_handler = std::make_shared<ScreenStateHandler>(config,
-        std::chrono::duration_cast<std::chrono::milliseconds>(inactivity_display_off_timeout),
-        std::chrono::duration_cast<std::chrono::milliseconds>(inactivity_display_dim_timeout));
-
-    power_key_handler = std::make_shared<PowerKeyHandler>(*(config->the_main_loop()),
-        power_key_ignore_timeout,
-        shutdown_timeout,
-        *screen_state_handler);
-
-    auto composite_filter = config->the_composite_event_filter();
-    composite_filter->append(screen_state_handler);
-    composite_filter->append(power_key_handler);
+    if (!config->disable_inactivity_policy())
+    {
+        std::chrono::seconds inactivity_display_off_timeout{config->inactivity_display_off_timeout()};
+        std::chrono::seconds inactivity_display_dim_timeout{config->inactivity_display_dim_timeout()};
+        std::chrono::milliseconds power_key_ignore_timeout{config->power_key_ignore_timeout()};
+        std::chrono::milliseconds shutdown_timeout{config->shutdown_timeout()};
+
+        screen_state_handler = std::make_shared<ScreenStateHandler>(config,
+            std::chrono::duration_cast<std::chrono::milliseconds>(inactivity_display_off_timeout),
+            std::chrono::duration_cast<std::chrono::milliseconds>(inactivity_display_dim_timeout));
+
+        power_key_handler = std::make_shared<PowerKeyHandler>(*(config->the_main_loop()),
+            power_key_ignore_timeout,
+            shutdown_timeout,
+            *screen_state_handler);
+
+        auto composite_filter = config->the_composite_event_filter();
+        composite_filter->append(screen_state_handler);
+        composite_filter->append(power_key_handler);
+    }
 
     ensure_spinner();
     app.exec();