Change colors of text splash screen to configured colors

We pass colors into configure, so we should use them

diff --git a/src/libplybootsplash/ply-text-pulser.c b/src/libplybootsplash/ply-text-pulser.c
index 34630bb27a69f36f3266a33c4004806e5dca8ea0..f22f41de0b0dad5129fa78ebd27abdc050554289 100644 (file)
--- a/src/libplybootsplash/ply-text-pulser.c
+++ b/src/libplybootsplash/ply-text-pulser.c
@@ -128,7 +128,7 @@ animate_at_time (ply_text_pulser_t *pulser,
                                        pulser->column + pulser->spinner_position,
                                        pulser->row);
 
-  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_WHITE);
+  ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_GREEN);
   write (STDOUT_FILENO, "      ", strlen ("      "));
   ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_DEFAULT);
 }

diff --git a/src/splash-plugins/text/Makefile.am b/src/splash-plugins/text/Makefile.am
index 075230a19951e114152568682ed5c359cc50dd79..ccf8093dc4e056cefc44e40c5abab849ff69dd14 100644 (file)
--- a/src/splash-plugins/text/Makefile.am
+++ b/src/splash-plugins/text/Makefile.am
@@ -8,7 +8,11 @@ INCLUDES = -I$(top_srcdir)                                                    \
 plugindir = $(libdir)/plymouth
 plugin_LTLIBRARIES = text.la
 
-text_la_CFLAGS = $(PLYMOUTH_CFLAGS)
+text_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                           \
+                 -DPLYMOUTH_BACKGROUND_COLOR=$(background_color)              \
+                 -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color)      \
+                 -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
+
 text_la_LDFLAGS = -module -avoid-version -export-dynamic
 text_la_LIBADD = $(PLYMOUTH_LIBS)                                            \
                    ../../libply/libply.la                                   \

diff --git a/src/splash-plugins/text/plugin.c b/src/splash-plugins/text/plugin.c
index 8fa553f5f2006552216b6406573100506aa51eab..216e482bbdebe29e80bc7f354df7b73fd2fc1457 100644 (file)
--- a/src/splash-plugins/text/plugin.c
+++ b/src/splash-plugins/text/plugin.c
@@ -104,6 +104,16 @@ start_animation (ply_boot_splash_plugin_t *plugin)
   assert (plugin != NULL);
   assert (plugin->loop != NULL);
 
+  ply_window_set_color_hex_value (plugin->window,
+                                  PLY_WINDOW_COLOR_BROWN,
+                                  PLYMOUTH_BACKGROUND_END_COLOR);
+  ply_window_set_color_hex_value (plugin->window,
+                                  PLY_WINDOW_COLOR_BLUE,
+                                  PLYMOUTH_BACKGROUND_START_COLOR);
+  ply_window_set_color_hex_value (plugin->window,
+                                  PLY_WINDOW_COLOR_GREEN,
+                                  PLYMOUTH_BACKGROUND_COLOR);
+
   ply_window_set_background_color (plugin->window, PLY_WINDOW_COLOR_BLUE);
   ply_window_clear_screen (plugin->window);
   ply_window_hide_text_cursor (plugin->window);