Merge lp:~robert-ancell/unity-greeter/screensaver into lp:unity-greeter

[Robert Ancell]

Allow unity-settings-daemon to blank the screen by implementing the gnome-screensaver and gnome-session d-bus interfaces.

[Robert Ancell (robert-ancell)]

I also think this merge might fix another suspected bug when gnome-screensaver sometimes runs in the greeter. We now make sure we have claimed the screensaver d-bus name before launching u-s-d.

[lp:~robert-ancell/unity-greeter/screensaver]

1200. By Robert Ancell on 2014-04-07

Allow timeout to be disabled

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1199
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/41/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1200
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/42/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

The changes here look fine to me, runtime seems to work as advertized as well (I didn't try changing the value but the screen does turn off after the default timeout after installing the update)

review: Approve

[Michael Terry (mterry)]

Sure, seems fine. Do you have other changes planned, or should this be released by itself?

review: Approve

[Robert Ancell (robert-ancell)]

> Sure, seems fine. Do you have other changes planned, or should this be
> released by itself?

No other changes planned, I will release this now.

=== modified file 'configure.ac'
--- configure.ac	2014-04-01 21:21:43 +0000
+++ configure.ac	2014-04-07 03:59:04 +0000
@@ -23,6 +23,7 @@
     indicator3-0.4
     libido3-0.1 >= 13.10.0
     liblightdm-gobject-1 >= 1.4.0
+    gnome-desktop-3.0
     freetype2
     cairo-ft
     libcanberra
 
=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2014-03-26 04:31:27 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2014-04-07 03:59:04 +0000
@@ -94,5 +94,9 @@
       <default>[]</default>
       <summary>List of usernames that are hidden until a special key combination is hit</summary>
     </key>
+    <key name="idle-timeout" type="i">
+      <default>300</default>
+      <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary>
+    </key>
   </schema>
 </schemalist>
 
=== modified file 'debian/control'
--- debian/control	2014-02-20 10:39:35 +0000
+++ debian/control	2014-04-07 03:59:04 +0000
@@ -12,6 +12,7 @@
                ttf-ubuntu-font-family,
                unity-settings-daemon-dev,
                libcanberra-dev,
+               libgnome-desktop-3-dev,
                libgtk-3-dev,
                libindicator3-dev,
                libido3-0.1-dev (>= 13.10.0),
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-02-18 17:57:29 +0000
+++ src/Makefile.am	2014-04-07 03:59:04 +0000
@@ -40,6 +40,7 @@
 unity_greeter_CFLAGS = \
 	$(UNITY_GREETER_CFLAGS) \
 	-w \
+	-DGNOME_DESKTOP_USE_UNSTABLE_API \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DLOCALEDIR=\""$(localedir)"\" \
 	-DVERSION=\"$(VERSION)\" \
 
=== modified file 'src/fixes.vapi'
--- src/fixes.vapi	2014-03-26 21:22:15 +0000
+++ src/fixes.vapi	2014-04-07 03:59:04 +0000
@@ -33,3 +33,19 @@
         public void to_hsv (double r, double g, double b, out double h, out double s, out double v);
     }
 }
+
+namespace Gnome
+{
+    [CCode (cheader_filename = "libgnome-desktop/gnome-idle-monitor.h")]
+    public class IdleMonitor : GLib.Object
+    {
+        public IdleMonitor ();
+        public IdleMonitor.for_device (Gdk.Device device);
+        public uint add_idle_watch (uint64 interval_msec, IdleMonitorWatchFunc callback, GLib.DestroyNotify? notify = null);
+        public uint add_user_active_watch (IdleMonitorWatchFunc callback, GLib.DestroyNotify? notify = null);
+        public void remove_watch (uint id);
+        public int64 get_idletime ();
+    }
+
+    public delegate void IdleMonitorWatchFunc (IdleMonitor monitor, uint id);
+}
 
