script: Replace ConsoleViewerPreserveBackground with ConsoleLogBackgroundColor

diff --git a/src/plugins/splash/script/plugin.c b/src/plugins/splash/script/plugin.c
index 3405a801a8fa93f54ae2fac72e65963d7d2e51bb..0bdd0258fa20df8e11e000575513249409ed3f29 100644 (file)
--- a/src/plugins/splash/script/plugin.c
+++ b/src/plugins/splash/script/plugin.c
@@ -103,7 +103,7 @@ struct _ply_boot_splash_plugin
         uint32_t                       should_show_console_messages : 1;
         ply_buffer_t                  *boot_buffer;
         uint32_t                       console_text_color;
-        uint32_t                       console_viewer_preserve_background;
+        uint32_t                       console_background_color;
 };
 
 typedef struct
@@ -237,8 +237,10 @@ create_plugin (ply_key_file_t *key_file)
                                        "ConsoleLogTextColor",
                                        PLY_CONSOLE_VIEWER_LOG_TEXT_COLOR);
 
-        plugin->console_viewer_preserve_background =
-                ply_key_file_get_bool (key_file, "script", "ConsoleViewerPreserveBackground");
+        plugin->console_background_color =
+                ply_key_file_get_long (key_file, "script",
+                                       "ConsoleLogBackgroundColor",
+                                       0x00000000);
 
         plugin->displays = ply_list_new ();
 
@@ -339,7 +341,7 @@ start_script_animation (ply_boot_splash_plugin_t *plugin)
                                                              plugin->boot_buffer,
                                                              plugin->monospace_font,
                                                              plugin->console_text_color,
-                                                             plugin->console_viewer_preserve_background);
+                                                             plugin->console_background_color);
         plugin->script_plymouth_lib = script_lib_plymouth_setup (plugin->script_state,
                                                                  plugin->mode,
                                                                  FRAMES_PER_SECOND,

diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
index 933f3b461b6f3e3bbb30cac9b88482376a1e2f75..2c97f4a9d43d81c567854204932fa456a5d39064 100644 (file)
--- a/src/plugins/splash/script/script-lib-sprite.c
+++ b/src/plugins/splash/script/script-lib-sprite.c
@@ -401,11 +401,6 @@ static void script_lib_draw_brackground (ply_pixel_buffer_t       *pixel_buffer,
                                          ply_rectangle_t          *clip_area,
                                          script_lib_sprite_data_t *data)
 {
-        if (data->should_show_console_messages && data->console_viewer_preserve_background == false) {
-                ply_pixel_buffer_fill_with_hex_color (pixel_buffer, clip_area, 0);
-                return;
-        }
-
         if (data->background_color_start == data->background_color_end) {
                 ply_pixel_buffer_fill_with_hex_color (pixel_buffer,
                                                       clip_area,
@@ -416,6 +411,10 @@ static void script_lib_draw_brackground (ply_pixel_buffer_t       *pixel_buffer,
                                                      data->background_color_start,
                                                      data->background_color_end);
         }
+
+        if (data->should_show_console_messages)
+                ply_pixel_buffer_fill_with_hex_color (pixel_buffer, clip_area, data->console_background_color);
+
 }
 
 static void script_lib_sprite_draw_area (script_lib_display_t *display,
@@ -573,7 +572,7 @@ script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state,
                                                    ply_buffer_t   *boot_buffer,
                                                    char           *monospace_font,
                                                    uint32_t        console_text_color,
-                                                   bool            console_viewer_preserve_background)
+                                                   uint32_t        console_background_color)
 {
         ply_list_node_t *node;
         script_lib_sprite_data_t *data = malloc (sizeof(script_lib_sprite_data_t));
@@ -585,7 +584,7 @@ script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state,
         data->boot_buffer = boot_buffer;
         data->monospace_font = monospace_font;
         data->console_text_color = console_text_color;
-        data->console_viewer_preserve_background = console_viewer_preserve_background;
+        data->console_background_color = console_background_color;
 
         for (node = ply_list_get_first_node (pixel_displays);
              node;

diff --git a/src/plugins/splash/script/script-lib-sprite.h b/src/plugins/splash/script/script-lib-sprite.h
index 2f24e91731e778ec86d5865a5cb3c94e7271f1c6..1a5ee59116bb6a2d1db5fd7552b961a8642c9ebd 100644 (file)
--- a/src/plugins/splash/script/script-lib-sprite.h
+++ b/src/plugins/splash/script/script-lib-sprite.h
@@ -42,7 +42,7 @@ typedef struct
         ply_buffer_t              *boot_buffer;
         char                      *monospace_font;
         uint32_t                   console_text_color;
-        bool                       console_viewer_preserve_background;
+        uint32_t                   console_background_color;
         bool                       needs_redraw;
         bool                       plugin_console_messages_updating;
         bool                       should_show_console_messages;
@@ -82,7 +82,7 @@ script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state,
                                                    ply_buffer_t   *boot_buffer,
                                                    char           *monospace_font,
                                                    uint32_t        console_text_color,
-                                                   bool            console_viewer_preserve_background);
+                                                   uint32_t        console_background_color);
 void script_lib_sprite_pixel_display_added (script_lib_sprite_data_t *data,
                                             ply_pixel_display_t      *pixel_display);
 void script_lib_sprite_pixel_display_removed (script_lib_sprite_data_t *data,

diff --git a/themes/script/script.plymouth.in b/themes/script/script.plymouth.in
index d357652a1934be4d9299ff44fa4aa97bd1b41a7f..4b94c0d1a4d79156c8e32a95ad6d2c9a46ffb1be 100644 (file)
--- a/themes/script/script.plymouth.in
+++ b/themes/script/script.plymouth.in
@@ -6,7 +6,7 @@ ModuleName=script
 [script]
 ImageDir=@PLYMOUTH_THEME_PATH@/script
 ScriptFile=@PLYMOUTH_THEME_PATH@/script/script.script
-ConsoleViewerPreserveBackground=false
+ConsoleLogBackgroundColor=0x00000000
 
 [script-env-vars]
 example_env_var=example env var value