Merge branch 'synchronize-display-updates' into 'main'

ply-boot-splash: Flush display updates at fixed framerate

See merge request plymouth/plymouth!263

3 files changed, 86 insertions, 31 deletions

diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
index 9084b1f4..12fb6c10 100644
--- a/src/libply-splash-core/ply-boot-splash.c
+++ b/src/libply-splash-core/ply-boot-splash.c
@@ -47,6 +47,10 @@
 #define UPDATES_PER_SECOND 30
 #endif
 
+#ifndef FRAMES_PER_SECOND
+#define FRAMES_PER_SECOND 60
+#endif
+
 struct _ply_boot_splash
 {
         ply_event_loop_t                         *loop;
@@ -70,6 +74,7 @@ struct _ply_boot_splash
         void                                     *idle_handler_user_data;
 
         uint32_t                                  is_loaded : 1;
+        uint32_t                                  is_shown : 1;
         uint32_t                                  should_force_text_mode : 1;
 };
 
@@ -136,6 +141,11 @@ ply_boot_splash_add_pixel_display (ply_boot_splash_t   *splash,
 
         ply_trace ("adding %lux%lu pixel display", width, height);
 
+        if (splash->is_shown) {
+                ply_trace ("Splash already shown, so pausing display until next frame update");
+                ply_pixel_display_pause_updates (display);
+        }
+
         splash->plugin_interface->add_pixel_display (splash->plugin, display);
         ply_list_append_data (splash->pixel_displays, display);
 }
@@ -456,6 +466,52 @@ ply_boot_splash_attach_progress (ply_boot_splash_t *splash,
         splash->progress = progress;
 }
 
