Use session IDs as assigned by U-S-C

[sojka/lightdm.git] / src / seat-xlocal.c

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index 5ee32aabf50e8cfcd85c098091a4c88781817505..817335c6d05002ebf07af9a9d59009405c45d73c 100644 (file)
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2010-2011 Robert Ancell.
  * Author: Robert Ancell <robert.ancell@canonical.com>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation, either version 3 of the License, or (at your option) any later
@@ -15,6 +15,7 @@
 #include "configuration.h"
 #include "x-server-local.h"
 #include "unity-system-compositor.h"
+#include "wayland-session.h"
 #include "plymouth.h"
 #include "vt.h"
 
@@ -51,7 +52,7 @@ xdmcp_x_server_stopped_cb (DisplayServer *display_server, Seat *seat)
     g_signal_handlers_disconnect_matched (SEAT_XLOCAL (seat)->priv->xdmcp_x_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
     SEAT_XLOCAL (seat)->priv->xdmcp_x_server = NULL;
     g_object_unref (display_server);
-    
+
     if (seat_get_is_stopping (seat))
         check_stopped (SEAT_XLOCAL (seat));
     else
@@ -90,7 +91,7 @@ seat_xlocal_start (Seat *seat)
             result = g_key_file_load_from_file (keys, path, G_KEY_FILE_NONE, &error);
             if (error)
                 l_debug (seat, "Error getting key %s", error->message);
-            g_clear_error (&error);      
+            g_clear_error (&error);
 
             if (result)
             {
@@ -110,7 +111,7 @@ seat_xlocal_start (Seat *seat)
             g_key_file_free (keys);
         }
 
-        g_signal_connect (s->priv->xdmcp_x_server, "stopped", G_CALLBACK (xdmcp_x_server_stopped_cb), seat);
+        g_signal_connect (s->priv->xdmcp_x_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (xdmcp_x_server_stopped_cb), seat);
         return display_server_start (DISPLAY_SERVER (s->priv->xdmcp_x_server));
     }
 
@@ -139,6 +140,7 @@ get_vt (Seat *seat, DisplayServer *display_server)
 {
     gint vt = -1;
     const gchar *xdg_seat = seat_get_name (seat);
+
     if (strcmp (xdg_seat, "seat0") != 0)
         return vt;
 
@@ -149,8 +151,8 @@ get_vt (Seat *seat, DisplayServer *display_server)
         if (active_vt >= vt_get_min ())
         {
             vt = active_vt;
-            g_signal_connect (display_server, "ready", G_CALLBACK (display_server_ready_cb), seat);
-            g_signal_connect (display_server, "stopped", G_CALLBACK (display_server_transition_plymouth_cb), seat);
+            g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat);
+            g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_transition_plymouth_cb), seat);
             plymouth_deactivate ();
         }
         else
@@ -168,6 +170,8 @@ static XServerLocal *
 create_x_server (Seat *seat)
 {
     XServerLocal *x_server;
+    gchar *number;
+    XAuthority *cookie;
     const gchar *command = NULL, *layout = NULL, *config_file = NULL;
     gboolean allow_tcp;
     gint vt;
@@ -191,20 +195,24 @@ create_x_server (Seat *seat)
     if (command)
         x_server_local_set_command (x_server, command);
 
+    number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (x_server)));
+    cookie = x_authority_new_local_cookie (number);
+    x_server_set_authority (X_SERVER (x_server), cookie);
+    g_free (number);
+    g_object_unref (cookie);
+
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
         x_server_local_set_layout (x_server, layout);
 
     x_server_local_set_xdg_seat (x_server, seat_get_name (seat));
-    if (strcmp (seat_get_name (seat), "seat0") != 0)
-        x_server_local_set_sharevts (x_server, TRUE);
 
     config_file = seat_get_string_property (seat, "xserver-config");
     if (config_file)
         x_server_local_set_config (x_server, config_file);
-  
+
     allow_tcp = seat_get_boolean_property (seat, "xserver-allow-tcp");
-    x_server_local_set_allow_tcp (x_server, allow_tcp);    
+    x_server_local_set_allow_tcp (x_server, allow_tcp);
 
     return x_server;
 }
@@ -231,7 +239,7 @@ create_unity_system_compositor (Seat *seat)
     vt = get_vt (seat, DISPLAY_SERVER (compositor));
     if (vt >= 0)
         unity_system_compositor_set_vt (compositor, vt);
-  
+
     for (i = 0; ; i++)
     {
         socket_name = g_strdup_printf ("/run/lightdm-mir-%d", i);
@@ -241,11 +249,24 @@ create_unity_system_compositor (Seat *seat)
     unity_system_compositor_set_socket (compositor, socket_name);
     g_free (socket_name);
 
-    unity_system_compositor_set_enable_hardware_cursor (compositor, TRUE);
-
     return DISPLAY_SERVER (compositor);
 }
 
+static DisplayServer *
+create_wayland_session (Seat *seat)
+{
+    WaylandSession *session;
+    gint vt;
+
+    session = wayland_session_new ();
+
+    vt = get_vt (seat, DISPLAY_SERVER (session));
+    if (vt >= 0)
+        wayland_session_set_vt (session, vt);
+
+    return DISPLAY_SERVER (session);
+}
+
 static DisplayServer *
 seat_xlocal_create_display_server (Seat *seat, Session *session)
 {
@@ -256,6 +277,8 @@ seat_xlocal_create_display_server (Seat *seat, Session *session)
         return DISPLAY_SERVER (create_x_server (seat));
     else if (strcmp (session_type, "mir") == 0)
         return create_unity_system_compositor (seat);
+    else if (strcmp (session_type, "wayland") == 0)
+        return create_wayland_session (seat);
     else if (strcmp (session_type, "mir-container") == 0)
     {
         DisplayServer *compositor;
@@ -265,7 +288,7 @@ seat_xlocal_create_display_server (Seat *seat, Session *session)
         compositor_command = session_config_get_compositor_command (session_get_config (session));
         if (compositor_command)
             unity_system_compositor_set_command (UNITY_SYSTEM_COMPOSITOR (compositor), compositor_command);
-      
+
         return compositor;
     }
     else
@@ -275,10 +298,10 @@ seat_xlocal_create_display_server (Seat *seat, Session *session)
     }
 }
 
-static Greeter *
+static GreeterSession *
 seat_xlocal_create_greeter_session (Seat *seat)
 {
-    Greeter *greeter_session;
+    GreeterSession *greeter_session;
 
     greeter_session = SEAT_CLASS (seat_xlocal_parent_class)->create_greeter_session (seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat));
@@ -309,7 +332,7 @@ seat_xlocal_set_active_session (Seat *seat, Session *session)
         vt_set_active (vt);
 
     if (IS_UNITY_SYSTEM_COMPOSITOR (display_server))
-        unity_system_compositor_set_active_session (UNITY_SYSTEM_COMPOSITOR (display_server), IS_GREETER (session) ? "greeter-0" : "session-0");
+        unity_system_compositor_set_active_session (UNITY_SYSTEM_COMPOSITOR (display_server), session_get_env (session, "MIR_SERVER_NAME"));
 
     SEAT_CLASS (seat_xlocal_parent_class)->set_active_session (seat, session);
 }