From: n3rdopolis Date: Mon, 20 Mar 2023 02:41:51 +0000 (-0400) Subject: two-step: Get the messages from the console and ply-kmsg-reader, and use ply-terminal... X-Git-Tag: 23.51.283~17^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32b2bffd9d6b3d34744355db2b2ab5d0ecd96201;p=thirdparty%2Fplymouth.git two-step: Get the messages from the console and ply-kmsg-reader, and use ply-terminal-emulator and ply-console-viewer to the display messages --- diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c index 516a66c4..78ca7adf 100644 --- a/src/plugins/splash/two-step/plugin.c +++ b/src/plugins/splash/two-step/plugin.c @@ -61,6 +61,7 @@ #include "ply-progress-animation.h" #include "ply-throbber.h" #include "ply-progress-bar.h" +#include "ply-console-viewer.h" #include @@ -113,6 +114,8 @@ typedef struct ply_trigger_t *end_trigger; ply_pixel_buffer_t *background_buffer; int animation_bottom; + + ply_console_viewer_t *console_viewer; } view_t; typedef struct @@ -192,6 +195,12 @@ struct _ply_boot_splash_plugin uint32_t background_image_is_scaled : 1; uint32_t dialog_clears_firmware_background : 1; uint32_t message_below_animation : 1; + + char *monospace_font; + uint32_t plugin_console_messages_updating : 1; + uint32_t should_show_console_messages : 1; + ply_buffer_t *boot_buffer; + uint32_t console_text_color; }; ply_boot_splash_plugin_interface_t *ply_boot_splash_plugin_get_interface (void); @@ -204,6 +213,16 @@ static void become_idle (ply_boot_splash_plugin_t *plugin, ply_trigger_t *idle_trigger); static void view_show_message (view_t *view, const char *message); +static bool validate_input (ply_boot_splash_plugin_t *plugin, + const char *entry_text, + const char *add_text); +static void on_boot_output (ply_boot_splash_plugin_t *plugin, + const char *output, + size_t size); +static void toggle_console_messages (ply_boot_splash_plugin_t *plugin); +static void display_console_messages (ply_boot_splash_plugin_t *plugin); +static void hide_console_messages (ply_boot_splash_plugin_t *plugin); +static void unhide_console_messages (ply_boot_splash_plugin_t *plugin); static view_t * view_new (ply_boot_splash_plugin_t *plugin, @@ -244,6 +263,16 @@ view_new (ply_boot_splash_plugin_t *plugin, view->subtitle_label = ply_label_new (); ply_label_set_font (view->subtitle_label, plugin->font); + if (ply_console_viewer_preferred ()) { + view->console_viewer = ply_console_viewer_new (view->display, plugin->monospace_font); + ply_console_viewer_set_text_color (view->console_viewer, plugin->console_text_color); + + if (plugin->boot_buffer) + ply_console_viewer_convert_boot_buffer (view->console_viewer, plugin->boot_buffer); + } else { + view->console_viewer = NULL; + } + return view; } @@ -262,6 +291,9 @@ view_free (view_t *view) ply_label_free (view->title_label); ply_label_free (view->subtitle_label); + if (view->console_viewer) + ply_console_viewer_free (view->console_viewer); + if (view->background_buffer != NULL) ply_pixel_buffer_free (view->background_buffer); @@ -1191,6 +1223,21 @@ create_plugin (ply_key_file_t *key_file) } free (transition); + plugin->plugin_console_messages_updating = false; + plugin->should_show_console_messages = false; + + /* Likely only able to set the font if the font is in the initrd */ + plugin->monospace_font = ply_key_file_get_value (key_file, "two-step", "MonospaceFont"); + + if (plugin->monospace_font == NULL) + plugin->monospace_font = strdup ("monospace 10"); + + + plugin->console_text_color = + ply_key_file_get_long (key_file, "two-step", + "ConsoleLogTextColor", + PLY_CONSOLE_VIEWER_LOG_TEXT_COLOR); + plugin->transition_duration = ply_key_file_get_double (key_file, "two-step", "TransitionDuration", 0.0); @@ -1314,6 +1361,7 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin) ply_event_loop_stop_watching_for_exit (plugin->loop, (ply_event_loop_exit_handler_t) detach_from_event_loop, plugin); + detach_from_event_loop (plugin); } @@ -1347,6 +1395,7 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin) free (plugin->font); free (plugin->title_font); + free (plugin->monospace_font); free (plugin->animation_dir); free_views (plugin); free (plugin); @@ -1514,6 +1563,9 @@ draw_background (view_t *view, using_fw_background && plugin->dialog_clears_firmware_background) use_black_background = true; + if (plugin->should_show_console_messages) + use_black_background = true; + if (use_black_background) ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, 0); else if (view->background_buffer != NULL) @@ -1526,6 +1578,9 @@ draw_background (view_t *view, ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, plugin->background_start_color); + if (plugin->should_show_console_messages) + return; + if (plugin->watermark_image != NULL) { uint32_t *data; @@ -1648,6 +1703,10 @@ on_draw (view_t *view, ply_label_draw_area (view->message_label, pixel_buffer, x, y, width, height); + + if (!plugin->plugin_console_messages_updating && view->console_viewer) { + ply_console_viewer_draw_area (view->console_viewer, pixel_buffer, x, y, width, height); + } } static void @@ -1707,11 +1766,30 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin, ply_buffer_t *boot_buffer, ply_boot_splash_mode_t mode) { + ply_list_node_t *node; + assert (plugin != NULL); plugin->loop = loop; plugin->mode = mode; + if (boot_buffer && ply_console_viewer_preferred ()) { + plugin->boot_buffer = boot_buffer; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) { + view_t *view; + ply_list_node_t *next_node; + + view = ply_list_node_get_data (node); + next_node = ply_list_get_next_node (plugin->views, node); + + ply_console_viewer_convert_boot_buffer (view->console_viewer, plugin->boot_buffer); + + node = next_node; + } + } + ply_trace ("loading lock image"); if (!ply_image_load (plugin->lock_image)) return false; @@ -2053,7 +2131,13 @@ display_normal (ply_boot_splash_plugin_t *plugin) hide_prompt (plugin); plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL; - start_progress_animation (plugin); + + if (!plugin->should_show_console_messages) { + start_progress_animation (plugin); + } else { + unhide_console_messages (plugin); + } + redraw_views (plugin); unpause_views (plugin); } @@ -2095,6 +2179,101 @@ display_message (ply_boot_splash_plugin_t *plugin, show_message (plugin, message); } +static bool +validate_input (ply_boot_splash_plugin_t *plugin, + const char *entry_text, + const char *add_text) +{ + if (!ply_console_viewer_preferred ()) + return true; + + if (strcmp (add_text, "\e") == 0) { + toggle_console_messages (plugin); + return false; + } + + return true; +} + +static void +toggle_console_messages (ply_boot_splash_plugin_t *plugin) +{ + if (plugin->should_show_console_messages) { + plugin->should_show_console_messages = false; + hide_console_messages (plugin); + } else { + unhide_console_messages (plugin); + } +} + +static void +display_console_messages (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + view_t *view; + + pause_views (plugin); + + plugin->plugin_console_messages_updating = true; + node = ply_list_get_first_node (plugin->views); + while (node != NULL) { + view = ply_list_node_get_data (node); + ply_console_viewer_show (view->console_viewer, view->display); + node = ply_list_get_next_node (plugin->views, node); + } + plugin->plugin_console_messages_updating = false; + + redraw_views (plugin); + unpause_views (plugin); +} + +static void +unhide_console_messages (ply_boot_splash_plugin_t *plugin) +{ + plugin->should_show_console_messages = true; + stop_animation (plugin); + display_console_messages (plugin); +} + +static void +hide_console_messages (ply_boot_splash_plugin_t *plugin) +{ + ply_list_node_t *node; + view_t *view; + + plugin->should_show_console_messages = false; + + plugin->plugin_console_messages_updating = true; + node = ply_list_get_first_node (plugin->views); + while (node != NULL) { + view = ply_list_node_get_data (node); + ply_console_viewer_hide (view->console_viewer); + node = ply_list_get_next_node (plugin->views, node); + } + plugin->plugin_console_messages_updating = false; + if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) + start_progress_animation (plugin); +} + +static void +on_boot_output (ply_boot_splash_plugin_t *plugin, + const char *output, + size_t size) +{ + ply_list_node_t *node; + view_t *view; + + if (!ply_console_viewer_preferred ()) + return; + + node = ply_list_get_first_node (plugin->views); + while (node != NULL) { + view = ply_list_node_get_data (node); + ply_console_viewer_parse_lines (view->console_viewer, output, size); + node = ply_list_get_next_node (plugin->views, node); + } +} + ply_boot_splash_plugin_interface_t * ply_boot_splash_plugin_get_interface (void) { @@ -2115,6 +2294,8 @@ ply_boot_splash_plugin_get_interface (void) .display_question = display_question, .display_message = display_message, .system_update = system_update, + .on_boot_output = on_boot_output, + .validate_input = validate_input, }; return &plugin_interface;