/* The sessions on this seat */
GList *sessions;
+ /* The last session set to active */
+ Session *active_session;
+
+ /* The session belonging to the active greeter user */
+ Session *next_session;
+
/* The session to set active when it starts */
Session *session_to_activate;
+
+ /* TRUE once we have started */
+ gboolean started;
/* TRUE if stopping this seat (waiting for displays to stop) */
gboolean stopping;
static GHashTable *seat_modules = NULL;
// FIXME: Make a get_display_server() that re-uses display servers if supported
-static DisplayServer *create_display_server (Seat *seat);
+static DisplayServer *create_display_server (Seat *seat, const gchar *session_type);
static Greeter *create_greeter_session (Seat *seat);
static void start_session (Seat *seat, Session *session);
g_return_if_fail (seat != NULL);
+ /* Unlock this session */
+ if (session != seat->priv->active_session && !IS_GREETER (session))
+ session_unlock (session);
+
SEAT_GET_CLASS (seat)->set_active_session (seat, session);
/* Stop any greeters */
session_stop (s);
}
}
+
+ /* Lock previous sessions */
+ if (seat->priv->active_session)
+ {
+ if (session != seat->priv->active_session && !IS_GREETER (seat->priv->active_session))
+ session_lock (seat->priv->active_session);
+ g_object_unref (seat->priv->active_session);
+ }
+ seat->priv->active_session = g_object_ref (session);
}
Session *
return SEAT_GET_CLASS (seat)->get_active_session (seat);
}
+Session *
+seat_get_next_session (Seat *seat)
+{
+ g_return_val_if_fail (seat != NULL, NULL);
+ return seat->priv->next_session;
+}
+
gboolean
seat_get_can_switch (Seat *seat)
{
g_signal_handlers_disconnect_matched (display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
seat->priv->display_servers = g_list_remove (seat->priv->display_servers, display_server);
- if (seat->priv->stopping)
+ if (seat->priv->stopping || !seat->priv->started)
{
check_stopped (seat);
g_object_unref (display_server);
g_object_unref (display_server);
}
+static gboolean
+can_share_display_server (Seat *seat, DisplayServer *display_server)
+{
+ return seat->priv->share_display_server && display_server_get_can_share (display_server);
+}
+
static void
switch_to_greeter_from_failed_session (Seat *seat, Session *session)
{
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
- if (seat->priv->share_display_server)
+ if (can_share_display_server (seat, session_get_display_server (session)))
session_set_display_server (SESSION (greeter_session), session_get_display_server (session));
else
{
DisplayServer *display_server;
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (session));
if (!display_server_start (display_server))
{
g_debug ("Failed to start display server for greeter");
}
if (!IS_GREETER (session))
+ {
g_signal_emit (seat, signals[RUNNING_USER_SESSION], 0, session);
+ emit_upstart_signal ("desktop-session-start");
+ }
session_run (session);
}
}
+static Session *
+find_user_session (Seat *seat, const gchar *username)
+{
+ GList *link;
+
+ if (!username)
+ return NULL;
+
+ for (link = seat->priv->sessions; link; link = link->next)
+ {
+ Session *session = link->data;
+
+ if (!session_get_is_stopping (session) && strcmp (session_get_username (session), username) == 0)
+ return session;
+ }
+
+ return NULL;
+}
+
+static void
+greeter_active_username_changed_cb (Greeter *greeter, GParamSpec *pspec, Seat *seat)
+{
+ Session *session;
+
+ session = find_user_session (seat, greeter_get_active_username (greeter));
+ if (session)
+ {
+ if (seat->priv->next_session)
+ g_object_unref (seat->priv->next_session);
+ seat->priv->next_session = g_object_ref (session);
+
+ SEAT_GET_CLASS (seat)->set_next_session (seat, session);
+ }
+}
+
static void
session_authentication_complete_cb (Session *session, Seat *seat)
{
g_debug ("Session stopped");
+ g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
+ seat->priv->sessions = g_list_remove (seat->priv->sessions, session);
+ if (session == seat->priv->active_session)
+ {
+ g_object_unref (seat->priv->active_session);
+ seat->priv->active_session = NULL;
+ }
+ if (session == seat->priv->next_session)
+ {
+ g_object_unref (seat->priv->next_session);
+ seat->priv->next_session = NULL;
+ }
+ if (session == seat->priv->session_to_activate)
+ {
+ g_object_unref (seat->priv->session_to_activate);
+ seat->priv->session_to_activate = NULL;
+ }
+
display_server = session_get_display_server (session);
+ if (!display_server)
+ {
+ g_object_unref (session);
+ return;
+ }
/* Cleanup */
if (!IS_GREETER (session))
run_script (seat, display_server, script, session_get_user (session));
}
- g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
- seat->priv->sessions = g_list_remove (seat->priv->sessions, session);
-
/* We were waiting for this session, but it didn't start :( */
// FIXME: Start a greeter on this?
if (session == seat->priv->session_to_activate)
}
/* If this is the greeter session then re-use this display server */
- if (IS_GREETER (session) && seat->priv->share_display_server &&
+ if (IS_GREETER (session) &&
+ can_share_display_server (seat, display_server) &&
greeter_get_start_session (GREETER (session)))
{
GList *link;
}
static Session *
-create_session (Seat *seat, gboolean autostart)
+create_session (Seat *seat, gboolean autostart, const gchar *username)
{
Session *session;
+ Session *user_session;
- session = SEAT_GET_CLASS (seat)->create_session (seat);
+ user_session = find_user_session (seat, username);
+ session = SEAT_GET_CLASS (seat)->create_session (seat, user_session);
seat->priv->sessions = g_list_append (seat->priv->sessions, session);
if (autostart)
g_signal_connect (session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat);
g_free (sessions_dir);
if (session_config)
{
+ const gchar *desktop_name;
gchar **argv;
- session = create_session (seat, TRUE);
+ session = create_session (seat, TRUE, username);
+ session_set_session_type (session, session_config_get_session_type (session_config));
session_set_env (session, "DESKTOP_SESSION", session_name);
session_set_env (session, "GDMSESSION", session_name);
+ desktop_name = session_config_get_desktop_name (session_config);
+ if (desktop_name)
+ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
if (language && language[0] != '\0')
{
session_set_env (session, "LANG", language);
return NULL;
}
- session = create_session (seat, TRUE);
+ session = create_session (seat, TRUE, NULL);
+ session_set_session_type (session, session_config_get_session_type (session_config));
session_set_do_authenticate (session, TRUE);
session_set_is_guest (session, TRUE);
argv = get_session_argv (session_config, seat_get_string_property (seat, "session-wrapper"));
}
static Session *
-greeter_create_session_cb (Greeter *greeter, Seat *seat)
+greeter_create_session_cb (Greeter *greeter, Seat *seat, const gchar *username)
{
Session *session;
- session = create_session (seat, FALSE);
+ session = create_session (seat, FALSE, username);
+ session_set_session_type (session, session_get_session_type (SESSION (greeter)));
session_set_display_server (session, session_get_display_server (SESSION (greeter)));
return g_object_ref (session);
*argv = new_argv;
}
-static Session *
-find_user_session (Seat *seat, const gchar *username)
-{
- GList *link;
-
- if (!username)
- return NULL;
-
- for (link = seat->priv->sessions; link; link = link->next)
- {
- Session *session = link->data;
-
- if (!session_get_is_stopping (session) && strcmp (session_get_username (session), username) == 0)
- return session;
- }
-
- return NULL;
-}
-
static gboolean
greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat)
{
User *user;
gchar *sessions_dir = NULL;
gchar **argv;
+ DisplayServer *display_server;
/* Get the session to use */
if (greeter_get_guest_authenticated (greeter))
return FALSE;
}
+ session_set_session_type (session, session_config_get_session_type (session_config));
argv = get_session_argv (session_config, seat_get_string_property (seat, "session-wrapper"));
- g_object_unref (session_config);
session_set_argv (session, argv);
g_strfreev (argv);
session_set_env (session, "DESKTOP_SESSION", session_name);
session_set_env (session, "GDM_LANG", language);
}
+ g_object_unref (session_config);
+
/* If can re-use the display server, stop the greeter first */
- if (seat->priv->share_display_server)
+ display_server = session_get_display_server (SESSION (greeter));
+ if (can_share_display_server (seat, display_server) &&
+ strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
{
g_debug ("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, session_get_display_server (SESSION (greeter)));
+ session_set_display_server (session, display_server);
/* Stop the greeter */
session_stop (SESSION (greeter));
/* Otherwise start a new display server for this session */
else
{
- DisplayServer *display_server;
-
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (session));
+ session_set_display_server (session, display_server);
if (!display_server_start (display_server))
+ {
+ g_debug ("Failed to start display server for new session");
return FALSE;
-
- session_set_display_server (session, display_server);
+ }
return TRUE;
}
}
greeter_session = SEAT_GET_CLASS (seat)->create_greeter_session (seat);
+ session_set_session_type (SESSION (greeter_session), session_config_get_session_type (session_config));
seat->priv->sessions = g_list_append (seat->priv->sessions, SESSION (greeter_session));
+ g_signal_connect (greeter_session, "notify::active-username", G_CALLBACK (greeter_active_username_changed_cb), seat);
g_signal_connect (greeter_session, "authentication-complete", G_CALLBACK (session_authentication_complete_cb), seat);
g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
}
static DisplayServer *
-create_display_server (Seat *seat)
+create_display_server (Seat *seat, const gchar *session_type)
{
DisplayServer *display_server;
- g_debug ("Creating display server");
+ g_debug ("Creating display server of type %s", session_type);
+
+ display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type);
+ if (!display_server)
+ return NULL;
- display_server = SEAT_GET_CLASS (seat)->create_display_server (seat);
seat->priv->display_servers = g_list_append (seat->priv->display_servers, display_server);
g_signal_connect (display_server, "ready", G_CALLBACK (display_server_ready_cb), seat);
g_signal_connect (display_server, "stopped", G_CALLBACK (display_server_stopped_cb), seat);
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
session_set_display_server (SESSION (greeter_session), display_server);
if (!display_server_start (display_server))
return FALSE;
seat->priv->session_to_activate = g_object_ref (session);
session_set_pam_service (session, USER_SERVICE);
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (session));
session_set_display_server (session, display_server);
if (!display_server_start (display_server))
return FALSE;
return TRUE;
}
- display_server = create_display_server (seat);
- if (!display_server_start (display_server))
- return FALSE;
-
session = create_guest_session (seat);
if (!session)
return FALSE;
+
+ display_server = create_display_server (seat, session_get_session_type (session));
+ if (!display_server_start (display_server))
+ return FALSE;
+
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (session);
return TRUE;
}
- display_server = create_display_server (seat);
+ greeter_session = create_greeter_session (seat);
+ if (!greeter_session)
+ return FALSE;
+
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
if (!display_server_start (display_server))
return FALSE;
- greeter_session = create_greeter_session (seat);
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
gboolean autologin_guest;
gboolean autologin_in_background;
Session *session = NULL, *background_session = NULL;
- DisplayServer *display_server;
g_debug ("Starting seat");
/* If this display server doesn't have a session running on it, just start it */
if (!get_start_local_sessions (seat))
{
- display_server = create_display_server (seat);
+ DisplayServer *display_server;
+ display_server = create_display_server (seat, "x"); // FIXME: Not necessarily an X seat, but not sure what to put here
return display_server_start (display_server);
}
session = create_guest_session (seat);
else if (autologin_username != NULL)
session = create_user_session (seat, autologin_username);
-
+
if (session)
- {
- if (seat->priv->session_to_activate)
- g_object_unref (seat->priv->session_to_activate);
- seat->priv->session_to_activate = g_object_ref (session);
session_set_pam_service (session, AUTOLOGIN_SERVICE);
- }
/* Load in background if required */
if (autologin_in_background && session)
background_session = session;
session = NULL;
}
+
+ if (session)
+ {
+ DisplayServer *display_server;
+
+ if (seat->priv->session_to_activate)
+ g_object_unref (seat->priv->session_to_activate);
+ seat->priv->session_to_activate = g_object_ref (session);
+
+ display_server = create_display_server (seat, session_get_session_type (session));
+ session_set_display_server (session, display_server);
+ if (!display_server || !display_server_start (display_server))
+ {
+ g_debug ("Can't create display server for automatic login");
+ session_stop (session);
+ if (display_server)
+ display_server_stop (display_server);
+ session = NULL;
+ }
+ }
}
/* Fallback to a greeter */
if (!session)
{
Greeter *greeter_session;
+ DisplayServer *display_server;
greeter_session = create_greeter_session (seat);
+ if (!greeter_session)
+ {
+ g_debug ("Failed to create greeter session");
+ return FALSE;
+ }
+
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
if (autologin_guest)
greeter_set_hint (greeter_session, "autologin-guest", "true");
}
+
+ display_server = create_display_server (seat, session_get_session_type (session));
+ session_set_display_server (session, display_server);
+ if (!display_server || !display_server_start (display_server))
+ {
+ g_debug ("Can't create display server for greeter");
+ session_stop (session);
+ if (display_server)
+ display_server_stop (display_server);
+ session = NULL;
+ }
}
/* Fail if can't start a session */
return FALSE;
}
- display_server = create_display_server (seat);
- if (!display_server)
- return FALSE;
-
- /* Start display server to show session on */
- session_set_display_server (session, display_server);
- if (!display_server_start (display_server))
- return FALSE;
-
/* Start background session */
if (background_session)
{
DisplayServer *background_display_server;
- background_display_server = create_display_server (seat);
+ background_display_server = create_display_server (seat, session_get_session_type (background_session));
session_set_display_server (background_session, background_display_server);
if (!display_server_start (background_display_server))
g_warning ("Failed to start display server for background session");
}
+ seat->priv->started = TRUE;
return TRUE;
}
}
static Session *
-seat_real_create_session (Seat *seat)
+seat_real_create_session (Seat *seat, Session *user_session)
{
return session_new ();
}
{
}
+static void
+seat_real_set_next_session (Seat *seat, Session *session)
+{
+}
+
static Session *
seat_real_get_active_session (Seat *seat)
{
g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
}
g_list_free_full (self->priv->sessions, g_object_unref);
+ if (self->priv->active_session)
+ g_object_unref (self->priv->active_session);
+ if (self->priv->next_session)
+ g_object_unref (self->priv->next_session);
if (self->priv->session_to_activate)
g_object_unref (self->priv->session_to_activate);
klass->create_session = seat_real_create_session;
klass->set_active_session = seat_real_set_active_session;
klass->get_active_session = seat_real_get_active_session;
+ klass->set_next_session = seat_real_set_next_session;
klass->run_script = seat_real_run_script;
klass->stop = seat_real_stop;
projects / sojka / lightdm.git / blobdiff