+static void
+ply_boot_splash_pause_pixel_displays (ply_boot_splash_t *splash)
+{
+        ply_list_node_t *node;
+
+        ply_list_foreach (splash->pixel_displays, node) {
+                ply_pixel_display_t *display = ply_list_node_get_data (node);
+                ply_pixel_display_pause_updates (display);
+        }
+}
+
+static void
+ply_boot_splash_unpause_pixel_displays (ply_boot_splash_t *splash)
+{
+        ply_list_node_t *node;
+
+        ply_list_foreach (splash->pixel_displays, node) {
+                ply_pixel_display_t *display = ply_list_node_get_data (node);
+                ply_pixel_display_unpause_updates (display);
+        }
+}
+
+static void
+ply_boot_splash_flush_displays (ply_boot_splash_t *splash)
+{
+        if (!splash->is_shown)
+                return;
+
+        ply_boot_splash_unpause_pixel_displays (splash);
+        ply_boot_splash_pause_pixel_displays (splash);
+}
+
+static void
+on_new_frame (ply_boot_splash_t *splash)
+{
+        if (!splash->is_shown)
+                return;
+
+        ply_boot_splash_flush_displays (splash);
+
+        ply_event_loop_watch_for_timeout (splash->loop,
+                                          1.0 / FRAMES_PER_SECOND,
+                                          (ply_event_loop_timeout_handler_t)
+                                          on_new_frame,
+                                          splash);
+}
 
 bool
 ply_boot_splash_show (ply_boot_splash_t     *splash,
@@ -493,6 +549,25 @@ ply_boot_splash_show (ply_boot_splash_t     *splash,
                 return false;
         }
 
+        if (!splash->is_shown) {
+                size_t number_of_displays;
+                ply_trace ("(this is an initial showing)");
+                number_of_displays = ply_list_get_length (splash->pixel_displays);
+
+                if (number_of_displays > 0) {
+                        ply_trace ("Pausing %ld already added displays",
+                                   number_of_displays);
+                        ply_boot_splash_pause_pixel_displays (splash);
+                }
+
+                ply_event_loop_watch_for_timeout (splash->loop,
+                                                  1.0 / FRAMES_PER_SECOND,
+                                                  (ply_event_loop_timeout_handler_t)
+                                                  on_new_frame,
+                                                  splash);
+                splash->is_shown = true;
+        }
+
         if (splash->plugin_interface->on_boot_progress != NULL)
                 ply_boot_splash_update_progress (splash);
 
@@ -575,6 +650,15 @@ ply_boot_splash_hide (ply_boot_splash_t *splash)
         splash->mode = PLY_BOOT_SPLASH_MODE_INVALID;
 
         if (splash->loop != NULL) {
+                if (splash->is_shown) {
+                        ply_boot_splash_unpause_pixel_displays (splash);
+
+                        ply_event_loop_stop_watching_for_timeout (splash->loop,
+                                                                  (ply_event_loop_timeout_handler_t)
+                                                                  on_new_frame, splash);
+                        splash->is_shown = false;
+                }
+
                 if (splash->plugin_interface->on_boot_progress != NULL) {
                         ply_event_loop_stop_watching_for_timeout (splash->loop,
                                                                   (ply_event_loop_timeout_handler_t)
diff --git a/src/libply-splash-core/ply-pixel-display.c b/src/libply-splash-core/ply-pixel-display.c
index 6de4b1a0..62398038 100644
--- a/src/libply-splash-core/ply-pixel-display.c
+++ b/src/libply-splash-core/ply-pixel-display.c
@@ -41,10 +41,6 @@
 #include "ply-renderer.h"
 #include "ply-utils.h"
 
-#ifndef FRAMES_PER_SECOND
-#define FRAMES_PER_SECOND 60
-#endif
-
 struct _ply_pixel_display
 {
         ply_event_loop_t                *loop;
@@ -62,23 +58,6 @@ struct _ply_pixel_display
         int                              pause_count;
 };
 
-static void
-on_timeout (ply_pixel_display_t *display)
-{
-        double sleep_time;
-
-
-        sleep_time = 1.0 / FRAMES_PER_SECOND;
-
-        ply_pixel_display_unpause_updates (display);
-        ply_pixel_display_pause_updates (display);
-
-        ply_event_loop_watch_for_timeout (display->loop,
-                                          sleep_time,
-                                          (ply_event_loop_timeout_handler_t)
-                                          on_timeout, display);
-}
-
 ply_pixel_display_t *
 ply_pixel_display_new (ply_renderer_t      *renderer,
                        ply_renderer_head_t *head)
@@ -203,19 +182,9 @@ ply_pixel_display_set_draw_handler (ply_pixel_display_t             *display,
                                     ply_pixel_display_draw_handler_t draw_handler,
                                     void                            *user_data)
 {
-        double sleep_time;
-
         assert (display != NULL);
 
         display->draw_handler = draw_handler;
         display->draw_handler_user_data = user_data;
-
-        sleep_time = 1.0 / FRAMES_PER_SECOND;
-
-        ply_event_loop_watch_for_timeout (display->loop,
-                                          sleep_time,
-                                          (ply_event_loop_timeout_handler_t)
-                                          on_timeout, display);
-        ply_pixel_display_pause_updates (display);
 }
 
diff --git a/src/libply-splash-graphics/ply-console-viewer.c b/src/libply-splash-graphics/ply-console-viewer.c
index e423cc40..8e1ee628 100644
--- a/src/libply-splash-graphics/ply-console-viewer.c
+++ b/src/libply-splash-graphics/ply-console-viewer.c
@@ -158,6 +158,7 @@ update_console_messages (ply_console_viewer_t *console_viewer)
         if (number_of_messages < 0)
                 return;
 
+        ply_pixel_display_pause_updates (console_viewer->display);
         node = ply_list_get_first_node (console_viewer->message_labels);
         while (node != NULL) {
                 ply_rich_text_t *line = NULL;
@@ -210,6 +211,7 @@ update_console_messages (ply_console_viewer_t *console_viewer)
         ply_pixel_display_draw_area (console_viewer->display, 0, 0,
                                      ply_pixel_display_get_width (console_viewer->display),
                                      ply_pixel_display_get_height (console_viewer->display));
+        ply_pixel_display_unpause_updates (console_viewer->display);
 }
 
 void