3 files changed, 17 insertions, 68 deletions

diff --git a/src/splash-plugins/fedora-fade-in/Makefile.am b/src/splash-plugins/fedora-fade-in/Makefile.am
index 8d6b7d0..29ec948 100644
--- a/src/splash-plugins/fedora-fade-in/Makefile.am
+++ b/src/splash-plugins/fedora-fade-in/Makefile.am
@@ -11,6 +11,8 @@ fedora_fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/
 fedora_fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
 fedora_fade_in_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la
 fedora_fade_in_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h         \
+                            $(srcdir)/../../ply-window.h                     \
+                            $(srcdir)/../../ply-window.c                     \
                             $(srcdir)/fedora-fade-in.c
 
 plymouthdir = $(datadir)/plymouth
diff --git a/src/splash-plugins/fedora-fade-in/fedora-fade-in.c b/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
index 0d6b926..25c675e 100644
--- a/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
+++ b/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
@@ -45,7 +45,7 @@
 #include "ply-frame-buffer.h"
 #include "ply-image.h"
 #include "ply-utils.h"
-
+#include "ply-window.h"
 
 #include <linux/kd.h>
 
@@ -68,8 +68,8 @@ struct _ply_boot_splash_plugin
   ply_image_t *logo_image;
   ply_image_t *star_image;
   ply_list_t *stars;
+  ply_window_t *window;
 
-  int console_fd;
   double start_time;
   double now;
 };
@@ -81,7 +81,6 @@ create_plugin (void)
 
   srand ((int) ply_get_timestamp ());
   plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
-  plugin->console_fd = -1;
   plugin->start_time = 0.0;
 
   plugin->frame_buffer = ply_frame_buffer_new (NULL);
@@ -152,45 +151,6 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
   free (plugin);
 }
 
-static bool
-set_graphics_mode (ply_boot_splash_plugin_t *plugin)
-{
-  assert (plugin != NULL);
-
-  if (ioctl (plugin->console_fd, KDSETMODE, KD_GRAPHICS) < 0)
-    return false;
-
-  return true;
-}
-
-static void
-set_text_mode (ply_boot_splash_plugin_t *plugin)
-{
-  assert (plugin != NULL);
-
-  ioctl (plugin->console_fd, KDSETMODE, KD_TEXT);
-}
-
-static bool
-open_console (ply_boot_splash_plugin_t *plugin)
-{
-  assert (plugin != NULL);
-
-  plugin->console_fd = open ("/dev/tty0", O_RDWR);
-
-  if (plugin->console_fd < 0)
-    return false;
-
-  return true;
-}
-
-static void
-close_console (ply_boot_splash_plugin_t *plugin)
-{
-  close (plugin->console_fd);
-  plugin->console_fd = -1;
-}
-
 static void
 animate_at_time (ply_boot_splash_plugin_t *plugin,
                  double                    time)
@@ -265,7 +225,7 @@ on_timeout (ply_boot_splash_plugin_t *plugin)
 {
   double sleep_time;
 
-  set_graphics_mode (plugin);
+  ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_GRAPHICS);
   plugin->now = ply_get_timestamp ();
 
 
@@ -342,7 +302,7 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
   ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
                                     0.0, 0.0, 0.0, 1.0);
 
-  set_text_mode (plugin);
+  ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_TEXT);
 }
 
 static void
@@ -353,7 +313,8 @@ on_interrupt (ply_boot_splash_plugin_t *plugin)
 }
 
 bool
-show_splash_screen (ply_boot_splash_plugin_t *plugin)
+show_splash_screen (ply_boot_splash_plugin_t *plugin,
+                    ply_window_t             *window)
 {
   assert (plugin != NULL);
   assert (plugin->logo_image != NULL);
@@ -371,18 +332,10 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin)
   if (!ply_frame_buffer_open (plugin->frame_buffer))
     return false;
 
-  ply_trace ("opening console");
-  if (!open_console (plugin))
-    return false;
+  plugin->window = window;
 
-  ply_trace ("settings graphics mode");
-  if (!set_graphics_mode (plugin))
-    {
-      ply_save_errno ();
-      close_console (plugin);
-      ply_restore_errno ();
-      return false;
-    }
+  if (!ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_GRAPHICS))
+    return false;
 
   ply_event_loop_watch_signal (plugin->loop,
                                SIGINT,
@@ -478,11 +431,12 @@ detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
   plugin->loop = NULL;
 
-  set_text_mode (plugin);
+  ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_TEXT);
 }
 
 void
-hide_splash_screen (ply_boot_splash_plugin_t *plugin)
+hide_splash_screen (ply_boot_splash_plugin_t *plugin,
+                    ply_window_t             *window)
 {
   assert (plugin != NULL);
 
diff --git a/src/splash-plugins/text/text.c b/src/splash-plugins/text/text.c
index d2f9b99..014885a 100644
--- a/src/splash-plugins/text/text.c
+++ b/src/splash-plugins/text/text.c
@@ -46,7 +46,7 @@
 #include "ply-frame-buffer.h"
 #include "ply-image.h"
 #include "ply-utils.h"
-
+#include "ply-window.h"
 
 #include <linux/kd.h>
 
@@ -94,16 +94,9 @@ open_console (ply_boot_splash_plugin_t *plugin)
   return true;
 }
 
-static void
-close_console (ply_boot_splash_plugin_t *plugin)
-{
-  ply_trace ("closing console");
-  close (plugin->console_fd);
-  plugin->console_fd = -1;
-}
-
 bool
-show_splash_screen (ply_boot_splash_plugin_t *plugin)
+show_splash_screen (ply_boot_splash_plugin_t *plugin,
+                    ply_window_t             *window)
 {
   assert (plugin != NULL);