From: Ray Strode <rstrode@redhat.com>
Date: Thu, 26 Jun 2008 19:14:58 +0000 (-0400)
Subject: Draw spindicator in a brown trough
X-Git-Tag: 0.4.5~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=036c7ddbeadd400f73da76857468edbd22eb25e2;p=thirdparty%2Fplymouth.git

Draw spindicator in a brown trough
---

diff --git a/src/libplybootsplash/ply-text-pulser.c b/src/libplybootsplash/ply-text-pulser.c
index d11b1dbd..34630bb2 100644
--- a/src/libplybootsplash/ply-text-pulser.c
+++ b/src/libplybootsplash/ply-text-pulser.c
@@ -81,7 +81,7 @@ ply_text_pulser_new (void)
   pulser->column = 0;
   pulser->spinner_position = 0;
   pulser->number_of_columns = 40;
-  pulser->number_of_rows = 3;
+  pulser->number_of_rows = 1;
 
   return pulser;
 }
@@ -95,21 +95,38 @@ ply_text_pulser_free (ply_text_pulser_t *pulser)
   free (pulser);
 }
 
+static void
+draw_trough (ply_text_pulser_t *pulser,
+             int                column,
+             int                row)
+{
+  char *bytes;
+
+  ply_window_set_text_cursor_position (pulser->window,
+                                       column,
+                                       row);
+  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_BROWN);
+  bytes = malloc (pulser->number_of_columns);
+  memset (bytes, ' ', pulser->number_of_columns);
+  write (STDOUT_FILENO, bytes, pulser->number_of_columns);
+  free (bytes);
+}
+
 static void
 animate_at_time (ply_text_pulser_t *pulser,
                  double             time)
 {
   ply_window_set_mode (pulser->window, PLY_WINDOW_MODE_TEXT);
 
+  draw_trough (pulser, pulser->column, pulser->row);
+
   ply_window_set_text_cursor_position (pulser->window,
                                        pulser->column + pulser->spinner_position,
-                                       pulser->row + 1);
-  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_DEFAULT);
-  write (STDOUT_FILENO, "      ", strlen ("      "));
-  pulser->spinner_position = ((pulser->number_of_columns - 2) - NUMBER_OF_INDICATOR_COLUMNS - 1)  * (.5 * sin (time) + .5) + 2;
+                                       pulser->row);
+  pulser->spinner_position = (pulser->number_of_columns - strlen ("      ") + 1)  * (.5 * sin (time) + .5);
   ply_window_set_text_cursor_position (pulser->window,
                                        pulser->column + pulser->spinner_position,
-                                       pulser->row + 1);
+                                       pulser->row);
 
   ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_WHITE);
   write (STDOUT_FILENO, "      ", strlen ("      "));