Merge lp:~ricmm/powerd/support-mir-toggled into lp:powerd

[Ricardo Mendoza]

Allow powerd to work with unity-mir's DBus API for screen power control, selective using the backend available according to the running display server.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/powerd-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/71/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/117/rebuild

review: Approve (continuous-integration)

[Seth Forshee (sforshee)]

16 + if (stat("/home/phablet/.display-mir", &stats) == -1 && errno == ENOENT) {

How about caching the result of this in a variable so it doesn't have to be done each time?

17 + if (power_mode == "off")

Should be a strcmp.

29 + while ((read(fd, &c, sizeof(char))) != 0) {

You should add protection against writing past the end of the buffer.

36 + seteuid(32011); /* phablet user */
37 + setegid(32011); /* phablet group */

Hard coded? Is there no way to get the uid/gid at run time?

38 + setenv("DBUS_SESSION_BUS_ADDRESS", strstr(buf, "unix"));

Is it okay to leave this set after you're done here?

50 + if (error != NULL) {
51 + powerd_warn("could not connect to Unity: %s", error->message);
52 + g_error_free(error);
53 + seteuid(0);
54 + setegid(0);
55 + close(fd);

You could restructure this to avoid having to code this cleanup twice, your call.

review: Needs Fixing

[Matt Fischer (mfisch)]

You can get getpwent to read the phablet user's uid/gid I think, but should we have a registration feature that lets unity register users so we can support multiple users? For example:

registerSession(uid,gid) or equivalent

What about a bridge service that listens on the system bus and talks on the session bus and runs as every user? powerd could signal that and it would signal up to the session bus. I think this is doable, but you could ask ted.

[Matt Fischer (mfisch)]

"Runs as every user" above means every user has an instance of it running!

[Seth Forshee (sforshee)]

I like this better. One question though: is it really necessary to reallocate the dbus proxy each time? Or can it just be done when we don't have a proxy or else the one we have doesn't work anymore (i.e. if unity restarted)?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/powerd-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/118/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Works well on device

review: Approve

[Seth Forshee (sforshee)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/70/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-autolanding/46/console

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks fine, and works fine as well.

Just pushed libhybris 28 to the archive, once in we can top approve and ping the CI team to land it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/71/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-autolanding/47/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-27 16:59:34 +0000
+++ debian/control	2013-09-25 21:29:25 +0000
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 9),
                cmake,
                libglib2.0-dev,
-               libhybris-dev,
+               libhybris-dev (>= 0.1.0+git20130606+c5d897a-0ubuntu28),
                libudev-dev,
                python,
                libandroid-properties-dev,

=== modified file 'src/display.c'
--- src/display.c	2013-08-29 16:23:09 +0000
+++ src/display.c	2013-09-25 21:29:25 +0000
@@ -39,6 +39,9 @@
 #include "device-config.h"
 #include "log.h"
 
+/* Mir usage hint file path */
+#define MIR_HINT_PATH	"/home/phablet/.display-mir"
+
 /* Treat "don't care" display state as off */
 #define DISPLAY_STATE_OFF POWERD_DISPLAY_STATE_DONT_CARE
 
@@ -50,6 +53,7 @@
 static gint saved_brightness = 255;
 static gint target_brightness;
 static gint dim_brightness;
+static gboolean running_mir = FALSE;
 
 /* Assume screen is off to start; we will force it on */
 static uuid_t internal_request_cookie;
@@ -103,9 +107,54 @@
     return (flags & AB_ENABLED_MASK) == AB_ENABLED;
 }
 
+void display_set_power_mode(int display, char *power_mode)
+{
+    GError *error = NULL;
+    GDBusProxy *unity_proxy = NULL;
+
+    powerd_debug("display_set_power_mode(%s)", power_mode);
+
+    if (!running_mir) {
+        if (strcmp(power_mode, "off") == 0)
+            sf_blank(display);
+        else
+            sf_unblank(display);
+    } else {
+        unity_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
+                    G_DBUS_PROXY_FLAGS_NONE,
+                    NULL,
+                    "com.canonical.Unity.Screen",
+                    "/com/canonical/Unity/Screen",
+                    "com.canonical.Unity.Screen",
+                    NULL,
+                    &error);
+
+        if (error != NULL) {
+            powerd_warn("could not connect to Unity: %s", error->message);
+            g_error_free(error);
+            return;
+        }
+
+        GVariant *ret = g_dbus_proxy_call_sync(unity_proxy,
+                "setScreenPowerMode",
+                g_variant_new("(s)", power_mode),
+                G_DBUS_CALL_FLAGS_NONE,
+                -1,
+                NULL,
+                &error);
+
+        if (ret == NULL) {
+            powerd_warn("screen power setting failed: %s", error->message);
+            g_error_free(error);
+        }
+
+        g_object_unref(unity_proxy);
+    }
+}
+
 static void turn_on_display(gboolean autobrightness) {
     powerd_debug("turning on display");
-    sf_unblank(0);
+    display_set_power_mode(0, "on");
     if (autobrightness)
         powerd_autobrightness_enable();
     else
@@ -174,7 +223,7 @@
         if (using_ab)
             powerd_autobrightness_disable();
         powerd_set_brightness(0);
-        sf_blank(0);
+        display_set_power_mode(0, "off");
 
         powerd_debug("Releasing internal active state request");
         ret = clear_sys_state_internal(internal_request_cookie);
@@ -382,6 +431,7 @@
     GError *error;
     GValue v = G_VALUE_INIT;
     int brightness, max_brightness;
+    struct stat stats;
 
     /*
      * Warning: much hand waving follows
@@ -423,6 +473,10 @@
 
     target_brightness = saved_brightness;
 
+    /* decide whether we are running on Mir or SF */
+    if (stat(MIR_HINT_PATH, &stats) == 0)
+        running_mir = TRUE;
+
     /* If kernel supports earlysuspend, start thread to monitor fb state */
     if (!access(fb_file_names[FB_SLEEP], F_OK))
         g_thread_new("powerd_fb_wake_monitor", wait_for_fb_thread, &error);

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-09-03 14:10:41 +0000
+++ src/powerd-internal.h	2013-09-25 21:29:25 +0000
@@ -74,6 +74,7 @@
 /* Display functions */
 void powerd_brightness_set_value(gint value);
 gboolean powerd_display_enabled(void);
+void display_set_power_mode(int display, char *powerd_mode);
 void powerd_set_display_state(struct powerd_display_request *req);
 int powerd_display_init(void);
 void powerd_proximity_event(gboolean near);

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-08-29 16:23:09 +0000
+++ src/powerd.cpp	2013-09-25 21:29:25 +0000
@@ -125,7 +125,7 @@
     if (button_state == BUTTON_DOWN) {
         button_state = SHUTDOWN;
         powerd_set_brightness(0);
-        sf_blank(0);
+        display_set_power_mode(0, "off");
         powerd_shutdown();
     }
 
@@ -496,7 +496,9 @@
 
     InputStackConfiguration config = {
     enable_touch_point_visualization : false,
-    default_layer_for_touch_point_visualization : 10000
+    default_layer_for_touch_point_visualization : 10000,
+    input_area_width : 2048,
+    input_area_height : 2048
     };
 
     android_input_stack_initialize(&listener, &config);