From: Ray Strode <rstrode@redhat.com>
Date: Wed, 15 Oct 2008 18:11:24 +0000 (-0400)
Subject: Don't frob text cursor in window for all plugins
X-Git-Tag: 0.6.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3498084a4e0777851b34cb9eaaea3d9e2a33924a;p=thirdparty%2Fplymouth.git

Don't frob text cursor in window for all plugins

Instead only set it to 0,0 for text plugin and
clear screen for others (except details where we
don't do anything).
---

diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c
index 2c25b2d9..b44292d3 100644
--- a/src/libplybootsplash/ply-window.c
+++ b/src/libplybootsplash/ply-window.c
@@ -493,9 +493,6 @@ ply_window_open (ply_window_t *window)
   ply_window_look_up_color_palette (window);
   ply_window_save_color_palette (window);
 
-  ply_window_hide_text_cursor (window);
-  ply_window_set_text_cursor_position (window, 0, 0);
-
   ply_event_loop_watch_signal (window->loop,
                                SIGWINCH,
                                (ply_event_handler_t)
diff --git a/src/plugins/splash/fade-in/plugin.c b/src/plugins/splash/fade-in/plugin.c
index 3dda09f8..b0003cfb 100644
--- a/src/plugins/splash/fade-in/plugin.c
+++ b/src/plugins/splash/fade-in/plugin.c
@@ -505,7 +505,10 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                SIGINT,
                                (ply_event_handler_t) 
                                on_interrupt, plugin);
-  
+
+  ply_window_clear_screen (plugin->window);
+  ply_window_hide_text_cursor (plugin->window);
+
   ply_trace ("starting boot animation");
   start_animation (plugin);
 
diff --git a/src/plugins/splash/solar/plugin.c b/src/plugins/splash/solar/plugin.c
index 9dd0522f..3c589ff8 100644
--- a/src/plugins/splash/solar/plugin.c
+++ b/src/plugins/splash/solar/plugin.c
@@ -1186,6 +1186,9 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                (ply_event_handler_t) 
                                on_interrupt, plugin);
 
+  ply_window_clear_screen (plugin->window);
+  ply_window_hide_text_cursor (plugin->window);
+
   ply_trace ("starting boot animation");
 
   start_animation (plugin);
diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
index 79b1eda1..a55196f8 100644
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/spinfinity/plugin.c
@@ -405,7 +405,10 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                SIGINT,
                                (ply_event_handler_t) 
                                on_interrupt, plugin);
-  
+
+  ply_window_clear_screen (plugin->window);
+  ply_window_hide_text_cursor (plugin->window);
+
   ply_trace ("starting boot animation");
   start_animation (plugin);
 
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index c65224b5..5e93da1e 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -248,6 +248,9 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                 (ply_window_erase_handler_t)
                                 on_erase, plugin);
 
+  ply_window_hide_text_cursor (plugin->window);
+  ply_window_set_text_cursor_position (plugin->window, 0, 0);
+
   plugin->loop = loop;
   ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
                                  detach_from_event_loop,