add stars to boot splash to signify boot progress.

It occasionally exposes a memory corruption bug in the frame
buffer code that causes an assertion to fail.

diff --git a/src/splash-plugins/fedora-fade-in.c b/src/splash-plugins/fedora-fade-in.c
index d42f217e6c30198d442aac033a36e619e250a857..8364da6e92d11e9dda0e015474edd1268fafd408 100644 (file)
--- a/src/splash-plugins/fedora-fade-in.c
+++ b/src/splash-plugins/fedora-fade-in.c
@@ -40,6 +40,7 @@
 
 #include "ply-boot-splash-plugin.h"
 #include "ply-event-loop.h"
+#include "ply-list.h"
 #include "ply-frame-buffer.h"
 #include "ply-image.h"
 #include "ply-utils.h"
@@ -47,17 +48,28 @@
 #include <linux/kd.h>
 
 #ifndef FRAMES_PER_SECOND
-#define FRAMES_PER_SECOND 50
+#define FRAMES_PER_SECOND 30
 #endif
 
+typedef struct
+{
+  int x; 
+  int y;
+  double start_time;
+  double speed;
+} star_t;
+
 struct _ply_boot_splash_plugin
 {
   ply_event_loop_t *loop;
   ply_frame_buffer_t *frame_buffer;
-  ply_image_t *image;
+  ply_image_t *logo_image;
+  ply_image_t *star_image;
+  ply_list_t *stars;
 
   int console_fd;
   double start_time;
+  double now;
 };
 
 ply_boot_splash_plugin_t *
@@ -65,23 +77,75 @@ create_plugin (void)
 {
   ply_boot_splash_plugin_t *plugin;
 
+  srand ((int) ply_get_timestamp ());
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
   plugin->console_fd = -1;
   plugin->start_time = 0.0;
 
   plugin->frame_buffer = ply_frame_buffer_new (NULL);
-  plugin->image = ply_image_new ("/booting.png");
+  plugin->logo_image = ply_image_new ("/booting.png");
+  plugin->star_image = ply_image_new ("/star.png");
+  plugin->stars = ply_list_new ();
 
   return plugin;
 }
 
+star_t *
+star_new (int    x,
+          int    y,
+          double speed)
+{
+  star_t *star;
+
+  star = calloc (1, sizeof (star_t));
+  star->x = x;
+  star->y = y;
+  star->speed = speed;
+  star->start_time = ply_get_timestamp ();
+
+  return star;
+}
+
+static void
+star_free (star_t *star)
+{
+  free (star);
+}
+
+static void
+free_stars (ply_boot_splash_plugin_t *plugin)
+{
+  ply_list_node_t *node;
+
+  assert (plugin != NULL);
+
+  node = ply_list_get_first_node (plugin->stars);
+  while (node != NULL)
+    {
+      ply_list_node_t *next_node;
+      star_t *star;
+
+      star = (star_t *) ply_list_node_get_data (node);
+
+      next_node = ply_list_get_next_node (plugin->stars, node);
+
+      star_free (star);
+      node = next_node;
+    }
+
+  ply_list_free (plugin->stars);
+  plugin->stars = NULL;
+}
+
 void
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
   if (plugin == NULL)
     return;
 
-  ply_image_free (plugin->image);
+  free_stars (plugin);
+  ply_image_free (plugin->logo_image);
+  ply_image_free (plugin->star_image);
   ply_frame_buffer_free (plugin->frame_buffer);
   free (plugin);
 }