=== modified file 'src/settings-daemon.vala'
--- src/settings-daemon.vala	2014-02-07 12:39:53 +0000
+++ src/settings-daemon.vala	2014-04-07 03:59:04 +0000
@@ -20,14 +20,11 @@
 public class SettingsDaemon : Object
 {
     private int logind_inhibit_fd = -1;
-
-    public async void start ()
-    {
-        configure ();
-        yield run ();
-    }
-
-    private void configure ()
+    private ScreenSaverInterface screen_saver;
+    private SessionManagerInterface session_manager;
+    private int n_names = 0;
+
+    public void start ()
     {
         string[] disabled = { "org.gnome.settings-daemon.plugins.background",
                               "org.gnome.settings-daemon.plugins.clipboard",
@@ -58,14 +55,54 @@
         foreach (var schema in enabled)
             set_plugin_enabled (schema, true);
 
-        /* We want to block the screensaver from being activated by g-s-d or
-           any of the indicators.  So we own the name, preventing dbus
-           activation by anyone else.
-           If the screensaver were allowed to start, it would disable X's
-           builtin blanking logic which we do use and instead, blanking would
-           require gnome-session and it's Presence DBus interface to be run. */
-        GLib.Bus.own_name (GLib.BusType.SESSION, "org.gnome.ScreenSaver",
-                           GLib.BusNameOwnerFlags.NONE);
+        /* Pretend to be GNOME session */
+        session_manager = new SessionManagerInterface ();
+        n_names++;
+        GLib.Bus.own_name (BusType.SESSION, "org.gnome.SessionManager", BusNameOwnerFlags.NONE,
+                           (c) =>
+                           {
+                               try
+                               {
+                                   c.register_object ("/org/gnome/SessionManager", session_manager);
+                               }
+                               catch (Error e)
+                               {
+                                   warning ("Failed to register /org/gnome/SessionManager: %s", e.message);
+                               }
+                           },
+                           () =>
+                           {
+                               debug ("Acquired org.gnome.SessionManager");
+                               start_settings_daemon ();
+                           },
+                           () => debug ("Failed to acquire name org.gnome.SessionManager"));
+
+        /* The power plugin does the screen saver screen blanking and disables
+         * the builtin X screen saver. It relies on gnome-screensaver to generate
+         * the event to trigger this (which actually comes from gnome-session).
+         * We implement the gnome-screensaver inteface and start the settings
+         * daemon once it is registered on the bus so gnome-screensaver is not
+         * started when it accesses this interface */
+        screen_saver = new ScreenSaverInterface ();
+        n_names++;
+        GLib.Bus.own_name (BusType.SESSION, "org.gnome.ScreenSaver", BusNameOwnerFlags.NONE,
+                           (c) =>
+                           {
+                               try
+                               {
+                                   c.register_object ("/org/gnome/ScreenSaver", screen_saver);
+                               }
+                               catch (Error e)
+                               {
+                                   warning ("Failed to register /org/gnome/ScreenSaver: %s", e.message);
+                               }
+                           },
+                           () =>
+                           {
+                               debug ("Acquired org.gnome.ScreenSaver");
+                               start_settings_daemon ();
+                           },                          
+                           () => debug ("Failed to acquire name org.gnome.ScreenSaver"));
 
         /* The media-keys plugin inhibits the power key, but we don't want
            all the other keys doing things. So inhibit it ourselves */
@@ -113,8 +150,14 @@
         }
     }
 
-    private async void run ()
+    private void start_settings_daemon ()
     {
+        n_names--;
+        if (n_names != 0)
+            return;
+
+        debug ("All bus names acquired, starting unity-settings-daemon");
+
         try
         {
             Process.spawn_command_line_async (Config.USD_BINARY);
@@ -125,3 +168,67 @@
         }
     }
 }
+
+[DBus (name="org.gnome.ScreenSaver")]
+public class ScreenSaverInterface : Object
+{
+    public signal void active_changed (bool value);
+
+    private Gnome.IdleMonitor idle_monitor;
+    private bool _active = false;
+    private uint idle_watch = 0;
+
+    public ScreenSaverInterface ()
+    {
+        idle_monitor = new Gnome.IdleMonitor ();
+        _set_active (false);       
+    }
+
+    private void _set_active (bool value)
+    {
+        _active = value;
+        if (idle_watch != 0)
+            idle_monitor.remove_watch (idle_watch);
+        idle_watch = 0;
+        if (value)
+            idle_monitor.add_user_active_watch (() => set_active (false));
+        else
+        {
+            var timeout = UGSettings.get_integer (UGSettings.KEY_IDLE_TIMEOUT);
+            if (timeout > 0)
+                idle_watch = idle_monitor.add_idle_watch (timeout * 1000, () => set_active (true));
+        }
+    }
+
+    public void set_active (bool value)
+    {
+        if (_active == value)
+            return;
+
+        if (value)
+            debug ("Screensaver activated");
+        else
+            debug ("Screensaver disabled");
+
+        _set_active (value);
+        active_changed (value);
+    }
+
+    public bool get_active ()
+    {
+        return _active;
+    }
+    
+    public uint32 get_active_time () { return 0; }
+    public void lock () {}
+    public void show_message (string summary, string body, string icon) {}
+    public void simulate_user_activity () {}
+}
+
+[DBus (name="org.gnome.SessionManager")]
+public class SessionManagerInterface : Object
+{
+    public bool session_is_active { get { return true; } }
+    public string session_name { get { return "ubuntu"; } }
+    public uint32 inhibited_actions { get { return 0; } }
+}
 
=== modified file 'src/settings.vala'
--- src/settings.vala	2014-03-26 04:31:27 +0000
+++ src/settings.vala	2014-04-07 03:59:04 +0000
@@ -40,6 +40,7 @@
     public static const string KEY_PLAY_READY_SOUND = "play-ready-sound";
     public static const string KEY_INDICATORS = "indicators";
     public static const string KEY_HIDDEN_USERS = "hidden-users";
+    public static const string KEY_IDLE_TIMEOUT = "idle-timeout";    
 
     public static bool get_boolean (string key)
     {
@@ -60,6 +61,12 @@
         return default;
     }
 
+    public static int get_integer (string key)
+    {
+        var gsettings = new Settings (SCHEMA);
+        return gsettings.get_int (key);
+    }
+
     public static double get_double (string key)
     {
         var gsettings = new Settings (SCHEMA);
 
=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2014-04-01 21:05:10 +0000
+++ src/unity-greeter.vala	2014-04-07 03:59:04 +0000
@@ -77,7 +77,7 @@
         if (!test_mode)
         {
             settings_daemon = new SettingsDaemon ();
-            settings_daemon.start.begin ();
+            settings_daemon.start ();
         }
 
         var state_dir = Path.build_filename (Environment.get_user_cache_dir (), "unity-greeter");