/* 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;
#define USER_SERVICE "lightdm"
#define AUTOLOGIN_SERVICE "lightdm-autologin"
-G_DEFINE_TYPE (Seat, seat, G_TYPE_OBJECT);
+static void seat_logger_iface_init (LoggerInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (Seat, seat, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (
+ LOGGER_TYPE, seat_logger_iface_init));
typedef struct
{
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, gboolean is_greeter);
static Greeter *create_greeter_session (Seat *seat);
static void start_session (Seat *seat, Session *session);
if (IS_GREETER (s))
{
- g_debug ("Stopping greeter");
+ l_debug (seat, "Stopping greeter");
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)
{
exit_status = process_get_exit_status (script);
if (WIFEXITED (exit_status))
{
- g_debug ("Exit status of %s: %d", script_name, WEXITSTATUS (exit_status));
+ l_debug (seat, "Exit status of %s: %d", script_name, WEXITSTATUS (exit_status));
result = WEXITSTATUS (exit_status) == EXIT_SUCCESS;
}
}
g_list_length (seat->priv->sessions) == 0)
{
seat->priv->stopped = TRUE;
- g_debug ("Seat stopped");
+ l_debug (seat, "Stopped");
g_signal_emit (seat, signals[STOPPED], 0);
}
}
GList *list, *link;
Session *active_session;
- g_debug ("Display server stopped");
+ l_debug (seat, "Display server stopped");
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);
!session_get_is_started (session) &&
g_list_length (seat->priv->display_servers) == 0)
{
- g_debug ("Stopping seat, greeter display server failed to start");
+ l_debug (seat, "Stopping; greeter display server failed to start");
seat_stop (seat);
}
- g_debug ("Stopping session");
+ l_debug (seat, "Stopping session");
session_stop (session);
}
g_list_free_full (list, g_object_unref);
active_session = seat_get_active_session (seat);
if (!active_session || session_get_display_server (active_session) == display_server)
{
- g_debug ("Active display server stopped, starting greeter");
+ l_debug (seat, "Active display server stopped, starting greeter");
seat_switch_to_greeter (seat);
}
}
{
DisplayServer *display_server;
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (session), TRUE);
if (!display_server_start (display_server))
{
- g_debug ("Failed to start display server for greeter");
+ l_debug (seat, "Failed to start display server for greeter");
seat_stop (seat);
}
if (IS_GREETER (session))
{
- g_debug ("Failed to start greeter");
+ l_debug (seat, "Failed to start greeter");
display_server_stop (session_get_display_server (session));
return;
}
- g_debug ("Failed to start session, starting greeter");
+ l_debug (seat, "Failed to start session, starting greeter");
switch_to_greeter_from_failed_session (seat, session);
}
script = seat_get_string_property (seat, "session-setup-script");
if (script && !run_script (seat, session_get_display_server (session), script, NULL))
{
- g_debug ("Switching to greeter due to failed setup script");
+ l_debug (seat, "Switching to greeter due to failed setup script");
switch_to_greeter_from_failed_session (seat, session);
return;
}
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, Session *ignore_session)
+{
+ GList *link;
+
+ if (!username)
+ return NULL;
+
+ for (link = seat->priv->sessions; link; link = link->next)
+ {
+ Session *session = link->data;
+
+ if (session == ignore_session)
+ continue;
+
+ if (!session_get_is_stopping (session) && g_strcmp0 (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), seat->priv->active_session);
+
+ if (seat->priv->next_session)
+ g_object_unref (seat->priv->next_session);
+ seat->priv->next_session = session ? g_object_ref (session) : NULL;
+
+ SEAT_GET_CLASS (seat)->set_next_session (seat, session);
+}
+
static void
session_authentication_complete_cb (Session *session, Seat *seat)
{
if (session_get_is_authenticated (session))
{
- g_debug ("Session authenticated, running command");
- run_session (seat, session);
+ Session *s;
+
+ s = find_user_session (seat, session_get_username (session), session);
+ if (s)
+ {
+ l_debug (seat, "Session authenticated, switching to existing user session");
+ seat_set_active_session (seat, s);
+ session_stop (session);
+ }
+ else
+ {
+ l_debug (seat, "Session authenticated, running command");
+ run_session (seat, session);
+ }
}
else if (!IS_GREETER (session))
{
- g_debug ("Switching to greeter due to failed authentication");
+ l_debug (seat, "Switching to greeter due to failed authentication");
switch_to_greeter_from_failed_session (seat, session);
}
else
{
- g_debug ("Stopping session that failed authentication");
+ l_debug (seat, "Stopping session that failed authentication");
session_stop (session);
}
}
{
DisplayServer *display_server;
- g_debug ("Session stopped");
+ l_debug (seat, "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 (session_get_is_authenticated (s))
{
- g_debug ("Greeter stopped, running session");
+ l_debug (seat, "Greeter stopped, running session");
run_session (seat, s);
}
else
{
- g_debug ("Greeter stopped, starting session authentication");
+ l_debug (seat, "Greeter stopped, starting session authentication");
start_session (seat, s);
}
break;
g_list_length (seat->priv->display_servers) == 1 &&
g_list_nth_data (seat->priv->display_servers, 0) == display_server)
{
- g_debug ("Stopping seat, failed to start a greeter");
+ l_debug (seat, "Stopping; failed to start a greeter");
seat_stop (seat);
}
/* If we were the active session, switch to a greeter */
else if (!IS_GREETER (session) && session == seat_get_active_session (seat))
{
- g_debug ("Active session stopped, starting greeter");
+ l_debug (seat, "Active session stopped, starting greeter");
seat_switch_to_greeter (seat);
}
}
if (n_sessions == 0)
{
- g_debug ("Stopping display server, no sessions require it");
+ l_debug (seat, "Stopping display server, no sessions require it");
display_server_stop (display_server);
}
}
}
static gchar **
-get_session_argv (SessionConfig *session_config, const gchar *session_wrapper)
+get_session_argv (Seat *seat, SessionConfig *session_config, const gchar *session_wrapper)
{
gboolean result;
int argc;
/* Split command into an array listing and make command absolute */
result = g_shell_parse_argv (session_config_get_command (session_config), &argc, &argv, &error);
if (error)
- g_debug ("Invalid session command '%s': %s", session_config_get_command (session_config), error->message);
+ l_debug (seat, "Invalid session command '%s': %s", session_config_get_command (session_config), error->message);
g_clear_error (&error);
if (!result)
return NULL;
}
static SessionConfig *
-find_session_config (const gchar *sessions_dir, const gchar *session_name)
+find_session_config (Seat *seat, const gchar *sessions_dir, const gchar *session_name)
{
gchar **dirs;
SessionConfig *session_config = NULL;
break;
if (dirs[i+1] == NULL)
- g_debug ("Failed to find session configuration %s", session_name);
+ l_debug (seat, "Failed to find session configuration %s", session_name);
g_clear_error (&error);
}
g_strfreev (dirs);
return session_config;
}
+static void
+configure_session (Session *session, SessionConfig *config, const gchar *session_name, const gchar *language)
+{
+ const gchar *desktop_name;
+
+ session_set_session_type (session, session_config_get_session_type (config));
+ session_set_env (session, "DESKTOP_SESSION", session_name);
+ session_set_env (session, "GDMSESSION", session_name);
+ desktop_name = session_config_get_desktop_name (config);
+ if (desktop_name)
+ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
+ if (language && language[0] != '\0')
+ {
+ session_set_env (session, "LANG", language);
+ session_set_env (session, "GDM_LANG", language);
+ }
+}
+
static Session *
-create_user_session (Seat *seat, const gchar *username)
+create_user_session (Seat *seat, const gchar *username, gboolean autostart)
{
User *user;
gchar *sessions_dir;
SessionConfig *session_config;
Session *session = NULL;
- g_debug ("Creating user session");
+ l_debug (seat, "Creating user session");
/* Load user preferences */
user = accounts_get_user_by_name (username);
if (!user)
{
- g_debug ("Can't login unknown user '%s'", username);
+ l_debug (seat, "Can't login unknown user '%s'", username);
return NULL;
}
session_name = user_get_xsession (user);
if (!session_name)
session_name = seat_get_string_property (seat, "user-session");
sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
- session_config = find_session_config (sessions_dir, session_name);
+ session_config = find_session_config (seat, sessions_dir, session_name);
g_free (sessions_dir);
if (session_config)
{
gchar **argv;
- session = create_session (seat, TRUE);
- session_set_env (session, "DESKTOP_SESSION", session_name);
- session_set_env (session, "GDMSESSION", session_name);
- if (language && language[0] != '\0')
- {
- session_set_env (session, "LANG", language);
- session_set_env (session, "GDM_LANG", language);
- }
- session_set_pam_service (session, AUTOLOGIN_SERVICE);
+ session = create_session (seat, autostart);
+ configure_session (session, session_config, session_name, language);
session_set_username (session, username);
session_set_do_authenticate (session, TRUE);
- argv = get_session_argv (session_config, seat_get_string_property (seat, "session-wrapper"));
+ argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
session_set_argv (session, argv);
g_strfreev (argv);
-
g_object_unref (session_config);
}
else
- g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
-
+ l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
g_object_unref (user);
static Session *
create_guest_session (Seat *seat)
{
+ const gchar *session_name;
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Session *session;
+ session_name = seat_get_string_property (seat, "user-session");
sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
- session_config = find_session_config (sessions_dir, seat_get_string_property (seat, "user-session"));
+ session_config = find_session_config (seat, sessions_dir, session_name);
g_free (sessions_dir);
if (!session_config)
{
- g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+ l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
return NULL;
}
session = create_session (seat, TRUE);
+ configure_session (session, session_config, session_name, NULL);
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"));
- g_object_unref (session_config);
+ argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
session_set_argv (session, argv);
g_strfreev (argv);
+ g_object_unref (session_config);
return session;
}
Session *session;
session = create_session (seat, FALSE);
+ 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)
{
/* Return to existing session if it is open */
username = session_get_username (session);
- existing_session = find_user_session (seat, username);
+ existing_session = find_user_session (seat, username, NULL);
if (existing_session && session != existing_session)
{
- g_debug ("Returning to existing user session %s", username);
+ l_debug (seat, "Returning to existing user session %s", username);
session_stop (session);
+ session_unlock (existing_session);
seat_set_active_session (seat, existing_session);
return TRUE;
}
if (user)
user_set_xsession (session_get_user (session), session_name);
- session_config = find_session_config (sessions_dir, session_name);
+ session_config = find_session_config (seat, sessions_dir, session_name);
g_free (sessions_dir);
if (!session_config)
{
- g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+ l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
return FALSE;
}
- argv = get_session_argv (session_config, seat_get_string_property (seat, "session-wrapper"));
- g_object_unref (session_config);
+ configure_session (session, session_config, session_name, language);
+ argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
session_set_argv (session, argv);
g_strfreev (argv);
- session_set_env (session, "DESKTOP_SESSION", session_name);
- session_set_env (session, "GDMSESSION", session_name);
- if (language && language[0] != '\0')
- {
- session_set_env (session, "LANG", language);
- session_set_env (session, "GDM_LANG", language);
- }
+ g_object_unref (session_config);
/* If can re-use the display server, stop the greeter first */
display_server = session_get_display_server (SESSION (greeter));
- if (can_share_display_server (seat, display_server))
+ 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");
+ 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);
/* Otherwise start a new display server for this session */
else
{
- display_server = create_display_server (seat);
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+ 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;
-
- session_set_display_server (session, display_server);
+ }
return TRUE;
}
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Greeter *greeter_session;
- gchar *greeter_user;
const gchar *greeter_wrapper;
- g_debug ("Creating greeter session");
+ l_debug (seat, "Creating greeter session");
sessions_dir = config_get_string (config_get_instance (), "LightDM", "greeters-directory");
- session_config = find_session_config (sessions_dir, seat_get_string_property (seat, "greeter-session"));
+ session_config = find_session_config (seat, sessions_dir, seat_get_string_property (seat, "greeter-session"));
g_free (sessions_dir);
if (!session_config)
return NULL;
- argv = get_session_argv (session_config, NULL);
+ argv = get_session_argv (seat, session_config, NULL);
greeter_wrapper = seat_get_string_property (seat, "greeter-wrapper");
if (greeter_wrapper)
{
}
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);
set_session_env (SESSION (greeter_session));
session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
- greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
- session_set_username (SESSION (greeter_session), greeter_user);
- g_free (greeter_user);
+ if (getuid () == 0)
+ {
+ gchar *greeter_user;
+ greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
+ session_set_username (SESSION (greeter_session), greeter_user);
+ g_free (greeter_user);
+ }
+ else
+ {
+ /* In test mode run the greeter as ourself */
+ session_set_username (SESSION (greeter_session), user_get_name (accounts_get_current_user ()));
+ }
session_set_argv (SESSION (greeter_session), argv);
g_strfreev (argv);
script = seat_get_string_property (seat, "display-setup-script");
if (script && !run_script (seat, display_server, script, NULL))
{
- g_debug ("Stopping display server due to failed setup script");
+ l_debug (seat, "Stopping display server due to failed setup script");
display_server_stop (display_server);
return;
}
{
if (session_get_is_authenticated (session))
{
- g_debug ("Display server ready, running session");
+ l_debug (seat, "Display server ready, running session");
run_session (seat, session);
}
else
{
- g_debug ("Display server ready, starting session authentication");
+ l_debug (seat, "Display server ready, starting session authentication");
start_session (seat, session);
}
}
else
{
- g_debug ("Stopping not required display server");
+ l_debug (seat, "Stopping not required display server");
display_server_stop (display_server);
}
}
static DisplayServer *
-create_display_server (Seat *seat)
+create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
{
DisplayServer *display_server;
- g_debug ("Creating display server");
+ l_debug (seat, "Creating display server of type %s", session_type);
+
+ display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type, is_greeter);
+ 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);
greeter_session = find_greeter_session (seat);
if (greeter_session)
{
- g_debug ("Switching to existing greeter");
+ l_debug (seat, "Switching to existing greeter");
seat_set_active_session (seat, SESSION (greeter_session));
return TRUE;
}
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)), TRUE);
session_set_display_server (SESSION (greeter_session), display_server);
if (!display_server_start (display_server))
return FALSE;
return TRUE;
}
+static void
+switch_authentication_complete_cb (Session *session, Seat *seat)
+{
+ Greeter *greeter_session;
+ DisplayServer *display_server;
+
+ /* If authenticated, then unlock existing session or start new one */
+ if (session_get_is_authenticated (session))
+ {
+ Session *s;
+
+ s = find_user_session (seat, session_get_username (session), session);
+ if (s)
+ {
+ l_debug (seat, "Session authenticated, switching to existing user session");
+ session_unlock (s);
+ seat_set_active_session (seat, s);
+ session_stop (session);
+ }
+ else
+ {
+ l_debug (seat, "Session authenticated, starting 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), FALSE);
+ session_set_display_server (session, display_server);
+ display_server_start (display_server);
+ }
+
+ return;
+ }
+
+ l_debug (seat, "Switching to greeter to authenticate session");
+
+ session_stop (session);
+
+ greeter_session = create_greeter_session (seat);
+ if (session_get_is_guest (session))
+ greeter_set_hint (greeter_session, "select-guest", "true");
+ else
+ greeter_set_hint (greeter_session, "select-user", session_get_username (session));
+ if (seat->priv->session_to_activate)
+ g_object_unref (seat->priv->session_to_activate);
+ seat->priv->session_to_activate = g_object_ref (greeter_session);
+
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
+ session_set_display_server (SESSION (greeter_session), display_server);
+ display_server_start (display_server);
+}
+
gboolean
seat_switch_to_user (Seat *seat, const gchar *username, const gchar *session_name)
{
Session *session;
- DisplayServer *display_server;
g_return_val_if_fail (seat != NULL, FALSE);
g_return_val_if_fail (username != NULL, FALSE);
if (!seat->priv->can_switch)
return FALSE;
- g_debug ("Switching to user %s", username);
-
- session = find_user_session (seat, username);
- if (session)
- {
- g_debug ("Switching to existing user session %s", username);
- seat_set_active_session (seat, session);
+ /* If we're already on this session, then ignore */
+ session = find_user_session (seat, username, NULL);
+ if (session && session == seat->priv->active_session)
return TRUE;
- }
- session = create_user_session (seat, username);
- if (!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 (session);
- session_set_pam_service (session, USER_SERVICE);
+ l_debug (seat, "Switching to user %s", username);
- display_server = create_display_server (seat);
- session_set_display_server (session, display_server);
- if (!display_server_start (display_server))
- return FALSE;
+ /* Attempt to authenticate them */
+ session = create_user_session (seat, username, FALSE);
+ g_signal_connect (session, "authentication-complete", G_CALLBACK (switch_authentication_complete_cb), seat);
+ session_set_pam_service (session, USER_SERVICE);
+ session_start (session);
return FALSE;
}
session = find_guest_session (seat);
if (session)
{
- g_debug ("Switching to existing guest account %s", session_get_username (session));
+ l_debug (seat, "Switching to existing guest account %s", session_get_username (session));
seat_set_active_session (seat, session);
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), FALSE);
+ 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);
if (!seat->priv->can_switch)
return FALSE;
- g_debug ("Locking seat");
+ l_debug (seat, "Locking");
/* Switch to greeter if one open (shouldn't be though) */
greeter_session = find_greeter_session (seat);
if (greeter_session)
{
- g_debug ("Switching to existing greeter");
+ l_debug (seat, "Switching to existing greeter");
seat_set_active_session (seat, SESSION (greeter_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)), TRUE);
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);
if (seat->priv->stopping)
return;
- g_debug ("Stopping seat");
+ l_debug (seat, "Stopping");
seat->priv->stopping = TRUE;
SEAT_GET_CLASS (seat)->stop (seat);
}
int autologin_timeout;
gboolean autologin_guest;
gboolean autologin_in_background;
- Session *session = NULL;
- DisplayServer *display_server;
-
- g_debug ("Starting seat");
+ Session *session = NULL, *background_session = NULL;
- display_server = create_display_server (seat);
+ l_debug (seat, "Starting");
/* If this display server doesn't have a session running on it, just start it */
if (!get_start_local_sessions (seat))
+ {
+ DisplayServer *display_server;
+ display_server = create_display_server (seat, "x", FALSE); // FIXME: Not necessarily an X seat, but not sure what to put here
return display_server_start (display_server);
+ }
/* Get autologin settings */
autologin_username = seat_get_string_property (seat, "autologin-user");
if (autologin_guest)
session = create_guest_session (seat);
else if (autologin_username != NULL)
- session = create_user_session (seat, autologin_username);
-
+ session = create_user_session (seat, autologin_username, TRUE);
+
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)
{
- DisplayServer *background_display_server;
+ background_session = session;
+ session = NULL;
+ }
+
+ if (session)
+ {
+ DisplayServer *display_server;
- background_display_server = create_display_server (seat);
- session_set_display_server (session, background_display_server);
- if (!display_server_start (background_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);
- /* Start a greeter as well */
- session = NULL;
+ display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+ session_set_display_server (session, display_server);
+ if (!display_server || !display_server_start (display_server))
+ {
+ l_debug (seat, "Can't create display server for automatic login");
+ session_stop (session);
+ if (display_server)
+ display_server_stop (display_server);
+ session = NULL;
+ }
}
}
if (!session)
{
Greeter *greeter_session;
+ DisplayServer *display_server;
greeter_session = create_greeter_session (seat);
+ if (!greeter_session)
+ {
+ l_debug (seat, "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), TRUE);
+ session_set_display_server (session, display_server);
+ if (!display_server || !display_server_start (display_server))
+ {
+ l_debug (seat, "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;
}
- /* 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, session_get_session_type (background_session), FALSE);
+ session_set_display_server (background_session, background_display_server);
+ if (!display_server_start (background_display_server))
+ l_warning (seat, "Failed to start display server for background session");
+ }
+ seat->priv->started = TRUE;
return TRUE;
}
{
}
+static void
+seat_real_set_next_session (Seat *seat, Session *session)
+{
+}
+
static Session *
seat_real_get_active_session (Seat *seat)
{
DisplayServer *display_server = link->data;
if (!display_server_get_is_stopping (display_server))
{
- g_debug ("Stopping display server");
+ l_debug (seat, "Stopping display server");
display_server_stop (display_server);
}
}
Session *session = link->data;
if (!session_get_is_stopping (session))
{
- g_debug ("Stopping session");
+ l_debug (seat, "Stopping session");
session_stop (session);
}
}
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;
NULL,
G_TYPE_NONE, 0);
}
+
+static gint
+seat_real_logprefix (Logger *self, gchar *buf, gulong buflen)
+{
+ Seat *seat = SEAT (self);
+ const gchar *name = seat_get_string_property (seat, "seat-name");
+ if (name)
+ return g_snprintf (buf, buflen, "Seat %s: ", name);
+ else
+ return g_snprintf (buf, buflen, "Seat: ");
+}
+
+static void
+seat_logger_iface_init (LoggerInterface *iface)
+{
+ iface->logprefix = &seat_real_logprefix;
+}