// FIXME: Make a get_display_server() that re-uses display servers if supported
static DisplayServer *create_display_server (Seat *seat, Session *session);
+static gboolean start_display_server (Seat *seat, DisplayServer *display_server);
static GreeterSession *create_greeter_session (Seat *seat);
static void start_session (Seat *seat, Session *session);
* Obtains the active session which lightdm expects to be active.
*
* This function is different from seat_get_active_session() in that the
- * later (in the case of xlocal seats) dynamically finds the session that is
+ * later (in the case of local seats) dynamically finds the session that is
* really active (based on the active VT), whereas this function returns the
* session that lightdm activated last by itself, which may not be the actual
* active session (i.e. VT changes).
display_server = create_display_server (seat, session);
session_set_display_server (session, display_server);
- if (!display_server_start (display_server))
+ if (!start_display_server (seat, display_server))
{
l_debug (seat, "Failed to start display server for greeter");
seat_stop (seat);
gboolean backup_logs;
log_dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
- filename = g_strdup_printf ("%s-greeter.log", display_server_get_name (session_get_display_server (session)));
+ filename = g_strdup_printf ("%s-greeter.log", seat->priv->name);
log_filename = g_build_filename (log_dir, filename, NULL);
g_free (log_dir);
g_free (filename);
}
/* Stop the display server if no-longer required */
- if (display_server && !display_server_get_is_stopping (display_server))
+ if (display_server && !display_server_get_is_stopping (display_server) &&
+ !SEAT_GET_CLASS (seat)->display_server_is_used (seat, display_server))
{
- GList *link;
- int n_sessions = 0;
-
- for (link = seat->priv->sessions; link; link = link->next)
- {
- Session *s = link->data;
- if (s == session)
- continue;
- if (session_get_display_server (s) == display_server)
- n_sessions++;
- }
- if (n_sessions == 0)
- {
- l_debug (seat, "Stopping display server, no sessions require it");
- display_server_stop (display_server);
- }
+ l_debug (seat, "Stopping display server, no sessions require it");
+ display_server_stop (display_server);
}
g_signal_emit (seat, signals[SESSION_REMOVED], 0, session);
/* Get the session to use */
if (greeter_get_guest_authenticated (greeter))
{
- session = create_guest_session (seat, session_name);
+ session = g_object_ref (create_guest_session (seat, session_name));
if (!session)
return FALSE;
session_set_pam_service (session, seat_get_string_property (seat, "pam-autologin-service"));
gchar *sessions_dir = NULL;
gchar **argv;
- session = greeter_get_authentication_session (greeter);
+ session = greeter_take_authentication_session (greeter);
/* Get session command to run */
switch (type)
/* Switch to this session when it is ready */
g_clear_object (&seat->priv->session_to_activate);
- seat->priv->session_to_activate = g_object_ref (session);
+ seat->priv->session_to_activate = session;
/* Return to existing session if it is open */
username = session_get_username (session);
/* If can re-use the display server, stop the greeter first */
greeter_session = get_greeter_session (seat, greeter);
- display_server = session_get_display_server (greeter_session);
- if (!greeter_get_resettable (greeter) &&
- can_share_display_server (seat, display_server) &&
- strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
+ if (greeter_session)
{
- l_debug (seat, "Stopping greeter; display server will be re-used for user session");
+ display_server = session_get_display_server (greeter_session);
+ if (display_server &&
+ !greeter_get_resettable (greeter) &&
+ can_share_display_server (seat, display_server) &&
+ strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
+ {
+ l_debug (seat, "Stopping greeter; display server will be re-used for user session");
- /* Run on the same display server after the greeter has stopped */
- session_set_display_server (session, display_server);
+ /* Run on the same display server after the greeter has stopped */
+ session_set_display_server (session, display_server);
- /* Stop the greeter */
- session_stop (greeter_session);
+ /* Stop the greeter */
+ session_stop (greeter_session);
- return TRUE;
+ return TRUE;
+ }
}
+
/* Otherwise start a new display server for this session */
- else
+ display_server = create_display_server (seat, session);
+ session_set_display_server (session, display_server);
+ if (!start_display_server (seat, display_server))
{
- display_server = create_display_server (seat, session);
- session_set_display_server (session, display_server);
- if (!display_server_start (display_server))
- {
- l_debug (seat, "Failed to start display server for new session");
- return FALSE;
- }
-
- return TRUE;
+ l_debug (seat, "Failed to start display server for new session");
+ return FALSE;
}
+
+ return TRUE;
}
static GreeterSession *
for (link = seat->priv->sessions; link; link = link->next)
{
Session *session = link->data;
- if (session_get_display_server (session) == display_server && !session_get_is_stopping (session))
+
+ if (session_get_display_server (session) == display_server &&
+ !session_get_is_stopping (session) &&
+ !session_get_is_run (session))
return session;
}
if (!display_server)
return NULL;
- seat->priv->display_servers = g_list_append (seat->priv->display_servers, display_server);
- 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_stopped_cb), seat);
+ /* Remember this display server */
+ if (!g_list_find (seat->priv->display_servers, display_server))
+ {
+ seat->priv->display_servers = g_list_append (seat->priv->display_servers, display_server);
+ 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_stopped_cb), seat);
+ }
return display_server;
}
+static gboolean
+start_display_server (Seat *seat, DisplayServer *display_server)
+{
+ if (display_server_get_is_ready (display_server))
+ {
+ display_server_ready_cb (display_server, seat);
+ return TRUE;
+ }
+ else
+ return display_server_start (display_server);
+}
+
gboolean
seat_switch_to_greeter (Seat *seat)
{
display_server = create_display_server (seat, SESSION (greeter_session));
session_set_display_server (SESSION (greeter_session), display_server);
- return display_server_start (display_server);
+ return start_display_server (seat, display_server);
}
static void
seat->priv->session_to_activate = g_object_ref (session);
display_server = create_display_server (seat, session);
session_set_display_server (session, display_server);
- display_server_start (display_server);
+ start_display_server (seat, display_server);
}
return;
display_server = create_display_server (seat, SESSION (greeter_session));
session_set_display_server (SESSION (greeter_session), display_server);
- display_server_start (display_server);
+ start_display_server (seat, display_server);
}
}
session_set_pam_service (session, seat_get_string_property (seat, "pam-autologin-service"));
session_set_display_server (session, display_server);
- return display_server_start (display_server);
+ return start_display_server (seat, display_server);
}
gboolean
return TRUE;
}
else
- return display_server_start (display_server);
+ return start_display_server (seat, display_server);
}
}
display_server = create_display_server (seat, session);
session_set_display_server (session, display_server);
- if (!display_server || !display_server_start (display_server))
+ if (!display_server || !start_display_server (seat, display_server))
{
l_debug (seat, "Can't create display server for automatic login");
session_stop (session);
display_server = create_display_server (seat, session);
session_set_display_server (session, display_server);
- if (!display_server || !display_server_start (display_server))
+ if (!display_server || !start_display_server (seat, display_server))
{
l_debug (seat, "Can't create display server for greeter");
session_stop (session);
background_display_server = create_display_server (seat, background_session);
session_set_display_server (background_session, background_display_server);
- if (!display_server_start (background_display_server))
+ if (!start_display_server (seat, background_display_server))
l_warning (seat, "Failed to start display server for background session");
}
return TRUE;
}
+static DisplayServer *
+seat_real_create_display_server (Seat *seat, Session *session)
+{
+ return NULL;
+}
+
+static gboolean
+seat_real_display_server_is_used (Seat *seat, DisplayServer *display_server)
+{
+ GList *link;
+
+ for (link = seat->priv->sessions; link; link = link->next)
+ {
+ Session *session = link->data;
+ DisplayServer *d;
+
+ d = session_get_display_server (session);
+ if (!d)
+ continue;
+
+ if (d == display_server || display_server_get_parent (d) == display_server)
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static GreeterSession *
seat_real_create_greeter_session (Seat *seat)
{
return greeter_session_new ();
}
+static Session *
+create_session_cb (Greeter *greeter, Seat *seat)
+{
+ return g_object_ref (create_session (seat, FALSE));
+}
+
+static Greeter *
+create_greeter_cb (Session *session, Seat *seat)
+{
+ Greeter *greeter;
+
+ greeter = greeter_new ();
+ greeter_set_pam_services (greeter,
+ seat_get_string_property (seat, "pam-service"),
+ seat_get_string_property (seat, "pam-autologin-service"));
+ g_signal_connect (greeter, GREETER_SIGNAL_CREATE_SESSION, G_CALLBACK (create_session_cb), seat);
+ g_signal_connect (greeter, GREETER_SIGNAL_START_SESSION, G_CALLBACK (greeter_start_session_cb), seat);
+
+ return greeter;
+}
+
static Session *
seat_real_create_session (Seat *seat)
{
- return session_new ();
+ Session *session;
+
+ session = session_new ();
+ g_signal_connect (session, SESSION_SIGNAL_CREATE_GREETER, G_CALLBACK (create_greeter_cb), seat);
+
+ return session;
}
static void
klass->setup = seat_real_setup;
klass->start = seat_real_start;
+ klass->create_display_server = seat_real_create_display_server;
+ klass->display_server_is_used = seat_real_display_server_is_used;
klass->create_greeter_session = seat_real_create_greeter_session;
klass->create_session = seat_real_create_session;
klass->set_active_session = seat_real_set_active_session;
projects / sojka / lightdm.git / blobdiff