[libplybootsplash] Drop window class

It's been obsoleted by the display, keyboard, console and terminal
classes.

5 files changed, 1 insertions, 1333 deletions

diff --git a/src/libplybootsplash/Makefile.am b/src/libplybootsplash/Makefile.am
index 19479e21..d2638055 100644
--- a/src/libplybootsplash/Makefile.am
+++ b/src/libplybootsplash/Makefile.am
@@ -25,8 +25,7 @@ libplybootsplash_HEADERS = \
 		    ply-terminal.h                                            \
 		    ply-text-display.h                                        \
 		    ply-text-progress-bar.h                                   \
-		    ply-throbber.h                                            \
-		    ply-window.h
+		    ply-throbber.h
 
 libplybootsplash_la_CFLAGS = $(PLYMOUTH_CFLAGS)                               \
 			     $(IMAGE_CFLAGS)                                  \
@@ -55,7 +54,6 @@ libplybootsplash_la_SOURCES = \
 		    ply-terminal.c                                           \
 		    ply-pixel-buffer.c                                       \
 		    ply-renderer.c                                           \
-		    ply-window.c                                             \
 		    ply-boot-splash.c
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c
deleted file mode 100644
index 27328930..00000000
--- a/src/libplybootsplash/ply-window.c
+++ /dev/null
@@ -1,1156 +0,0 @@
-/* ply-window.h - APIs for putting up a window screen
- *
- * Copyright (C) 2007 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by: Ray Strode <rstrode@redhat.com>
- */
-#include "config.h"
-#include "ply-window.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-
-#include <linux/kd.h>
-#include <linux/vt.h>
-
-#include "ply-buffer.h"
-#include "ply-event-loop.h"
-#include "ply-frame-buffer.h"
-#include "ply-list.h"
-#include "ply-logger.h"
-#include "ply-utils.h"
-
-#define KEY_CTRL_L ('\100' ^'L')
-#define KEY_CTRL_P ('\100' ^'P')
-#define KEY_CTRL_T ('\100' ^'T')
-#define KEY_CTRL_U ('\100' ^'U')
-#define KEY_CTRL_W ('\100' ^'W')
-#define KEY_CTRL_V ('\100' ^'V')
-#define KEY_ESCAPE ('\100' ^'[')
-#define KEY_RETURN '\r'
-#define KEY_BACKSPACE '\177'
-
-#ifndef CLEAR_SCREEN_SEQUENCE
-#define CLEAR_SCREEN_SEQUENCE "\033[2J"
-#endif
-
-#ifndef CLEAR_LINE_SEQUENCE
-#define CLEAR_LINE_SEQUENCE "\033[2K\r\n"
-#endif
-
-#ifndef BACKSPACE
-#define BACKSPACE "\b\033[0K"
-#endif
-
-#ifndef MOVE_CURSOR_SEQUENCE
-#define MOVE_CURSOR_SEQUENCE "\033[%d;%df"
-#endif
-
-#ifndef HIDE_CURSOR_SEQUENCE
-#define HIDE_CURSOR_SEQUENCE "\033[?25l"
-#endif
-
-#ifndef SHOW_CURSOR_SEQUENCE
-#define SHOW_CURSOR_SEQUENCE "\033[?25h"
-#endif
-
-#ifndef COLOR_SEQUENCE_FORMAT
-#define COLOR_SEQUENCE_FORMAT "\033[%dm"
-#endif
-
-#ifndef FOREGROUND_COLOR_BASE
-#define FOREGROUND_COLOR_BASE 30
-#endif
-
-#ifndef BACKGROUND_COLOR_BASE
-#define BACKGROUND_COLOR_BASE 40
-#endif
-
-#ifndef TEXT_PALETTE_SIZE
-#define TEXT_PALETTE_SIZE 48
-#endif
-
-typedef void (* ply_window_handler_t) (void *);
-
-typedef struct
-{
-  ply_window_handler_t *function;
-  void *user_data;
-} ply_window_closure_t;
-
-struct _ply_window
-{
-  ply_event_loop_t *loop;
-  ply_buffer_t     *keyboard_input_buffer;
-  ply_buffer_t     *line_buffer;
-
-  struct termios    original_term_attributes;
-
-  ply_frame_buffer_t *frame_buffer;
-
-  char *tty_name;
-  int   tty_fd;
-  int   vt_number;
-
-  ply_fd_watch_t *tty_fd_watch;
-  ply_window_mode_t mode;
-  ply_window_color_t foreground_color;
-  ply_window_color_t background_color;
-
-  uint8_t original_color_palette[TEXT_PALETTE_SIZE];
-  uint8_t color_palette[TEXT_PALETTE_SIZE];
-
-  int number_of_text_rows;
-  int number_of_text_columns;
-
-  uint32_t should_force_text_mode : 1;
-  uint32_t original_term_attributes_saved : 1;
-  uint32_t supports_text_color : 1;
-  uint32_t is_open : 1;
-
-  ply_list_t *keyboard_input_handler_list;
-  ply_list_t *backspace_handler_list;
-  ply_list_t *escape_handler_list;
-  ply_list_t *enter_handler_list;
-
-  ply_window_draw_handler_t draw_handler;
-  void *draw_handler_user_data;
-
-  ply_window_erase_handler_t erase_handler;
-  void *erase_handler_user_data;
-};
-
-static bool ply_window_open_tty (ply_window_t *window);
-
-ply_window_t *
-ply_window_new (const char *tty_name)
-{
-  ply_window_t *window;
-
-  window = calloc (1, sizeof (ply_window_t));
-  window->keyboard_input_buffer = ply_buffer_new ();
-  window->line_buffer = ply_buffer_new ();
-  window->frame_buffer = ply_frame_buffer_new (NULL);
-  window->keyboard_input_handler_list = ply_list_new();
-  window->backspace_handler_list = ply_list_new();
-  window->escape_handler_list = ply_list_new();
-  window->enter_handler_list = ply_list_new();
-  
-  window->loop = NULL;
-  if (tty_name != NULL)
-    {
-      if (strncmp (tty_name, "/dev/", strlen ("/dev/")) == 0)
-        window->tty_name = strdup (tty_name);
-      else
-        asprintf (&window->tty_name, "/dev/%s", tty_name);
-    }
-  window->tty_fd = -1;
-
-  return window;
-}
-
-static void
-ply_window_look_up_color_palette (ply_window_t *window)
-{
-  if (ioctl (window->tty_fd, GIO_CMAP, window->color_palette) < 0)
-    window->supports_text_color = false;
-  else
-    window->supports_text_color = true;
-}
-
-static bool
-ply_window_change_color_palette (ply_window_t *window)
-{
-  if (!window->supports_text_color)
-    return true;
-
-  if (ioctl (window->tty_fd, PIO_CMAP, window->color_palette) < 0)
-    return false;
-
-  return true;
-}
-
-static void
-ply_window_save_color_palette (ply_window_t *window)
-{
-  if (!window->supports_text_color)
-    return;
-
-  memcpy (window->original_color_palette, window->color_palette,
-          TEXT_PALETTE_SIZE);
-}
-
-static void
-ply_window_restore_color_palette (ply_window_t *window)
-{
-  if (!window->supports_text_color)
-    return;
-
-  memcpy (window->color_palette, window->original_color_palette,
-          TEXT_PALETTE_SIZE);
-
-  ply_window_change_color_palette (window);
-}
-
-void
-ply_window_reset_colors (ply_window_t *window)
-{
-  assert (window != NULL);
-
-  ply_window_restore_color_palette (window);
-}
-
-static void
-process_backspace (ply_window_t *window)
-{
-  size_t bytes_to_remove;
-  ssize_t previous_character_size;
-  const char *bytes;
-  size_t size;
-  ply_list_node_t *node;
-
-  bytes = ply_buffer_get_bytes (window->line_buffer);
-  size = ply_buffer_get_size (window->line_buffer);
-
-  bytes_to_remove = MIN(size, PLY_UTF8_CHARACTER_SIZE_MAX);
-  while ((previous_character_size = ply_utf8_character_get_size (bytes + size - bytes_to_remove, bytes_to_remove)) < (ssize_t) bytes_to_remove)
-    {
-      if (previous_character_size > 0)
-        bytes_to_remove -= previous_character_size;
-      else
-        bytes_to_remove--;
-    }
-
-  if (bytes_to_remove <= size)
-    {
-      ply_buffer_remove_bytes_at_end (window->line_buffer, bytes_to_remove);
-    }
-
-  for (node = ply_list_get_first_node(window->backspace_handler_list);
-       node; node = ply_list_get_next_node(window->backspace_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      ply_window_backspace_handler_t backspace_handler = 
-                            (ply_window_backspace_handler_t) closure->function;
-      backspace_handler (closure->user_data);
-    }
-}
-
-static void
-process_line_erase (ply_window_t *window)
-{
-  size_t size;
-
-  while ((size = ply_buffer_get_size (window->line_buffer)) > 0)
-    process_backspace (window);
-}
-
-static void
-process_keyboard_input (ply_window_t *window,
-                        const char   *keyboard_input,
-                        size_t        character_size)
-{
-  wchar_t key;
-  ply_list_node_t *node;
-
-  if ((ssize_t) mbrtowc (&key, keyboard_input, character_size, NULL) > 0)
-    {
-      switch (key)
-        {
-
-          case KEY_CTRL_L:
-            if (ply_frame_buffer_device_is_open (window->frame_buffer))
-              {
-                  ply_frame_buffer_area_t area;
-
-                  ply_trace ("redrawing screen");
-
-                  ply_frame_buffer_get_size (window->frame_buffer, &area);
-                  ply_window_draw_area (window, area.x, area.y,
-                                        area.width, area.height);
-              }
-          return;
-
-          case KEY_CTRL_P:
-            ply_trace ("restore text palette to original value!");
-            ply_window_restore_color_palette (window);
-          return;
-
-          case KEY_CTRL_T:
-            ply_trace ("toggle text mode!");
-            window->should_force_text_mode = !window->should_force_text_mode;
-            ply_window_set_mode (window, window->mode);
-            ply_trace ("text mode toggled!");
-          return;
-
-          case KEY_CTRL_U:
-          case KEY_CTRL_W:
-            ply_trace ("erase line!");
-            process_line_erase (window);
-          return;
-
-          case KEY_CTRL_V:
-            ply_trace ("toggle verbose mode!");
-            ply_toggle_tracing ();
-            ply_trace ("verbose mode toggled!");
-          return;
-
-          case KEY_ESCAPE:
-            ply_trace ("escape key!");
-            for (node = ply_list_get_first_node(window->escape_handler_list);
-                 node; node = ply_list_get_next_node(window->escape_handler_list, node))
-              {
-                ply_window_closure_t *closure = ply_list_node_get_data (node);
-                ply_window_escape_handler_t escape_handler = (ply_window_escape_handler_t) closure->function;
-                escape_handler (closure->user_data);
-              }
-            
-            ply_trace ("end escape key handler");
-          return;
-
-          case KEY_BACKSPACE:
-            ply_trace ("backspace key!");
-            process_backspace (window);
-          return;
-
-          case KEY_RETURN:
-            ply_trace ("return key!");
-
-            for (node = ply_list_get_first_node(window->enter_handler_list);
-                 node; node = ply_list_get_next_node(window->enter_handler_list, node))
-              {
-                ply_window_closure_t *closure = ply_list_node_get_data (node);
-                ply_window_enter_handler_t enter_handler = (ply_window_enter_handler_t)  closure->function;
-                enter_handler (closure->user_data, ply_buffer_get_bytes (window->line_buffer));
-              }
-            ply_buffer_clear (window->line_buffer);
-          return;
-
-          default:
-            ply_buffer_append_bytes (window->line_buffer,
-                                     keyboard_input, character_size);
-          break;
-        }
-    }
-  for (node = ply_list_get_first_node(window->keyboard_input_handler_list);
-       node; node = ply_list_get_next_node(window->keyboard_input_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      ply_window_keyboard_input_handler_t keyboard_input_handler =
-                        (ply_window_keyboard_input_handler_t) closure->function;
-      
-      keyboard_input_handler (closure->user_data,
-                              keyboard_input, character_size);
-    }
-}
-
-static void
-check_buffer_for_key_events (ply_window_t *window)
-{
-  const char *bytes;
-  size_t size, i;
-
-  bytes = ply_buffer_get_bytes (window->keyboard_input_buffer);
-  size = ply_buffer_get_size (window->keyboard_input_buffer);
-
-  i = 0;
-  while (i < size)
-    {
-      ssize_t character_size;
-      char *keyboard_input;
-
-      character_size = (ssize_t) ply_utf8_character_get_size (bytes + i, size - i);
-
-      if (character_size < 0)
-        break;
-
-      /* If we're at a NUL character walk through it
-       */
-      if (character_size == 0)
-        {
-          i++;
-          continue;
-        }
-
-      keyboard_input = strndup (bytes + i, character_size);
-
-      process_keyboard_input (window, keyboard_input, character_size);
-
-      free (keyboard_input);
-
-      i += character_size;
-    }
-
-  if (i > 0)
-    ply_buffer_remove_bytes (window->keyboard_input_buffer, i);
-}
-
-static void
-on_key_event (ply_window_t *window)
-{
-  ply_buffer_append_from_fd (window->keyboard_input_buffer, window->tty_fd);
-
-  check_buffer_for_key_events (window);
-}
-
-static void
-on_tty_disconnected (ply_window_t *window)
-{
-  ply_trace ("tty disconnected (fd %d)", window->tty_fd);
-  window->tty_fd_watch = NULL;
-  window->tty_fd = -1;
-
-  if (window->tty_name != NULL)
-    {
-      ply_trace ("trying to reopen window '%s'", window->tty_name);
-      ply_window_open_tty (window);
-    }
-}
-
-static bool
-ply_window_set_unbuffered_input (ply_window_t *window)
-{
-  struct termios term_attributes;
-
-  tcgetattr (window->tty_fd, &term_attributes);
-
-  if (!window->original_term_attributes_saved)
-    {
-      window->original_term_attributes = term_attributes;
-      window->original_term_attributes_saved = true;
-    }
-
-  cfmakeraw (&term_attributes);
-
-  /* Make \n return go to the beginning of the next line */
-  term_attributes.c_oflag |= ONLCR;
-
-  if (tcsetattr (window->tty_fd, TCSAFLUSH, &term_attributes) != 0)
-    return false;
-
-  return true;
-}
-
-static bool
-ply_window_set_buffered_input (ply_window_t *window)
-{
-  struct termios term_attributes;
-
-  tcgetattr (window->tty_fd, &term_attributes);
-
-  /* If someone already messed with the terminal settings,
-   * and they seem good enough, bail
-   */
-  if (term_attributes.c_lflag & ICANON)
-    return true;
-
-  /* If we don't know the original term attributes, or they were originally sucky,
-   * then invent some that are probably good enough.
-   */
-  if (!window->original_term_attributes_saved || !(window->original_term_attributes.c_lflag & ICANON))
-    {
-      term_attributes.c_iflag |= IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON;
-      term_attributes.c_oflag |= OPOST;
-      term_attributes.c_lflag |= ECHO | ECHONL | ICANON | ISIG | IEXTEN;
-
-      if (tcsetattr (window->tty_fd, TCSAFLUSH, &term_attributes) != 0)
-        return false;
-
-      return true;
-    }
-
-  if (tcsetattr (window->tty_fd, TCSAFLUSH, &window->original_term_attributes) != 0)
-    return false;
-
-  return true;
-}
-
-static int
-get_active_vt (void)
-{
-  int console_fd;
-  struct vt_stat console_state = { 0 };
-
-  console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
-
-  if (console_fd < 0)
-    goto out;
-
-  if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0)
-    goto out;
-
-out:
-  if (console_fd >= 0)
-    close (console_fd);
-
-  return console_state.v_active;
-}
-
-static bool
-ply_window_look_up_geometry (ply_window_t *window)
-{
-    struct winsize window_size;
-
-    ply_trace ("looking up window text geometry");
-
-    if (ioctl (window->tty_fd, TIOCGWINSZ, &window_size) < 0)
-      {
-        ply_trace ("could not read window text geometry: %m");
-        window->number_of_text_columns = 80;
-        window->number_of_text_rows = 24;
-        return false;
-      }
-
-    window->number_of_text_rows = window_size.ws_row;
-    window->number_of_text_columns = window_size.ws_col;
-
-    ply_trace ("window is now %dx%d text cells",
-               window->number_of_text_columns,
-               window->number_of_text_rows);
-
-    return true;
-}
-
-static bool
-ply_window_open_tty (ply_window_t *window)
-{
-  assert (window != NULL);
-  assert (window->tty_name != NULL);
-  assert (window->tty_fd < 0);
-  assert (window->tty_fd_watch == NULL);
-
-  window->tty_fd = open (window->tty_name, O_RDWR | O_NOCTTY);
-
-  if (window->tty_fd < 0)
-    return false;
-
-  if (window->loop != NULL)
-    window->tty_fd_watch = ply_event_loop_watch_fd (window->loop, window->tty_fd,
-                                                    PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
-                                                    (ply_event_handler_t) on_key_event,
-                                                    (ply_event_handler_t) on_tty_disconnected,
-                                                    window);
-
-  return true;
-}
-
-bool
-ply_window_open (ply_window_t *window)
-{
-  assert (window != NULL);
-
-  if (window->tty_name == NULL)
-    {
-      char tty_name[512] = "";
-
-      window->vt_number = get_active_vt ();
-
-      if (readlink ("/proc/self/fd/0", tty_name, sizeof (tty_name) - 1) < 0)
-        {
-          ply_trace ("could not read tty name of fd 0");
-          return false;
-        }
-
-      window->tty_name = strdup (tty_name);
-    }
-
-  ply_trace ("trying to open window '%s'", window->tty_name);
-
-  if (!ply_window_open_tty (window))
-    {
-      ply_trace ("could not open %s : %m", window->tty_name);
-      return false;
-    }
-
-  if (!ply_window_set_unbuffered_input (window))
-    ply_trace ("window '%s' will be line buffered", window->tty_name);
-
-  ply_window_set_mode (window, PLY_WINDOW_MODE_TEXT);
-
-  ply_window_look_up_geometry (window);
-
-  ply_window_look_up_color_palette (window);
-  ply_window_save_color_palette (window);
-
-  ply_event_loop_watch_signal (window->loop,
-                               SIGWINCH,
-                               (ply_event_handler_t)
-                               ply_window_look_up_geometry,
-                               window);
-
-  /* We try to open the frame buffer, but it may fail. splash plugins can check
-   * to see if it's open and react accordingly
-   */
-  ply_frame_buffer_open (window->frame_buffer);
-
-  window->is_open = true;
-
-  return true;
-}
-
-bool
-ply_window_is_open (ply_window_t *window)
-{
-  return window->is_open;
-}
-
-void
-ply_window_close (ply_window_t *window)
-{
-  window->is_open = false;
-
-  ply_trace ("restoring color palette");
-  ply_window_restore_color_palette (window);
-
-  if (ply_frame_buffer_device_is_open (window->frame_buffer))
-    {
-      ply_trace ("closing frame buffer");
-      ply_frame_buffer_close (window->frame_buffer);
-    }
-
-  if (window->tty_fd_watch != NULL)
-    {
-      ply_trace ("stop watching tty fd");
-      ply_event_loop_stop_watching_fd (window->loop, window->tty_fd_watch);
-      window->tty_fd_watch = NULL;
-    }
-
-  if (window->loop != NULL)
-    {
-      ply_trace ("stop watching SIGWINCH signal");
-      ply_event_loop_stop_watching_signal (window->loop, SIGWINCH);
-    }
-
-  ply_trace ("setting buffered input");
-  ply_window_set_buffered_input (window);
-
-  close (window->tty_fd);
-  window->tty_fd = -1;
-}
-
-bool
-ply_window_set_mode (ply_window_t      *window,
-                     ply_window_mode_t  mode)
-{
-  assert (window != NULL);
-  assert (mode == PLY_WINDOW_MODE_TEXT || mode == PLY_WINDOW_MODE_GRAPHICS);
-
-  switch (mode)
-    {
-      case PLY_WINDOW_MODE_TEXT:
-        if (ioctl (window->tty_fd, KDSETMODE, KD_TEXT) < 0)
-          return false;
-        break;
-
-      case PLY_WINDOW_MODE_GRAPHICS:
-        if (!ply_frame_buffer_device_is_open (window->frame_buffer)
-            && !ply_frame_buffer_open (window->frame_buffer))
-          return false;
-
-        if (ioctl (window->tty_fd, KDSETMODE,
-                   window->should_force_text_mode? KD_TEXT : KD_GRAPHICS) < 0)
-          return false;
-        break;
-    }
-  ply_window_set_unbuffered_input (window);
-
-  window->mode = mode;
-  return true;
-}
-
-int
-ply_window_get_tty_fd (ply_window_t *window)
-{
-  return window->tty_fd;
-}
-
-int
-ply_window_get_number_of_text_rows (ply_window_t *window)
-{
-  return window->number_of_text_rows;
-}
-
-int
-ply_window_get_number_of_text_columns (ply_window_t *window)
-{
-  return window->number_of_text_columns;
-}
-
-void
-ply_window_set_text_cursor_position (ply_window_t *window,
-                                     int           column,
-                                     int           row)
-{
-  char *sequence;
-  column = MAX(column, 0);
-  row = MAX(row, 0);
-  sequence = NULL;
-  asprintf (&sequence, MOVE_CURSOR_SEQUENCE, row, column);
-  write (window->tty_fd, sequence, strlen (sequence));
-  free (sequence);
-}
-
-void
-ply_window_clear_screen (ply_window_t *window)
-{
-  if (ply_is_tracing ())
-    return;
-
-  if (ply_frame_buffer_device_is_open (window->frame_buffer))
-    ply_frame_buffer_fill_with_color (window->frame_buffer, NULL, 0.0, 0.0, 0.0, 1.0);
-
-  write (window->tty_fd, CLEAR_SCREEN_SEQUENCE, strlen (CLEAR_SCREEN_SEQUENCE));
-
-  ply_window_set_text_cursor_position (window, 0, 0);
-}
-
-void
-ply_window_clear_text_line (ply_window_t *window)
-{
-  write (window->tty_fd, CLEAR_LINE_SEQUENCE, strlen (CLEAR_LINE_SEQUENCE));
-}
-
-void
-ply_window_clear_text_character (ply_window_t *window)
-{
-  write (window->tty_fd, BACKSPACE, strlen (BACKSPACE));
-}
-
-void
-ply_window_set_background_color (ply_window_t       *window,
-                                 ply_window_color_t  color)
-{
-  char *sequence;
-
-  sequence = NULL;
-  asprintf (&sequence, COLOR_SEQUENCE_FORMAT,
-            BACKGROUND_COLOR_BASE + color);
-  write (window->tty_fd, sequence, strlen (sequence));
-  free (sequence);
-
-  window->background_color = color;
-}
-
-void
-ply_window_set_foreground_color (ply_window_t       *window,
-                                 ply_window_color_t  color)
-{
-  char *sequence;
-
-  sequence = NULL;
-  asprintf (&sequence, COLOR_SEQUENCE_FORMAT,
-            FOREGROUND_COLOR_BASE + color);
-  write (window->tty_fd, sequence, strlen (sequence));
-  free (sequence);
-
-  window->foreground_color = color;
-}
-
-ply_window_color_t
-ply_window_get_background_color (ply_window_t *window)
-{
-  return window->background_color;
-}
-
-ply_window_color_t
-ply_window_get_foreground_color (ply_window_t *window)
-{
-  return window->foreground_color;
-}
-
-void
-ply_window_draw_area (ply_window_t *window,
-                      int           x,
-                      int           y,
-                      int           width,
-                      int           height)
-{
-  if (window->draw_handler != NULL)
-    window->draw_handler (window->draw_handler_user_data,
-                          x, y, width, height);
-}
-
-void
-ply_window_erase_area (ply_window_t *window,
-                       int           x,
-                       int           y,
-                       int           width,
-                       int           height)
-{
-  if (window->erase_handler != NULL)
-    window->erase_handler (window->erase_handler_user_data,
-                           x, y, width, height);
-}
-
-uint32_t
-ply_window_get_color_hex_value (ply_window_t       *window,
-                                ply_window_color_t  color)
-{
-  uint8_t red, green, blue;
-  uint32_t hex_value;
-
-  assert (window != NULL);
-  assert (color <= PLY_WINDOW_COLOR_WHITE);
-
-  red = (uint8_t) *(window->color_palette + 3 * color);
-  green = (uint8_t) *(window->color_palette + 3 * color + 1);
-  blue = (uint8_t) *(window->color_palette + 3 * color + 2);
-
-  hex_value = red << 16 | green << 8 | blue;
-
-  return hex_value;
-}
-
-void
-ply_window_set_color_hex_value (ply_window_t       *window,
-                                ply_window_color_t  color,
-                                uint32_t            hex_value)
-{
-  uint8_t red, green, blue;
-
-  assert (window != NULL);
-  assert (color <= PLY_WINDOW_COLOR_WHITE);
-
-  red = (uint8_t) ((hex_value >> 16) & 0xff);
-  green = (uint8_t) ((hex_value >> 8) & 0xff);
-  blue = (uint8_t) (hex_value & 0xff);
-
-  *(window->color_palette + 3 * color) = red;
-  *(window->color_palette + 3 * color + 1) = green;
-  *(window->color_palette + 3 * color + 2) = blue;
-
-  ply_window_change_color_palette (window);
-}
-
-void
-ply_window_hide_text_cursor (ply_window_t *window)
-{
-  write (window->tty_fd, HIDE_CURSOR_SEQUENCE, strlen (HIDE_CURSOR_SEQUENCE));
-}
-
-void
-ply_window_show_text_cursor (ply_window_t *window)
-{
-  write (window->tty_fd, SHOW_CURSOR_SEQUENCE, strlen (SHOW_CURSOR_SEQUENCE));
-}
-
-bool
-ply_window_supports_text_color (ply_window_t *window)
-{
-  return window->supports_text_color;
-}
-
-static void
-ply_window_detach_from_event_loop (ply_window_t *window)
-{
-  assert (window != NULL);
-  window->loop = NULL;
-  window->tty_fd_watch = NULL;
-}
-
-void
-ply_window_free (ply_window_t *window)
-{
-  if (window == NULL)
-    return;
-  free(window->tty_name);
-
-  if (window->loop != NULL)
-    ply_event_loop_stop_watching_for_exit (window->loop,
-                                           (ply_event_loop_exit_handler_t)
-                                           ply_window_detach_from_event_loop,
-                                           window);
-
-  ply_window_close (window);
-
-  ply_buffer_free (window->keyboard_input_buffer);
-  ply_buffer_free (window->line_buffer);
-
-  ply_frame_buffer_free (window->frame_buffer);
-
-  free (window);
-}
-
-static ply_window_closure_t *
-ply_window_closure_new(void* function, void* user_data)
-{
-  ply_window_closure_t *closure = calloc (1, sizeof (ply_window_closure_t));
-  closure->function = function;
-  closure->user_data = user_data;
-  return closure;
-}
-
-
-static void
-ply_window_closure_free(ply_window_closure_t* closure)
-{
-  free(closure);
-}
-
-void
-ply_window_add_keyboard_input_handler (ply_window_t *window,
-                                       ply_window_keyboard_input_handler_t input_handler,
-                                       void       *user_data)
-{
-  assert (window != NULL);
-  ply_window_closure_t *closure = ply_window_closure_new(input_handler, user_data);
-  ply_list_append_data (window->keyboard_input_handler_list, closure);
-}
-
-
-void
-ply_window_remove_keyboard_input_handler (ply_window_t *window,
-                                       ply_window_keyboard_input_handler_t input_handler)
-{
-  ply_list_node_t *node;
-  assert (window != NULL);
-  for (node = ply_list_get_first_node(window->keyboard_input_handler_list);
-       node; node = ply_list_get_next_node(window->keyboard_input_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      if ((ply_window_keyboard_input_handler_t) closure->function == input_handler)
-        {
-          ply_window_closure_free(closure);
-          ply_list_remove_node (window->keyboard_input_handler_list, node);
-          return;
-        }
-    }
-}
-
-void
-ply_window_add_backspace_handler (ply_window_t *window,
-                                  ply_window_backspace_handler_t backspace_handler,
-                                  void         *user_data)
-{
-  assert (window != NULL);
-  ply_window_closure_t *closure = ply_window_closure_new(backspace_handler, user_data);
-  ply_list_append_data (window->backspace_handler_list, closure);
-}
-
-
-void
-ply_window_remove_backspace_handler (ply_window_t *window,
-                                  ply_window_backspace_handler_t backspace_handler)
-{
-  ply_list_node_t *node;
-  assert (window != NULL);
-  for (node = ply_list_get_first_node(window->backspace_handler_list);
-       node; node = ply_list_get_next_node(window->backspace_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      if ((ply_window_backspace_handler_t) closure->function == backspace_handler)
-        {
-          ply_window_closure_free(closure);
-          ply_list_remove_node (window->backspace_handler_list, node);
-          return;
-        }
-    }
-}
-
-void
-ply_window_add_escape_handler (ply_window_t *window,
-                               ply_window_escape_handler_t escape_handler,
-                               void       *user_data)
-{
-  assert (window != NULL);
-  ply_window_closure_t *closure = ply_window_closure_new(escape_handler, user_data);
-  ply_list_append_data (window->escape_handler_list, closure);
-}
-
-
-void
-ply_window_remove_escape_handler (ply_window_t *window,
-                               ply_window_escape_handler_t escape_handler)
-{
-  assert (window != NULL);
-  ply_list_node_t *node;
-  assert (window != NULL);
-  for (node = ply_list_get_first_node(window->escape_handler_list);
-       node; node = ply_list_get_next_node(window->escape_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      if ((ply_window_escape_handler_t) closure->function == escape_handler)
-        {
-          ply_window_closure_free(closure);
-          ply_list_remove_node (window->escape_handler_list, node);
-          return;
-        }
-    }
-}
-
-void
-ply_window_add_enter_handler (ply_window_t *window,
-                              ply_window_enter_handler_t enter_handler,
-                              void         *user_data)
-{
-  assert (window != NULL);
-  ply_window_closure_t *closure = ply_window_closure_new(enter_handler, user_data);
-  ply_list_append_data (window->enter_handler_list, closure);
-}
-
-
-void
-ply_window_remove_enter_handler (ply_window_t *window,
-                              ply_window_enter_handler_t enter_handler)
-{
-  assert (window != NULL);
-  ply_list_node_t *node;
-  assert (window != NULL);
-  for (node = ply_list_get_first_node(window->enter_handler_list);
-       node; node = ply_list_get_next_node(window->enter_handler_list, node))
-    {
-      ply_window_closure_t *closure = ply_list_node_get_data (node);
-      if ((ply_window_enter_handler_t) closure->function == enter_handler)
-        {
-          ply_window_closure_free(closure);
-          ply_list_remove_node (window->enter_handler_list, node);
-          return;
-        }
-    }
-}
-
-void
-ply_window_set_draw_handler (ply_window_t *window,
-                             ply_window_draw_handler_t draw_handler,
-                             void         *user_data)
-{
-  assert (window != NULL);
-
-  window->draw_handler = draw_handler;
-  window->draw_handler_user_data = user_data;
-}
-
-void
-ply_window_set_erase_handler (ply_window_t *window,
-                              ply_window_erase_handler_t erase_handler,
-                              void         *user_data)
-{
-  assert (window != NULL);
-
-  window->erase_handler = erase_handler;
-  window->erase_handler_user_data = user_data;
-}
-
-void
-ply_window_attach_to_event_loop (ply_window_t     *window,
-                                 ply_event_loop_t *loop)
-{
-  assert (window != NULL);
-  assert (loop != NULL);
-  assert (window->loop == NULL);
-
-  window->loop = loop;
-
-  ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
-                                 ply_window_detach_from_event_loop,
-                                 window);
-}
-
-ply_frame_buffer_t *
-ply_window_get_frame_buffer (ply_window_t *window)
-{
-  return window->frame_buffer;
-}
-
-#ifdef PLY_WINDOW_ENABLE_TEST
-
-#include <stdio.h>
-
-#include "ply-event-loop.h"
-#include "ply-window.h"
-
-static void
-on_timeout (ply_window_t     *window,
-            ply_event_loop_t *loop)
-{
-  ply_event_loop_exit (loop, 0);
-}
-
-static void
-on_keypress (ply_window_t *window,
-             const char   *keyboard_input)
-{
-  printf ("key '%c' (0x%x) was pressed\n",
-          keyboard_input[0], (unsigned int) keyboard_input[0]);
-}
-
-int
-main (int    argc,
-      char **argv)
-{
-  ply_event_loop_t *loop;
-  ply_window_t *window;
-  int exit_code;
-  const char *tty_name;
-
-  exit_code = 0;
-
-  loop = ply_event_loop_new ();
-
-  if (argc > 1)
-    tty_name = argv[1];
-  else
-    tty_name = "/dev/tty1";
-
-  window = ply_window_new (tty_name);
-  ply_window_attach_to_event_loop (window, loop);
-  ply_window_add_keyboard_input_handler (window,
-                                         (ply_window_keyboard_input_handler_t)
-                                         on_keypress, window);
-
-  if (!ply_window_open (window))
-    {
-      ply_save_errno ();
-      perror ("could not open window");
-      ply_restore_errno ();
-      return errno;
-    }
-
-  if (!ply_window_set_mode (window, PLY_WINDOW_MODE_TEXT))
-    {
-      ply_save_errno ();
-      perror ("could not set window for graphics mode");
-      ply_restore_errno ();
-    }
-
-  ply_event_loop_watch_for_timeout (loop,
-                                    15.0,
-                                   (ply_event_loop_timeout_handler_t)
-                                   on_timeout,
-                                   window);
-  exit_code = ply_event_loop_run (loop);
-
-  ply_window_close (window);
-  ply_window_free (window);
-
-  return exit_code;
-}
-
-#endif /* PLY_WINDOW_ENABLE_TEST */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libplybootsplash/ply-window.h b/src/libplybootsplash/ply-window.h
deleted file mode 100644
index 9b8fee79..00000000
--- a/src/libplybootsplash/ply-window.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ply-window.h - APIs for putting up a splash screen
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written By: Ray Strode <rstrode@redhat.com>
- */
-#ifndef PLY_WINDOW_H
-#define PLY_WINDOW_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#include "ply-buffer.h"
-#include "ply-event-loop.h"
-#include "ply-frame-buffer.h"
-
-typedef struct _ply_window ply_window_t;
-
-typedef void (* ply_window_keyboard_input_handler_t) (void *user_data,
-                                                      const char *keyboard_input,
-                                                      size_t      character_size);
-
-typedef void (* ply_window_backspace_handler_t) (void *user_data);
-typedef void (* ply_window_escape_handler_t) (void *user_data);
-typedef void (* ply_window_enter_handler_t) (void *user_data,
-                                             const char *line);
-
-typedef void (* ply_window_draw_handler_t) (void *user_data,
-                                            int   x,
-                                            int   y,
-                                            int   width,
-                                            int   height);
-typedef void (* ply_window_erase_handler_t) (void *user_data,
-                                             int   x,
-                                             int   y,
-                                             int   width,
-                                             int   height);
-
-typedef enum
-{
-  PLY_WINDOW_MODE_TEXT,
-  PLY_WINDOW_MODE_GRAPHICS
-} ply_window_mode_t;
-
-typedef enum
-{
-  PLY_WINDOW_COLOR_BLACK = 0,
-  PLY_WINDOW_COLOR_RED,
-  PLY_WINDOW_COLOR_GREEN,
-  PLY_WINDOW_COLOR_BROWN,
-  PLY_WINDOW_COLOR_BLUE,
-  PLY_WINDOW_COLOR_MAGENTA,
-  PLY_WINDOW_COLOR_CYAN,
-  PLY_WINDOW_COLOR_WHITE,
-  PLY_WINDOW_COLOR_DEFAULT = PLY_WINDOW_COLOR_WHITE + 2
-} ply_window_color_t;
-
-#ifndef PLY_HIDE_FUNCTION_DECLARATIONS
-ply_window_t *ply_window_new (const char *name);
-void ply_window_free (ply_window_t *window);
-
-void ply_window_add_keyboard_input_handler (ply_window_t                        *window,
-                                            ply_window_keyboard_input_handler_t  input_handler,
-                                            void                                *user_data);
-void ply_window_remove_keyboard_input_handler (ply_window_t                        *window,
-                                               ply_window_keyboard_input_handler_t  input_handler);
-void ply_window_add_backspace_handler (ply_window_t                   *window,
-                                       ply_window_backspace_handler_t  backspace_handler,
-                                       void                           *user_data);
-void ply_window_remove_backspace_handler (ply_window_t                   *window,
-                                          ply_window_backspace_handler_t  backspace_handler);
-void ply_window_add_escape_handler (ply_window_t                *window,
-                                    ply_window_escape_handler_t  escape_handler,
-                                    void                        *user_data);
-void ply_window_remove_escape_handler (ply_window_t                *window,
-                                       ply_window_escape_handler_t  escape_handler);
-void ply_window_add_enter_handler (ply_window_t               *window,
-                                   ply_window_enter_handler_t  enter_handler,
-                                   void                       *user_data);
-void ply_window_remove_enter_handler (ply_window_t               *window,
-                                      ply_window_enter_handler_t  enter_handler);
-void ply_window_add_draw_handler (ply_window_t              *window,
-                                  ply_window_draw_handler_t  draw_handler,
-                                  void                      *user_data);
-void ply_window_remove_draw_handler (ply_window_t              *window,
-                                     ply_window_draw_handler_t  draw_handler);
-void ply_window_add_erase_handler (ply_window_t               *window,
-                                   ply_window_erase_handler_t  erase_handler,
-                                   void                       *user_data);
-void ply_window_remove_erase_handler (ply_window_t               *window,
-                                      ply_window_erase_handler_t erase_handler);
-
-bool ply_window_open (ply_window_t *window);
-bool ply_window_is_open (ply_window_t *window);
-void ply_window_close (ply_window_t *window);
-bool ply_window_set_mode (ply_window_t      *window,
-                          ply_window_mode_t  mode);
-int  ply_window_get_tty_fd (ply_window_t *window);
-int  ply_window_get_number_of_text_rows (ply_window_t *window);
-int  ply_window_get_number_of_text_columns (ply_window_t *window);
-void ply_window_set_text_cursor_position (ply_window_t *window,
-                                          int           column,
-                                          int           row);
-void ply_window_hide_text_cursor (ply_window_t *window);
-void ply_window_show_text_cursor (ply_window_t *window);
-void ply_window_clear_screen (ply_window_t *window);
-void ply_window_clear_text_line (ply_window_t *window);
-void ply_window_clear_text_character (ply_window_t *window);
-bool ply_window_supports_text_color (ply_window_t *window);
-void ply_window_set_background_color (ply_window_t       *window,
-                                      ply_window_color_t  color);
-void ply_window_set_foreground_color (ply_window_t       *window,
-                                      ply_window_color_t  color);
-ply_window_color_t ply_window_get_background_color (ply_window_t *window);
-ply_window_color_t ply_window_get_foreground_color (ply_window_t *window);
-
-void ply_window_draw_area (ply_window_t *window,
-                           int           x,
-                           int           y,
-                           int           width,
-                           int           height);
-
-void ply_window_erase_area (ply_window_t *window,
-                            int           x,
-                            int           y,
-                            int           width,
-                            int           height);
-
-uint32_t ply_window_get_color_hex_value (ply_window_t       *window,
-                                         ply_window_color_t  color);
-void ply_window_set_color_hex_value (ply_window_t       *window,
-                                     ply_window_color_t  color,
-                                     uint32_t            hex_value);
-void ply_window_reset_colors (ply_window_t *window);
-
-void ply_window_set_draw_handler (ply_window_t                *window,
-                                  ply_window_draw_handler_t    draw_handler,
-                                  void                        *user_data);
-void ply_window_set_erase_handler (ply_window_t               *window,
-                                   ply_window_erase_handler_t  erase_handler,
-                                   void                       *user_data);
-void ply_window_attach_to_event_loop (ply_window_t     *window,
-                                      ply_event_loop_t *loop);
-ply_frame_buffer_t *ply_window_get_frame_buffer (ply_window_t *window);
-
-#endif
-
-#endif /* PLY_WINDOW_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index e0c4242d..bd4e4760 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -9,7 +9,6 @@ TESTS =
 if ENABLE_TESTS
 include $(srcdir)/ply-boot-server-test.am
 include $(srcdir)/ply-boot-splash-test.am
-include $(srcdir)/ply-window-test.am
 endif
 
 noinst_PROGRAMS = $(TESTS)
diff --git a/src/tests/ply-window-test.am b/src/tests/ply-window-test.am
deleted file mode 100644
index 2a4090f5..00000000
--- a/src/tests/ply-window-test.am
+++ /dev/null
@@ -1,8 +0,0 @@
-TESTS += ply-window-test
-
-ply_window_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_WINDOW_ENABLE_TEST
-ply_window_test_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
-
-ply_window_test_SOURCES =                                                \
-                          $(srcdir)/../libplybootsplash/ply-window.h     \
-                          $(srcdir)/../libplybootsplash/ply-window.c