return g_hash_table_lookup (seat->priv->properties, name);
}
+gchar **
+seat_get_string_list_property (Seat *seat, const gchar *name)
+{
+ g_return_val_if_fail (seat != NULL, NULL);
+ return g_strsplit (g_hash_table_lookup (seat->priv->properties, name), ";", 0);
+}
+
gboolean
seat_get_boolean_property (Seat *seat, const gchar *name)
{
return value ? atoi (value) : 0;
}
+const gchar *
+seat_get_name (Seat *seat)
+{
+ const gchar *name;
+
+ name = seat_get_string_property (seat, "xdg-seat");
+ if (name)
+ return name;
+
+ return "seat0";
+}
+
void
seat_set_can_switch (Seat *seat, gboolean can_switch)
{
return seat->priv->sessions;
}
+static gboolean
+set_greeter_idle (gpointer greeter)
+{
+ greeter_idle (GREETER (greeter));
+ return FALSE;
+}
+
void
seat_set_active_session (Seat *seat, Session *session)
{
if (IS_GREETER (s))
{
- l_debug (seat, "Stopping greeter");
- session_stop (s);
+ Greeter *greeter = GREETER (s);
+ if (greeter_get_resettable (greeter))
+ {
+ if (seat->priv->active_session == SESSION (greeter))
+ {
+ l_debug (seat, "Idling greeter");
+ /* Do this in an idle callback, because we might very well
+ be in the middle of responding to a START_SESSION
+ request by a greeter. So they won't expect an IDLE
+ call during that. Plus, this isn't time-sensitive. */
+ g_idle_add (set_greeter_idle, greeter);
+ }
+ }
+ else
+ {
+ l_debug (seat, "Stopping greeter");
+ session_stop (s);
+ }
}
}
session_lock (seat->priv->active_session);
g_object_unref (seat->priv->active_session);
}
+
+ session_activate (session);
seat->priv->active_session = g_object_ref (session);
}
Process *script;
gboolean result = FALSE;
- script = process_new ();
+ script = process_new (NULL, NULL);
process_set_command (script, script_name);
static void
display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
{
+ const gchar *script;
GList *list, *link;
Session *active_session;
l_debug (seat, "Display server stopped");
+ /* Run a script right after stopping the display server */
+ script = seat_get_string_property (seat, "display-stopped-script");
+ if (script)
+ run_script (seat, NULL, script, NULL);
+
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 (!active_session || session_get_display_server (active_session) == display_server)
{
l_debug (seat, "Active display server stopped, starting greeter");
- seat_switch_to_greeter (seat);
+ if (!seat_switch_to_greeter (seat))
+ {
+ l_debug (seat, "Stopping; failed to start a greeter");
+ seat_stop (seat);
+ }
}
}
return seat->priv->share_display_server && display_server_get_can_share (display_server);
}
+static Greeter *
+find_greeter_session (Seat *seat)
+{
+ GList *link;
+
+ for (link = seat->priv->sessions; link; link = link->next)
+ {
+ Session *session = link->data;
+ if (!session_get_is_stopping (session) && IS_GREETER (session))
+ return GREETER (session);
+ }
+
+ return NULL;
+}
+
+static void
+set_greeter_hints (Seat *seat, Greeter *greeter_session)
+{
+ greeter_clear_hints (greeter_session);
+ greeter_set_hint (greeter_session, "default-session", seat_get_string_property (seat, "user-session"));
+ greeter_set_hint (greeter_session, "hide-users", seat_get_boolean_property (seat, "greeter-hide-users") ? "true" : "false");
+ greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false");
+ greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
+ greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
+}
+
static void
switch_to_greeter_from_failed_session (Seat *seat, Session *session)
{
Greeter *greeter_session;
+ gboolean existing = FALSE;
+
+ /* Switch to greeter if one open */
+ greeter_session = find_greeter_session (seat);
+ if (greeter_session)
+ {
+ l_debug (seat, "Switching to existing greeter");
+ set_greeter_hints (seat, greeter_session);
+ existing = TRUE;
+ }
+ else
+ {
+ greeter_session = create_greeter_session (seat);
+ }
- 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);
- if (can_share_display_server (seat, session_get_display_server (session)))
- session_set_display_server (SESSION (greeter_session), session_get_display_server (session));
+ if (existing)
+ {
+ greeter_reset (greeter_session);
+ seat_set_active_session (seat, SESSION (greeter_session));
+ }
else
{
- 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 (greeter_session);
- display_server = create_display_server (seat, session_get_session_type (session));
- if (!display_server_start (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
{
- l_debug (seat, "Failed to start display server for greeter");
- seat_stop (seat);
+ DisplayServer *display_server;
+
+ display_server = create_display_server (seat, session_get_session_type (session));
+ session_set_display_server (session, display_server);
+ if (!display_server_start (display_server))
+ {
+ l_debug (seat, "Failed to start display server for greeter");
+ seat_stop (seat);
+ }
}
- session_set_display_server (session, display_server);
+ start_session (seat, SESSION (greeter_session));
}
- start_session (seat, SESSION (greeter_session));
-
/* Stop failed session */
session_stop (session);
}
script = seat_get_string_property (seat, "greeter-setup-script");
else
script = seat_get_string_property (seat, "session-setup-script");
- if (script && !run_script (seat, session_get_display_server (session), script, NULL))
+ if (script && !run_script (seat, session_get_display_server (session), script, session_get_user (session)))
{
l_debug (seat, "Switching to greeter due to failed setup script");
switch_to_greeter_from_failed_session (seat, session);
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = NULL;
}
+ else if (seat->priv->active_session)
+ {
+ /* Multiple sessions can theoretically be on the same VT (especially
+ if using Mir). If a new session appears on an existing active VT,
+ logind will mark it as active, while ConsoleKit will re-mark the
+ oldest session as active. In either case, that may not be the
+ session that we want to be active. So let's be explicit and
+ re-activate the correct session whenever a new session starts.
+ There's no harm to do this in seats that enforce separate VTs. */
+ session_activate (seat->priv->active_session);
+ }
}
static Session *
else if (!IS_GREETER (session) && session == seat_get_active_session (seat))
{
l_debug (seat, "Active session stopped, starting greeter");
- seat_switch_to_greeter (seat);
+ if (!seat_switch_to_greeter (seat))
+ {
+ l_debug (seat, "Stopping; failed to start a greeter");
+ seat_stop (seat);
+ }
}
/* Stop the display server if no-longer required */
const gchar *desktop_name;
session_set_session_type (session, session_config_get_session_type (config));
+ session_set_env (session, "XDG_SESSION_DESKTOP", session_name);
session_set_env (session, "DESKTOP_SESSION", session_name);
session_set_env (session, "GDMSESSION", session_name);
desktop_name = session_config_get_desktop_name (config);
g_object_unref (session_config);
}
else
- l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+ l_debug (seat, "Can't find session '%s'", session_name);
g_object_unref (user);
}
static Session *
-create_guest_session (Seat *seat)
+create_guest_session (Seat *seat, const gchar *session_name)
{
- const gchar *session_name, *guest_wrapper;
+ const gchar *guest_wrapper;
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Session *session;
- session_name = seat_get_string_property (seat, "user-session");
+ if (!session_name)
+ session_name = seat_get_string_property (seat, "guest-session");
+ 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 (seat, sessions_dir, session_name);
g_free (sessions_dir);
if (!session_config)
{
- l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+ l_debug (seat, "Can't find session '%s'", session_name);
return NULL;
}
session_set_do_authenticate (session, TRUE);
session_set_is_guest (session, TRUE);
argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
-
guest_wrapper = seat_get_string_property (seat, "guest-wrapper");
if (guest_wrapper)
{
greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat)
{
Session *session, *existing_session;
- const gchar *username, *language = NULL;
- SessionConfig *session_config;
- User *user;
- gchar *sessions_dir = NULL;
- gchar **argv;
+ const gchar *username;
DisplayServer *display_server;
/* Get the session to use */
if (greeter_get_guest_authenticated (greeter))
{
- session = create_guest_session (seat);
+ session = create_guest_session (seat, session_name);
if (!session)
return FALSE;
session_set_pam_service (session, AUTOLOGIN_SERVICE);
}
else
+ {
+ const gchar *language = NULL;
+ SessionConfig *session_config;
+ User *user;
+ gchar *sessions_dir = NULL;
+ gchar **argv;
+
session = greeter_get_authentication_session (greeter);
+
+ /* Get session command to run */
+ switch (type)
+ {
+ case SESSION_TYPE_LOCAL:
+ sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
+ break;
+ case SESSION_TYPE_REMOTE:
+ sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
+ break;
+ }
+
+ /* Load user preferences */
+ user = session_get_user (session);
+ if (user)
+ {
+ if (!session_name)
+ session_name = user_get_xsession (user);
+ language = user_get_language (user);
+ }
+
+ if (!session_name)
+ session_name = seat_get_string_property (seat, "user-session");
+ if (user)
+ user_set_xsession (session_get_user (session), session_name);
+
+ session_config = find_session_config (seat, sessions_dir, session_name);
+ g_free (sessions_dir);
+ if (!session_config)
+ {
+ l_debug (seat, "Can't find session '%s'", session_name);
+ return FALSE;
+ }
+
+ 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);
+ g_object_unref (session_config);
+ }
/* Switch to this session when it is ready */
if (seat->priv->session_to_activate)
return TRUE;
}
- /* Get session command to run */
- switch (type)
- {
- case SESSION_TYPE_LOCAL:
- sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
- break;
- case SESSION_TYPE_REMOTE:
- sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
- break;
- }
-
- /* Load user preferences */
- user = session_get_user (session);
- if (user)
- {
- if (!session_name)
- session_name = user_get_xsession (user);
- language = user_get_language (user);
- }
-
- if (!session_name)
- session_name = seat_get_string_property (seat, "user-session");
- if (user)
- user_set_xsession (session_get_user (session), session_name);
-
- session_config = find_session_config (seat, sessions_dir, session_name);
- g_free (sessions_dir);
- if (!session_config)
- {
- l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
- return FALSE;
- }
-
- 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);
- 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 (!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");
g_signal_connect (greeter_session, "start-session", G_CALLBACK (greeter_start_session_cb), seat);
/* Set hints to greeter */
- greeter_set_hint (greeter_session, "default-session", seat_get_string_property (seat, "user-session"));
greeter_set_allow_guest (greeter_session, seat_get_allow_guest (seat));
- greeter_set_hint (greeter_session, "hide-users", seat_get_boolean_property (seat, "greeter-hide-users") ? "true" : "false");
- greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false");
- greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
- greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
+ set_greeter_hints (seat, greeter_session);
g_object_unref (session_config);
return display_server;
}
-static Greeter *
-find_greeter_session (Seat *seat)
-{
- GList *link;
-
- for (link = seat->priv->sessions; link; link = link->next)
- {
- Session *session = link->data;
- if (!session_get_is_stopping (session) && IS_GREETER (session))
- return GREETER (session);
- }
-
- return NULL;
-}
-
gboolean
seat_switch_to_greeter (Seat *seat)
{
if (!seat->priv->can_switch)
return FALSE;
- /* Switch to greeter if one open (shouldn't be though) */
+ /* Switch to greeter if one open */
greeter_session = find_greeter_session (seat);
if (greeter_session)
{
}
greeter_session = create_greeter_session (seat);
+ if (!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);
{
Greeter *greeter_session;
DisplayServer *display_server;
+ gboolean existing = FALSE;
/* If authenticated, then unlock existing session or start new one */
if (session_get_is_authenticated (session))
return;
}
- l_debug (seat, "Switching to greeter to authenticate session");
-
session_stop (session);
- greeter_session = create_greeter_session (seat);
+ /* See if we already have a greeter up and reuse it if so. Which will only
+ happen if the greeter marked itself as resettable and we thus didn't
+ kill it when a user session started */
+ greeter_session = find_greeter_session (seat);
+ if (greeter_session)
+ {
+ l_debug (seat, "Switching to existing greeter to authenticate session");
+ set_greeter_hints (seat, greeter_session);
+ existing = TRUE;
+ }
+ else
+ {
+ l_debug (seat, "Starting greeter to authenticate 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)));
- session_set_display_server (SESSION (greeter_session), display_server);
- display_server_start (display_server);
+ if (existing)
+ {
+ greeter_reset (greeter_session);
+ seat_set_active_session (seat, SESSION (greeter_session));
+ }
+ else
+ {
+ 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)));
+ session_set_display_server (SESSION (greeter_session), display_server);
+ display_server_start (display_server);
+ }
}
gboolean
return TRUE;
}
- session = create_guest_session (seat);
+ session = create_guest_session (seat, session_name);
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);
session_set_pam_service (session, AUTOLOGIN_SERVICE);
session_set_display_server (session, display_server);
- return TRUE;
+ return display_server_start (display_server);
}
gboolean
{
Greeter *greeter_session;
DisplayServer *display_server;
+ gboolean existing = FALSE;
g_return_val_if_fail (seat != NULL, FALSE);
l_debug (seat, "Locking");
- /* Switch to greeter if one open (shouldn't be though) */
+ /* Switch to greeter if one open (only true if it's a resettable greeter) */
greeter_session = find_greeter_session (seat);
if (greeter_session)
{
l_debug (seat, "Switching to existing greeter");
- seat_set_active_session (seat, SESSION (greeter_session));
- return TRUE;
+ set_greeter_hints (seat, greeter_session);
+ existing = TRUE;
+ }
+ else
+ {
+ greeter_session = create_greeter_session (seat);
+ if (!greeter_session)
+ return FALSE;
}
- 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;
-
- if (seat->priv->session_to_activate)
- g_object_unref (seat->priv->session_to_activate);
- seat->priv->session_to_activate = g_object_ref (greeter_session);
greeter_set_hint (greeter_session, "lock-screen", "true");
if (username)
greeter_set_hint (greeter_session, "select-user", username);
- session_set_display_server (SESSION (greeter_session), display_server);
- return TRUE;
+ if (existing)
+ {
+ greeter_reset (greeter_session);
+ seat_set_active_session (seat, SESSION (greeter_session));
+ return TRUE;
+ }
+ else
+ {
+ display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_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);
+ session_set_display_server (SESSION (greeter_session), display_server);
+
+ return display_server_start (display_server);
+ }
}
void
if (autologin_timeout == 0 || autologin_in_background)
{
if (autologin_guest)
- session = create_guest_session (seat);
+ session = create_guest_session (seat, NULL);
else if (autologin_username != NULL)
session = create_user_session (seat, autologin_username, TRUE);
projects / sojka / lightdm.git / blobdiff