@@ -90,6 +154,7 @@ static bool
 set_graphics_mode (ply_boot_splash_plugin_t *plugin)
 {
   assert (plugin != NULL);
+  return true;
 
   if (ioctl (plugin->console_fd, KDSETMODE, KD_GRAPHICS) < 0)
     return false;
@@ -129,56 +194,94 @@ static void
 animate_at_time (ply_boot_splash_plugin_t *plugin,
                  double                    time)
 {
-  ply_frame_buffer_t *buffer;
-  ply_image_t *image;
-  ply_frame_buffer_area_t area;
-  uint32_t *data;
+  ply_list_node_t *node;
+  ply_frame_buffer_area_t logo_area, star_area;
+  uint32_t *logo_data, *star_data;
   long width, height;
   static double last_opacity = 0.0;
   double opacity = 0.0;
 
-  buffer = plugin->frame_buffer;
-  image = plugin->image;
-  
-  data = ply_image_get_data (image);
-  width = ply_image_get_width (image);
-  height = ply_image_get_height (image);
+  ply_frame_buffer_pause_updates (plugin->frame_buffer);
+
+  logo_data = ply_image_get_data (plugin->logo_image);
+  ply_frame_buffer_get_size (plugin->frame_buffer, &logo_area);
+  width = ply_image_get_width (plugin->logo_image);
+  height = ply_image_get_height (plugin->logo_image);
+  logo_area.x = (logo_area.width / 2) - (width / 2);
+  logo_area.y = (logo_area.height / 2) - (height / 2);
+  logo_area.width = width;
+  logo_area.height = height;
 
-  ply_frame_buffer_get_size (buffer, &area);
-  area.x = (area.width / 2) - (width / 2);
-  area.y = (area.height / 2) - (height / 2);
-  area.width = width;
-  area.height = height;
+  star_data = ply_image_get_data (plugin->star_image);
+  star_area.width = ply_image_get_width (plugin->star_image);
+  star_area.height = ply_image_get_height (plugin->star_image);
+
+  node = ply_list_get_first_node (plugin->stars);
+  while (node != NULL)
+    {
+      ply_list_node_t *next_node;
+      star_t *star;
+
+      star = (star_t *) ply_list_node_get_data (node);
+      next_node = ply_list_get_next_node (plugin->stars, node);
+
+      if (((star->x >= logo_area.x) 
+           && (star->x + star_area.width <= logo_area.x + logo_area.width))
+          && ((star->y >= logo_area.y) 
+           && (star->y + star_area.height <= logo_area.y + logo_area.height)))
+        {
+          node = next_node;
+          continue;
+        }
+
+      star_area.x = star->x;
+      star_area.y = star->y;
+
+      opacity = .5 * sin (((plugin->now - star->start_time) / star->speed) * (2 * M_PI)) + .5;
+      opacity = CLAMP (opacity, 0, 1.0);
+
+      ply_frame_buffer_fill_with_color (plugin->frame_buffer, &star_area,
+                                        0.1, 0.1, .7, 1.0);
+      ply_frame_buffer_fill_with_argb32_data_at_opacity (plugin->frame_buffer, 
+                                                         &star_area, 0, 0, 
+                                                         star_area.width, 
+                                                         star_area.height,
+                                                         star_data, opacity);
+
+      node = next_node;
+    }
 
-  opacity = .5 * sin ((time / 4) * (2 * M_PI)) + .8;
+  opacity = .5 * sin ((time / 10) * (2 * M_PI)) + .8;
   opacity = CLAMP (opacity, 0, 1.0);
 
   if (fabs (opacity - last_opacity) <= DBL_MIN)
-    return;
+    {
+      ply_frame_buffer_unpause_updates (plugin->frame_buffer);
+      return;
+    }
 
   last_opacity = opacity;
 
-  ply_frame_buffer_pause_updates (buffer);
-  ply_frame_buffer_fill_with_color (buffer, &area, 0.1, 0.1, .7, 1.0);
-  ply_frame_buffer_fill_with_argb32_data_at_opacity (buffer, &area, 
-                                                     0, 0, width, height, 
-                                                     data, opacity);
-  ply_frame_buffer_unpause_updates (buffer);
+  ply_frame_buffer_fill_with_color (plugin->frame_buffer, &logo_area,
+                                    0.1, 0.1, .7, 1.0);
+  ply_frame_buffer_fill_with_argb32_data_at_opacity (plugin->frame_buffer, 
+                                                     &logo_area, 0, 0, width, height,
+                                                     logo_data, opacity);
+  ply_frame_buffer_unpause_updates (plugin->frame_buffer);
 }
 
 static void
 on_timeout (ply_boot_splash_plugin_t *plugin)
 {
   double sleep_time;
-  double now;
 
   set_graphics_mode (plugin);
-  now = ply_get_timestamp ();
+  plugin->now = ply_get_timestamp ();
   animate_at_time (plugin,
-                   now - plugin->start_time);
+                   plugin->now - plugin->start_time);
   sleep_time = 1.0 / FRAMES_PER_SECOND;
-  sleep_time = MAX (sleep_time - (ply_get_timestamp () - now),
-                    0.010);
+  sleep_time = MAX (sleep_time - (ply_get_timestamp () - plugin->now),
+                    0.005);
 
   ply_event_loop_watch_for_timeout (plugin->loop, 
                                     sleep_time,
@@ -217,10 +320,13 @@ bool
 show_splash_screen (ply_boot_splash_plugin_t *plugin)
 {
   assert (plugin != NULL);
-  assert (plugin->image != NULL);
+  assert (plugin->logo_image != NULL);
   assert (plugin->frame_buffer != NULL);
 
-  if (!ply_image_load (plugin->image))
+  if (!ply_image_load (plugin->logo_image))
+    return false;
+
+  if (!ply_image_load (plugin->star_image))
     return false;
 
   if (!ply_frame_buffer_open (plugin->frame_buffer))
@@ -242,11 +348,31 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin)
   return true;
 }
 
+static void
+add_star (ply_boot_splash_plugin_t *plugin)
+{
+  ply_frame_buffer_area_t area;
+  star_t *star;
+  int x, y;
+
+  assert (plugin != NULL);
+
+  ply_frame_buffer_get_size (plugin->frame_buffer, &area);
+
+  x = rand () % area.width;
+  y = rand () % area.height;
+
+  star = star_new (x, y, (double) ((rand () % 10) + 1));
+  ply_list_append_data (plugin->stars, star);
+}
+
 void
 update_status (ply_boot_splash_plugin_t *plugin,
                const char               *status)
 {
   assert (plugin != NULL);
+
+  add_star (plugin);
 }
 
 void