Add xdg-seat config setting

6 files changed, 46 insertions, 8 deletions

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 2d584550..d3fdda70 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -36,6 +36,7 @@
 # Seat defaults
 #
 # type = Seat type (xlocal, xremote)
+# xdg-seat = Seat name to set pam_systemd XDG_SEAT variable and name to pass to X server
 # xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
 # xserver-layout = Layout to pass to X server
 # xserver-config = Config file to pass to X server
@@ -69,6 +70,7 @@
 #
 [SeatDefaults]
 #type=xlocal
+#xdg-seat=seat0
 #xserver-command=X
 #xserver-layout=
 #xserver-config=
diff --git a/src/seat-unity.c b/src/seat-unity.c
index 4529afd9..5fad60fd 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -404,7 +404,7 @@ static DisplayServer *
 create_x_server (Seat *seat)
 {
     XServerLocal *x_server;
-    const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL;
+    const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL, *xdg_seat = NULL;
     gboolean allow_tcp;
     gint port = 0;
 
@@ -432,6 +432,10 @@ create_x_server (Seat *seat)
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
         x_server_local_set_layout (x_server, layout);
+    
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (xdg_seat)
+        x_server_local_set_xdg_seat (x_server, xdg_seat);
 
     config_file = seat_get_string_property (seat, "xserver-config");
     if (config_file)
@@ -532,7 +536,9 @@ seat_unity_create_greeter_session (Seat *seat)
     const gchar *xdg_seat;
 
     greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat);
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
@@ -555,7 +561,9 @@ seat_unity_create_session (Seat *seat)
     const gchar *xdg_seat;
 
     session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (session, "XDG_SEAT", xdg_seat);
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index 7b626de8..647adc28 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -64,7 +64,7 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
         return NULL;
 
     XServerLocal *x_server;
-    const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL;
+    const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL, *xdg_seat = NULL;
     gboolean allow_tcp;
     gint vt = -1, port = 0;
 
@@ -107,6 +107,10 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
         x_server_local_set_layout (x_server, layout);
+        
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (xdg_seat)
+        x_server_local_set_xdg_seat (x_server, xdg_seat);
 
     config_file = seat_get_string_property (seat, "xserver-config");
     if (config_file)
@@ -169,7 +173,9 @@ seat_xlocal_create_greeter_session (Seat *seat)
     const gchar *xdg_seat;
 
     greeter_session = SEAT_CLASS (seat_xlocal_parent_class)->create_greeter_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat);
 
@@ -183,7 +189,9 @@ seat_xlocal_create_session (Seat *seat)
     const gchar *xdg_seat;
 
     session = SEAT_CLASS (seat_xlocal_parent_class)->create_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (session), "XDG_SEAT", xdg_seat);
 
diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 05b25e0c..32e8726a 100644
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -56,7 +56,9 @@ seat_xremote_create_greeter_session (Seat *seat)
     const gchar *xdg_seat;
 
     greeter_session = SEAT_CLASS (seat_xremote_parent_class)->create_greeter_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat);
 
@@ -70,7 +72,9 @@ seat_xremote_create_session (Seat *seat)
     const gchar *xdg_seat;
 
     session = SEAT_CLASS (seat_xremote_parent_class)->create_session (seat);
-    xdg_seat = "seat0";
+    xdg_seat = seat_get_string_property (seat, "xdg-seat");
+    if (!xdg_seat)
+        xdg_seat = "seat0";
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (session), "XDG_SEAT", xdg_seat);
 
diff --git a/src/x-server-local.c b/src/x-server-local.c
index 646a9e72..1348b175 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -39,6 +39,9 @@ struct XServerLocalPrivate
 
     /* Server layout to use */
     gchar *layout;
+    
+    /* Value for -seat argument */
+    gchar *xdg_seat;
 
     /* TRUE if TCP/IP connections are allowed */
     gboolean allow_tcp;
@@ -205,6 +208,14 @@ x_server_local_set_layout (XServerLocal *server, const gchar *layout)
 }
 
 void
+x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat)
+{
+    g_return_if_fail (server != NULL);
+    g_free (server->priv->xdg_seat);
+    server->priv->xdg_seat = g_strdup (xdg_seat);
+}
+
+void
 x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp)
 {
     g_return_if_fail (server != NULL);
@@ -470,6 +481,9 @@ x_server_local_start (DisplayServer *display_server)
 
     if (server->priv->layout)
         g_string_append_printf (command, " -layout %s", server->priv->layout);
+        
+    if (server->priv->xdg_seat)
+        g_string_append_printf (command, " -seat %s", server->priv->xdg_seat);
 
     write_authority_file (server);
     if (server->priv->authority_file)
diff --git a/src/x-server-local.h b/src/x-server-local.h
index 6d1d6abb..69feb4d1 100644
--- a/src/x-server-local.h
+++ b/src/x-server-local.h
@@ -51,6 +51,8 @@ void x_server_local_set_config (XServerLocal *server, const gchar *path);
 
 void x_server_local_set_layout (XServerLocal *server, const gchar *layout);
 
+void x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat);
+
 void x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp);
 
 void x_server_local_set_xdmcp_server (XServerLocal *server, const gchar *hostname);