Merge lp:~robert-ancell/lightdm/unity-compositor-command into lp:~mir-team/lightdm/unity

[Robert Ancell]

Add option to set compositor command

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1626
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/26/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Looks good to me.

review: Approve

=== modified file 'data/lightdm.conf'
--- data/lightdm.conf	2013-06-06 05:02:48 +0000
+++ data/lightdm.conf	2013-06-21 03:44:24 +0000
@@ -43,6 +43,8 @@
 # xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
 # xdmcp-port = XDMCP UDP/IP port to communicate on
 # xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
+# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
+# unity-compositor-timeout = Number of seconds to wait for compositor to start
 # greeter-session = Session to load for greeter
 # greeter-hide-users = True to hide the user list
 # greeter-allow-guest = True if the greeter should show a guest login option
@@ -72,6 +74,8 @@
 #xdmcp-manager=
 #xdmcp-port=177
 #xdmcp-key=
+#unity-compositor-command=unity-system-compositor
+#unity-compositor-timeout=60
 #greeter-session=example-gtk-gnome
 #greeter-hide-users=false
 #greeter-allow-guest=true
 
=== modified file 'src/lightdm.c'
--- src/lightdm.c	2013-06-18 02:10:44 +0000
+++ src/lightdm.c	2013-06-21 03:44:24 +0000
@@ -1040,6 +1040,8 @@
         config_set_string (config_get_instance (), "SeatDefaults", "type", "xlocal");
     if (!config_has_key (config_get_instance (), "SeatDefaults", "xserver-command"))
         config_set_string (config_get_instance (), "SeatDefaults", "xserver-command", "X");
+    if (!config_has_key (config_get_instance (), "SeatDefaults", "unity-compositor-command"))
+        config_set_string (config_get_instance (), "SeatDefaults", "unity-compositor-command", "unity-system-compositor");
     if (!config_has_key (config_get_instance (), "SeatDefaults", "start-session"))
         config_set_boolean (config_get_instance (), "SeatDefaults", "start-session", TRUE);
     if (!config_has_key (config_get_instance (), "SeatDefaults", "allow-guest"))
 
=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-06-20 08:50:35 +0000
+++ src/seat-unity.c	2013-06-21 03:44:24 +0000
@@ -293,6 +293,7 @@
 static gboolean
 seat_unity_start (Seat *seat)
 {
+    const gchar *compositor_command;
     gchar *command, *absolute_command, *dir;
     gboolean result;
     int timeout;
@@ -341,7 +342,9 @@
     g_free (dir);
 
     SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
-    command = g_strdup_printf ("unity-system-compositor --from-dm-fd %d --to-dm-fd %d", SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1]);
+    timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
+    compositor_command = seat_get_string_property (seat, "unity-compositor-command");
+    command = g_strdup_printf ("%s --from-dm-fd %d --to-dm-fd %d", compositor_command, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1]);
 
     absolute_command = get_absolute_command (command);
     g_free (command);
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-06-21 02:23:32 +0000
+++ tests/Makefile.am	2013-06-21 03:44:24 +0000
@@ -151,6 +151,7 @@
 	test-python-power-no-services \
 	test-open-file-descriptors \
 	test-xdmcp-open-file-descriptors \
+	test-unity-compositor-command \
 	test-unity-compositor-fail-start \
 	test-unity-compositor-fail-ready \
 	test-unity-autologin \
@@ -353,6 +354,7 @@
 	scripts/switch-to-user-no-password.conf \
 	scripts/system-xauthority.conf \
 	scripts/unity-autologin.conf \
+	scripts/unity-compositor-command.conf \
 	scripts/unity-compositor-fail-ready.conf \
 	scripts/unity-compositor-fail-start.conf \
 	scripts/unity-login.conf \
 
=== added file 'tests/scripts/unity-compositor-command.conf'
--- tests/scripts/unity-compositor-command.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/unity-compositor-command.conf	2013-06-21 03:44:24 +0000
@@ -0,0 +1,38 @@
+#
+# Check can set the unity compositor command
+#
+
+[SeatDefaults]
+type=unity
+user-session=default
+unity-compositor-command=unity-system-compositor --test
+
+#?RUNNER DAEMON-START
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START TEST
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# X server starts
+#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# System compositor switches to greeter
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
 
=== modified file 'tests/src/unity-system-compositor.c'
--- tests/src/unity-system-compositor.c	2013-06-21 02:23:32 +0000
+++ tests/src/unity-system-compositor.c	2013-06-21 03:44:24 +0000
@@ -123,6 +123,7 @@
 main (int argc, char **argv)
 {
     int i;
+    gboolean test = FALSE;
 
     signal (SIGINT, signal_cb);
     signal (SIGTERM, signal_cb);
@@ -150,13 +151,18 @@
             to_dm_fd = atoi (argv[i+1]);
             i++;
         }
+        else if (strcmp (arg, "--test") == 0)
+            test = TRUE;
         else
             return EXIT_FAILURE;
     }
 
     g_io_add_watch (g_io_channel_unix_new (from_dm_fd), G_IO_IN, read_message_cb, NULL);
 
-    status_notify ("UNITY-SYSTEM-COMPOSITOR START");
+    if (test)
+        status_notify ("UNITY-SYSTEM-COMPOSITOR START TEST");
+    else
+        status_notify ("UNITY-SYSTEM-COMPOSITOR START");
 
     config = g_key_file_new ();
     g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL);
 
=== added file 'tests/test-unity-compositor-command'
--- tests/test-unity-compositor-command	1970-01-01 00:00:00 +0000
+++ tests/test-unity-compositor-command	2013-06-21 03:44:24 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-compositor-command test-gobject-greeter