]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: Show details when ESC is pressed during splash_delay
authorHans de Goede <hdegoede@redhat.com>
Tue, 3 Jul 2018 06:44:33 +0000 (08:44 +0200)
committerRay Strode <rstrode@redhat.com>
Tue, 10 Jul 2018 19:34:28 +0000 (15:34 -0400)
Start listening for keypresses on the first show_splash() call, so that
pressing ESC while we're delaying show the non-details splash will show
the details splash.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
src/main.c

index ed239686676edf3048dd9637644f4660f8898054..d7f192f2ed53d10ffdbedab98fe29fc8cd74f2a8 100644 (file)
@@ -361,6 +361,8 @@ show_detailed_splash (state_t *state)
 {
         ply_boot_splash_t *splash;
 
+        cancel_pending_delayed_show (state);
+
         if (state->boot_splash != NULL)
                 return;
 
@@ -1001,6 +1003,8 @@ show_splash (state_t *state)
                                                           (ply_event_loop_timeout_handler_t)
                                                           show_splash,
                                                           state);
+                        /* Listen for ESC to show details */
+                        ply_device_manager_activate_keyboards (state->device_manager);
                         return;
                 }
         }