From 2343620d464b93cfa46abddf8af14c7268f17df2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 27 Nov 2009 23:52:54 +0000 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. diff -Nur -x '*.orig' -x '*~' gdm/daemon/gdm-server.c gdm.new/daemon/gdm-server.c --- gdm/daemon/gdm-server.c 2010-03-11 20:04:29.713911923 +0000 +++ gdm.new/daemon/gdm-server.c 2010-03-11 20:04:35.660911091 +0000 @@ -32,8 +32,11 @@ #include #include #include +#include #include +#include + #include #include #include @@ -670,6 +673,44 @@ 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 @@ -693,6 +734,21 @@ 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 " -nr -verbose"); + vt = get_active_vt_as_string (); + res = gdm_server_spawn (server, vt); + g_free (vt); + + return res; +} + static void server_died (GdmServer *server) { diff -Nur -x '*.orig' -x '*~' gdm/daemon/gdm-server.h gdm.new/daemon/gdm-server.h --- gdm/daemon/gdm-server.h 2010-03-11 19:46:50.755211000 +0000 +++ gdm.new/daemon/gdm-server.h 2010-03-11 20:04:35.660911091 +0000 @@ -56,6 +56,7 @@ GdmServer * gdm_server_new (const char *display_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 -Nur -x '*.orig' -x '*~' gdm/daemon/gdm-simple-slave.c gdm.new/daemon/gdm-simple-slave.c --- gdm/daemon/gdm-simple-slave.c 2010-03-11 20:04:30.285908021 +0000 +++ gdm.new/daemon/gdm-simple-slave.c 2010-03-11 20:05:15.296908720 +0000 @@ -84,6 +84,7 @@ guint start_session_when_ready : 1; guint waiting_to_start_session : 1; + guint plymouth_is_running : 1; }; enum { @@ -894,6 +895,91 @@ 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 gboolean +plymouth_has_active_vt (void) +{ + int status; + gboolean res; + GError *error; + + error = NULL; + res = g_spawn_command_line_sync ("/bin/plymouth --has-active-vt", + NULL, NULL, &status, &error); + if (! res) { + g_debug ("Could not ask 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) { @@ -908,6 +994,10 @@ */ 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 @@ -1101,6 +1191,10 @@ 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 @@ -1113,6 +1207,10 @@ g_strsignal (signal_number)); gdm_slave_stopped (GDM_SLAVE (slave)); + + if (slave->priv->plymouth_is_running) { + plymouth_quit_without_transition (slave); + } } static gboolean @@ -1157,7 +1255,21 @@ 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); + + if (plymouth_has_active_vt ()) { + res = gdm_server_start_on_active_vt (slave->priv->server); + } else { + plymouth_quit_without_transition (slave); + slave->priv->plymouth_is_running = 0; + res = gdm_server_start (slave->priv->server); + } + } else { + res = gdm_server_start (slave->priv->server); + } if (! res) { g_warning (_("Could not start the X " "server (your graphical environment) " @@ -1167,6 +1279,9 @@ "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); }