From: Ray Strode Date: Wed, 16 Sep 2009 21:21:33 +0000 (-0400) Subject: [libplybootsplash] Drop text-pulser X-Git-Tag: 0.7.2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=441fce1e1ff686e4c1f61de1f72f9fcf665e1b67;p=thirdparty%2Fplymouth.git [libplybootsplash] Drop text-pulser It hasn't been used since we dropped the pulser plugin --- diff --git a/src/libplybootsplash/Makefile.am b/src/libplybootsplash/Makefile.am index 84e22905..86021101 100644 --- a/src/libplybootsplash/Makefile.am +++ b/src/libplybootsplash/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir) \ lib_LTLIBRARIES = libplybootsplash.la libplybootsplashdir = $(includedir)/plymouth-1/plybootsplash -libplybootsplash_HEADERS = ply-entry.h ply-image.h ply-progress-bar.h ply-text-progress-bar.h ply-text-pulser.h ply-throbber.h ply-animation.h ply-progress-animation.h ply-window.h ply-label.h ply-boot-splash-plugin.h ply-label-plugin.h ply-boot-splash.h +libplybootsplash_HEADERS = ply-entry.h ply-image.h ply-progress-bar.h ply-text-progress-bar.h ply-throbber.h ply-animation.h ply-progress-animation.h ply-window.h ply-label.h ply-boot-splash-plugin.h ply-label-plugin.h ply-boot-splash.h libplybootsplash_la_CFLAGS = $(PLYMOUTH_CFLAGS) \ $(IMAGE_CFLAGS) \ @@ -28,7 +28,6 @@ libplybootsplash_la_SOURCES = \ ply-animation.c \ ply-progress-animation.c \ ply-text-progress-bar.c \ - ply-text-pulser.c \ ply-window.c \ ply-boot-splash.c diff --git a/src/libplybootsplash/ply-text-pulser.c b/src/libplybootsplash/ply-text-pulser.c deleted file mode 100644 index f22f41de..00000000 --- a/src/libplybootsplash/ply-text-pulser.c +++ /dev/null @@ -1,213 +0,0 @@ -/* ply-text-pulser.c - simple text based pulsing animation - * - * 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 - */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ply-text-pulser.h" -#include "ply-event-loop.h" -#include "ply-array.h" -#include "ply-logger.h" -#include "ply-utils.h" -#include "ply-window.h" - -#include - -#ifndef FRAMES_PER_SECOND -#define FRAMES_PER_SECOND 10 -#endif - -#define NUMBER_OF_INDICATOR_COLUMNS 6 - -struct _ply_text_pulser -{ - ply_event_loop_t *loop; - - ply_window_t *window; - - int column, row; - int number_of_rows; - int number_of_columns; - int spinner_position; - double start_time, now; -}; - -ply_text_pulser_t * -ply_text_pulser_new (void) -{ - ply_text_pulser_t *pulser; - - pulser = calloc (1, sizeof (ply_text_pulser_t)); - - pulser->number_of_rows = 0; - pulser->number_of_columns = 0; - pulser->row = 0; - pulser->column = 0; - pulser->spinner_position = 0; - pulser->number_of_columns = 40; - pulser->number_of_rows = 1; - - return pulser; -} - -void -ply_text_pulser_free (ply_text_pulser_t *pulser) -{ - if (pulser == NULL) - return; - - free (pulser); -} - -static void -draw_trough (ply_text_pulser_t *pulser, - int column, - int row) -{ - char *bytes; - - ply_window_set_text_cursor_position (pulser->window, - column, - row); - ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_BROWN); - bytes = malloc (pulser->number_of_columns); - memset (bytes, ' ', pulser->number_of_columns); - write (STDOUT_FILENO, bytes, pulser->number_of_columns); - free (bytes); -} - -static void -animate_at_time (ply_text_pulser_t *pulser, - double time) -{ - ply_window_set_mode (pulser->window, PLY_WINDOW_MODE_TEXT); - - draw_trough (pulser, pulser->column, pulser->row); - - ply_window_set_text_cursor_position (pulser->window, - pulser->column + pulser->spinner_position, - pulser->row); - pulser->spinner_position = (pulser->number_of_columns - strlen (" ") + 1) * (.5 * sin (time) + .5); - ply_window_set_text_cursor_position (pulser->window, - pulser->column + pulser->spinner_position, - pulser->row); - - ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_GREEN); - write (STDOUT_FILENO, " ", strlen (" ")); - ply_window_set_background_color (pulser->window, PLY_WINDOW_COLOR_DEFAULT); -} - -static void -on_timeout (ply_text_pulser_t *pulser) -{ - double sleep_time; - pulser->now = ply_get_timestamp (); - -#ifdef REAL_TIME_ANIMATION - animate_at_time (pulser, - pulser->now - pulser->start_time); -#else - static double time = 0.0; - time += 1.0 / FRAMES_PER_SECOND; - animate_at_time (pulser, time); -#endif - - sleep_time = 1.0 / FRAMES_PER_SECOND; - sleep_time = MAX (sleep_time - (ply_get_timestamp () - pulser->now), - 0.005); - - ply_event_loop_watch_for_timeout (pulser->loop, - sleep_time, - (ply_event_loop_timeout_handler_t) - on_timeout, pulser); -} - -bool -ply_text_pulser_start (ply_text_pulser_t *pulser, - ply_event_loop_t *loop, - ply_window_t *window, - int column, - int row) -{ - assert (pulser != NULL); - assert (pulser->loop == NULL); - - pulser->loop = loop; - pulser->window = window; - - pulser->row = row; - pulser->column = column; - - pulser->start_time = ply_get_timestamp (); - - ply_event_loop_watch_for_timeout (pulser->loop, - 1.0 / FRAMES_PER_SECOND, - (ply_event_loop_timeout_handler_t) - on_timeout, pulser); - - return true; -} - -void -ply_text_pulser_stop (ply_text_pulser_t *pulser) -{ - pulser->window = NULL; - - if (pulser->loop != NULL) - { - ply_event_loop_stop_watching_for_timeout (pulser->loop, - (ply_event_loop_timeout_handler_t) - on_timeout, pulser); - pulser->loop = NULL; - } -} - -int -ply_text_pulser_get_number_of_columns (ply_text_pulser_t *pulser) -{ - return pulser->number_of_columns; -} - -int -ply_text_pulser_get_number_of_rows (ply_text_pulser_t *pulser) -{ - return pulser->number_of_rows; -} - -/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */ diff --git a/src/libplybootsplash/ply-text-pulser.h b/src/libplybootsplash/ply-text-pulser.h deleted file mode 100644 index b43adb5b..00000000 --- a/src/libplybootsplash/ply-text-pulser.h +++ /dev/null @@ -1,51 +0,0 @@ -/* ply-text-pulser.h - simple text based pulsing animation - * - * 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 - */ -#ifndef PLY_TEXT_PULSER_H -#define PLY_TEXT_PULSER_H - -#include -#include -#include - -#include "ply-event-loop.h" -#include "ply-window.h" - -typedef struct _ply_text_pulser ply_text_pulser_t; - -#ifndef PLY_HIDE_FUNCTION_DECLARATIONS -ply_text_pulser_t *ply_text_pulser_new (void); -void ply_text_pulser_free (ply_text_pulser_t *pulser); - -bool ply_text_pulser_load (ply_text_pulser_t *pulser); -bool ply_text_pulser_start (ply_text_pulser_t *pulser, - ply_event_loop_t *loop, - ply_window_t *window, - int column, - int row); -void ply_text_pulser_stop (ply_text_pulser_t *pulser); - -int ply_text_pulser_get_number_of_rows (ply_text_pulser_t *pulser); -int ply_text_pulser_get_number_of_columns (ply_text_pulser_t *pulser); -#endif - -#endif /* PLY_TEXT_PULSER_H */ -/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */