From 03d92cf39f74b265cc9936bdeabfcf071b102767 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 27 Nov 2009 18:52:54 -0500 Subject: Enable smooth transition between plymouth and X This commit checks if plymouth is running, and if so, turns on the smooth transition between plymouth and X. --- daemon/gdm-server.c | 55 ++++++++++++++++++++++++++++ daemon/gdm-server.h | 1 + daemon/gdm-simple-slave.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 146 insertions(+), 1 deletion(-) diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c index 54bf8b38..365590f3 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #ifdef HAVE_SYS_PRCTL_H @@ -41,6 +42,7 @@ #ifdef WITH_SYSTEMD #include #endif +#include #include #include @@ -732,6 +734,44 @@ gdm_server_spawn (GdmServer *server, return ret; } +static int +get_active_vt (void) +{ + int console_fd; + struct vt_stat console_state = { 0 }; + + console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY); + + if (console_fd < 0) { + goto out; + } + + if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) { + goto out; + } + +out: + if (console_fd >= 0) { + close (console_fd); + } + + return console_state.v_active; +} + +static char * +get_active_vt_as_string (void) +{ + int vt; + + vt = get_active_vt (); + + if (vt <= 0) { + return NULL; + } + + return g_strdup_printf ("vt%d", vt); +} + /** * gdm_server_start: * @disp: Pointer to a GdmDisplay structure @@ -750,6 +790,21 @@ gdm_server_start (GdmServer *server) return res; } +gboolean +gdm_server_start_on_active_vt (GdmServer *server) +{ + gboolean res; + char *vt; + + g_free (server->priv->command); + server->priv->command = g_strdup (X_SERVER " -background none -logverbose 7"); + vt = get_active_vt_as_string (); + res = gdm_server_spawn (server, vt); + g_free (vt); + + return res; +} + static void server_died (GdmServer *server) { diff --git a/daemon/gdm-server.h b/daemon/gdm-server.h index b53d68e5..49393825 100644 --- a/daemon/gdm-server.h +++ b/daemon/gdm-server.h @@ -57,6 +57,7 @@ GdmServer * gdm_server_new (const char *display_id, const char *seat_id, const char *auth_file); gboolean gdm_server_start (GdmServer *server); +gboolean gdm_server_start_on_active_vt (GdmServer *server); gboolean gdm_server_stop (GdmServer *server); char * gdm_server_get_display_device (GdmServer *server); diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index fc8649c5..dd19ced2 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -93,6 +93,7 @@ struct GdmSimpleSlavePrivate #ifdef HAVE_LOGINDEVPERM gboolean use_logindevperm; #endif + guint plymouth_is_running : 1; }; enum { @@ -1204,6 +1205,72 @@ on_start_session_later (GdmGreeterServer *session, slave->priv->start_session_when_ready = FALSE; } +static gboolean +plymouth_is_running (void) +{ + int status; + gboolean res; + GError *error; + + error = NULL; + res = g_spawn_command_line_sync ("/bin/plymouth --ping", + NULL, NULL, &status, &error); + if (! res) { + g_debug ("Could not ping plymouth: %s", error->message); + g_error_free (error); + return FALSE; + } + + return WIFEXITED (status) && WEXITSTATUS (status) == 0; +} + +static void +plymouth_prepare_for_transition (GdmSimpleSlave *slave) +{ + gboolean res; + GError *error; + + error = NULL; + res = g_spawn_command_line_sync ("/bin/plymouth deactivate", + NULL, NULL, NULL, &error); + if (! res) { + g_warning ("Could not deactivate plymouth: %s", error->message); + g_error_free (error); + } +} + +static void +plymouth_quit_with_transition (GdmSimpleSlave *slave) +{ + gboolean res; + GError *error; + + error = NULL; + res = g_spawn_command_line_sync ("/bin/plymouth quit --retain-splash", + NULL, NULL, NULL, &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); + } + slave->priv->plymouth_is_running = FALSE; +} + +static void +plymouth_quit_without_transition (GdmSimpleSlave *slave) +{ + gboolean res; + GError *error; + + error = NULL; + res = g_spawn_command_line_sync ("/bin/plymouth quit", + NULL, NULL, NULL, &error); + if (! res) { + g_warning ("Could not quit plymouth: %s", error->message); + g_error_free (error); + } + slave->priv->plymouth_is_running = FALSE; +} + static void setup_server (GdmSimpleSlave *slave) { @@ -1223,6 +1290,10 @@ setup_server (GdmSimpleSlave *slave) */ gdm_slave_save_root_windows (GDM_SLAVE (slave)); + /* Plymouth is waiting for the go-ahead to exit */ + if (slave->priv->plymouth_is_running) { + plymouth_quit_with_transition (slave); + } } static void @@ -1426,6 +1497,10 @@ on_server_exited (GdmServer *server, g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code); gdm_slave_stopped (GDM_SLAVE (slave)); + + if (slave->priv->plymouth_is_running) { + plymouth_quit_without_transition (slave); + } } static void @@ -1438,6 +1513,10 @@ on_server_died (GdmServer *server, g_strsignal (signal_number)); gdm_slave_stopped (GDM_SLAVE (slave)); + + if (slave->priv->plymouth_is_running) { + plymouth_quit_without_transition (slave); + } } static gboolean @@ -1484,7 +1563,14 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) G_CALLBACK (on_server_ready), slave); - res = gdm_server_start (slave->priv->server); + slave->priv->plymouth_is_running = plymouth_is_running (); + + if (slave->priv->plymouth_is_running) { + plymouth_prepare_for_transition (slave); + res = gdm_server_start_on_active_vt (slave->priv->server); + } else { + res = gdm_server_start (slave->priv->server); + } if (! res) { g_warning (_("Could not start the X " "server (your graphical environment) " @@ -1494,6 +1580,9 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) "In the meantime this display will be " "disabled. Please restart GDM when " "the problem is corrected.")); + if (slave->priv->plymouth_is_running) { + plymouth_quit_without_transition (slave); + } exit (1); } -- cgit v1.2.1