Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plymouth-theme-breeze for
openSUSE:Factory checked in at 2021-06-07 22:43:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth-theme-breeze (Old)
and /work/SRC/openSUSE:Factory/.plymouth-theme-breeze.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth-theme-breeze"
Mon Jun 7 22:43:03 2021 rev:85 rq:897467 version:5.22.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/plymouth-theme-breeze/plymouth-theme-breeze.changes
2021-05-06 22:53:10.634613413 +0200
+++
/work/SRC/openSUSE:Factory/.plymouth-theme-breeze.new.32437/plymouth-theme-breeze.changes
2021-06-07 22:43:23.972474900 +0200
@@ -1,0 +2,21 @@
+Thu Jun 3 13:06:18 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.22.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.22.0
+- No code changes since 5.21.90
+
+-------------------------------------------------------------------
+Thu May 13 18:15:53 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.21.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.21.90
+- Changes since 5.21.5:
+ * Add .git-blame-ignore-revs file
+ * Run clang-format
+ * Add pre-commit hook for clang-format
+
+-------------------------------------------------------------------
Old:
----
breeze-plymouth-5.21.5.tar.xz
breeze-plymouth-5.21.5.tar.xz.sig
New:
----
breeze-plymouth-5.22.0.tar.xz
breeze-plymouth-5.22.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth-theme-breeze.spec ++++++
--- /var/tmp/diff_new_pack.muOhIp/_old 2021-06-07 22:43:24.552475881 +0200
+++ /var/tmp/diff_new_pack.muOhIp/_new 2021-06-07 22:43:24.556475887 +0200
@@ -36,18 +36,18 @@
%bcond_without lang
Name: plymouth-theme-breeze
-Version: 5.21.5
+Version: 5.22.0
Release: 0
Summary: Plymouth "Breeze" theme
License: GPL-2.0+
Group: System/Base
URL: http://www.kde.org
-Source:
https://download.kde.org/stable/plasma/%{version}/breeze-plymouth-%{version}.tar.xz
+Source: breeze-plymouth-%{version}.tar.xz
%if %{with lang}
-Source1:
https://download.kde.org/stable/plasma/%{version}/breeze-plymouth-%{version}.tar.xz.sig
+Source1: breeze-plymouth-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
-BuildRequires: cmake >= 2.8.12
+BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules >= 1.8.0
BuildRequires: kf5-filesystem
BuildRequires: plymouth-devel
++++++ breeze-plymouth-5.21.5.tar.xz -> breeze-plymouth-5.22.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/breeze-plymouth-5.21.5/.git-blame-ignore-revs
new/breeze-plymouth-5.22.0/.git-blame-ignore-revs
--- old/breeze-plymouth-5.21.5/.git-blame-ignore-revs 1970-01-01
01:00:00.000000000 +0100
+++ new/breeze-plymouth-5.22.0/.git-blame-ignore-revs 2021-06-03
15:57:54.000000000 +0200
@@ -0,0 +1 @@
+7568ec7c54e629e9f432cda929706848a00c54f0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/breeze-plymouth-5.21.5/.gitignore
new/breeze-plymouth-5.22.0/.gitignore
--- old/breeze-plymouth-5.21.5/.gitignore 2021-05-04 13:47:32.000000000
+0200
+++ new/breeze-plymouth-5.22.0/.gitignore 2021-06-03 15:57:54.000000000
+0200
@@ -3,3 +3,8 @@
.clang-format
CMakeLists.txt.user*
/build*/
+/compile_commands.json
+.clangd
+.idea
+/cmake-build*
+.cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/breeze-plymouth-5.21.5/CMakeLists.txt
new/breeze-plymouth-5.22.0/CMakeLists.txt
--- old/breeze-plymouth-5.21.5/CMakeLists.txt 2021-05-04 13:47:32.000000000
+0200
+++ new/breeze-plymouth-5.22.0/CMakeLists.txt 2021-06-03 15:57:54.000000000
+0200
@@ -1,5 +1,5 @@
project(breeze-plymouth)
-set(PROJECT_VERSION "5.21.5")
+set(PROJECT_VERSION "5.22.0")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
@@ -9,6 +9,7 @@
include(FeatureSummary)
include(KDEClangFormat)
+include(KDEGitCommitHooks)
find_package(Plymouth REQUIRED)
@@ -28,7 +29,8 @@
add_subdirectory(breeze)
# add clang-format target for all our real source files
-file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/breeze-plymouth-5.21.5/breeze-text/plugin.c
new/breeze-plymouth-5.22.0/breeze-text/plugin.c
--- old/breeze-plymouth-5.21.5/breeze-text/plugin.c 2021-05-04
13:47:32.000000000 +0200
+++ new/breeze-plymouth-5.22.0/breeze-text/plugin.c 2021-06-03
15:57:54.000000000 +0200
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2016 Harald Sitter <sit...@kde.org>
- * SPDX-FileCopyrightText: 2010 Canonical Ltd.
- * SPDX-FileCopyrightText: 2008-2012 Red Hat Inc.
+ * SPDX-FileCopyrightText: 2010 Canonical Ltd.
+ * SPDX-FileCopyrightText: 2008-2012 Red Hat Inc.
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
@@ -13,8 +13,8 @@
#include <math.h>
#include <signal.h>
#include <stdbool.h>
-#include <stdio.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
@@ -26,7 +26,6 @@
#include <values.h>
#include <wchar.h>
-#include <ply-trigger.h>
#include <ply-boot-splash-plugin.h>
#include <ply-buffer.h>
#include <ply-event-loop.h>
@@ -34,6 +33,7 @@
#include <ply-list.h>
#include <ply-logger.h>
#include <ply-text-display.h>
+#include <ply-trigger.h>
#include <ply-utils.h>
#include <linux/kd.h>
@@ -42,737 +42,623 @@
#define BACKSPACE "\b\033[0K"
#define PLUGIN_NAME "breeze-text"
-typedef enum {
- PLY_BOOT_SPLASH_DISPLAY_NORMAL,
- PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY,
- PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY
-} ply_boot_splash_display_type_t;
+typedef enum { PLY_BOOT_SPLASH_DISPLAY_NORMAL,
PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY, PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY
} ply_boot_splash_display_type_t;
-struct _ply_boot_splash_plugin
-{
- ply_event_loop_t *loop;
- ply_boot_splash_mode_t mode;
+struct _ply_boot_splash_plugin {
+ ply_event_loop_t *loop;
+ ply_boot_splash_mode_t mode;
- ply_list_t *views;
+ ply_list_t *views;
- ply_boot_splash_display_type_t state;
+ ply_boot_splash_display_type_t state;
- char *message;
+ char *message;
- uint32_t is_animating : 1;
- uint32_t black;
- uint32_t white;
- uint32_t brown;
- uint32_t blue;
- char *title;
+ uint32_t is_animating : 1;
+ uint32_t black;
+ uint32_t white;
+ uint32_t brown;
+ uint32_t blue;
+ char *title;
};
-typedef struct
-{
- ply_boot_splash_plugin_t *plugin;
- ply_text_display_t *display;
- breeze_text_progress_bar_t *progress_bar;
+typedef struct {
+ ply_boot_splash_plugin_t *plugin;
+ ply_text_display_t *display;
+ breeze_text_progress_bar_t *progress_bar;
} view_t;
-static void hide_splash_screen (ply_boot_splash_plugin_t *plugin,
- ply_event_loop_t *loop);
+static void hide_splash_screen(ply_boot_splash_plugin_t *plugin,
ply_event_loop_t *loop);
-static view_t *
-view_new (ply_boot_splash_plugin_t *plugin,
- ply_text_display_t *display)
+static view_t *view_new(ply_boot_splash_plugin_t *plugin, ply_text_display_t
*display)
{
- view_t *view;
+ view_t *view;
- view = calloc (1, sizeof (view_t));
- view->plugin = plugin;
- view->display = display;
+ view = calloc(1, sizeof(view_t));
+ view->plugin = plugin;
+ view->display = display;
- view->progress_bar = breeze_text_progress_bar_new ();
+ view->progress_bar = breeze_text_progress_bar_new();
- return view;
+ return view;
}
-static void
-view_free (view_t *view)
+static void view_free(view_t *view)
{
- breeze_text_progress_bar_free (view->progress_bar);
+ breeze_text_progress_bar_free(view->progress_bar);
- free (view);
+ free(view);
}
-static void
-view_show_message (view_t *view)
+static void view_show_message(view_t *view)
{
- ply_boot_splash_plugin_t *plugin;
- int display_width, display_height, y;
- ply_terminal_color_t color;
- char *message;
+ ply_boot_splash_plugin_t *plugin;
+ int display_width, display_height, y;
+ ply_terminal_color_t color;
+ char *message;
- plugin = view->plugin;
+ plugin = view->plugin;
- display_width = ply_text_display_get_number_of_columns (view->display);
- display_height = ply_text_display_get_number_of_rows (view->display);
+ display_width = ply_text_display_get_number_of_columns(view->display);
+ display_height = ply_text_display_get_number_of_rows(view->display);
- if (!strncmp (plugin->message, "keys:", 5))
- {
- message = plugin->message + 5;
- color = PLY_TERMINAL_COLOR_WHITE;
- y = display_height - 4;
- }
- else
- {
- message = plugin->message;
- color = PLY_TERMINAL_COLOR_BLUE;
- y = display_height / 2 + 7;
+ if (!strncmp(plugin->message, "keys:", 5)) {
+ message = plugin->message + 5;
+ color = PLY_TERMINAL_COLOR_WHITE;
+ y = display_height - 4;
+ } else {
+ message = plugin->message;
+ color = PLY_TERMINAL_COLOR_BLUE;
+ y = display_height / 2 + 7;
}
- ply_text_display_set_cursor_position (view->display, 0, y);
- ply_text_display_clear_line (view->display);
- ply_text_display_set_cursor_position (view->display,
- (display_width -
- strlen (message)) / 2,
- y);
+ ply_text_display_set_cursor_position(view->display, 0, y);
+ ply_text_display_clear_line(view->display);
+ ply_text_display_set_cursor_position(view->display, (display_width -
strlen(message)) / 2, y);
- ply_text_display_set_foreground_color (view->display, color);
- ply_text_display_write (view->display, "%s", message);
+ ply_text_display_set_foreground_color(view->display, color);
+ ply_text_display_write(view->display, "%s", message);
}
-static void
-view_show_prompt (view_t *view,
- const char *prompt,
- const char *entered_text)
+static void view_show_prompt(view_t *view, const char *prompt, const char
*entered_text)
{
- int display_width, display_height;
+ int display_width, display_height;
- display_width = ply_text_display_get_number_of_columns (view->display);
- display_height = ply_text_display_get_number_of_rows (view->display);
+ display_width = ply_text_display_get_number_of_columns(view->display);
+ display_height = ply_text_display_get_number_of_rows(view->display);
- ply_text_display_set_cursor_position (view->display, 0,
- display_height / 2 + 8);
- ply_text_display_clear_line (view->display);
- ply_text_display_set_cursor_position (view->display,
- display_width / 2 - (strlen (prompt)),
- display_height / 2 + 8);
+ ply_text_display_set_cursor_position(view->display, 0, display_height / 2
+ 8);
+ ply_text_display_clear_line(view->display);
+ ply_text_display_set_cursor_position(view->display, display_width / 2 -
(strlen(prompt)), display_height / 2 + 8);
- ply_text_display_write (view->display, "%s:%s", prompt, entered_text);
+ ply_text_display_write(view->display, "%s:%s", prompt, entered_text);
- ply_text_display_show_cursor (view->display);
+ ply_text_display_show_cursor(view->display);
}
-static void
-view_start_animation (view_t *view)
+static void view_start_animation(view_t *view)
{
- ply_boot_splash_plugin_t *plugin;
- ply_terminal_t *terminal;
+ ply_boot_splash_plugin_t *plugin;
+ ply_terminal_t *terminal;
- assert (view != NULL);
+ assert(view != NULL);
- plugin = view->plugin;
+ plugin = view->plugin;
- terminal = ply_text_display_get_terminal (view->display);
+ terminal = ply_text_display_get_terminal(view->display);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLACK,
- plugin->black);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
- plugin->white);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
- plugin->blue);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
- plugin->brown);
+ ply_terminal_set_color_hex_value(terminal, PLY_TERMINAL_COLOR_BLACK,
plugin->black);
+ ply_terminal_set_color_hex_value(terminal, PLY_TERMINAL_COLOR_WHITE,
plugin->white);
+ ply_terminal_set_color_hex_value(terminal, PLY_TERMINAL_COLOR_BLUE,
plugin->blue);
+ ply_terminal_set_color_hex_value(terminal, PLY_TERMINAL_COLOR_BROWN,
plugin->brown);
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
- ply_text_display_clear_screen (view->display);
- ply_text_display_hide_cursor (view->display);
+ ply_text_display_set_background_color(view->display,
PLY_TERMINAL_COLOR_BLACK);
+ ply_text_display_clear_screen(view->display);
+ ply_text_display_hide_cursor(view->display);
- if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN)
- {
- breeze_text_progress_bar_hide (view->progress_bar);
- return;
+ if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN) {
+ breeze_text_progress_bar_hide(view->progress_bar);
+ return;
}
- breeze_text_progress_bar_show (view->progress_bar,
- view->display);
+ breeze_text_progress_bar_show(view->progress_bar, view->display);
}
-static void
-view_redraw (view_t *view)
+static void view_redraw(view_t *view)
{
- unsigned long screen_width, screen_height;
+ unsigned long screen_width, screen_height;
- screen_width = ply_text_display_get_number_of_columns (view->display);
- screen_height = ply_text_display_get_number_of_rows (view->display);
+ screen_width = ply_text_display_get_number_of_columns(view->display);
+ screen_height = ply_text_display_get_number_of_rows(view->display);
- ply_text_display_draw_area (view->display, 0, 0,
- screen_width, screen_height);
+ ply_text_display_draw_area(view->display, 0, 0, screen_width,
screen_height);
}
-static void
-redraw_views (ply_boot_splash_plugin_t *plugin)
+static void redraw_views(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_redraw (view);
+ view_redraw(view);
- node = next_node;
+ node = next_node;
}
}
-static void
-view_hide (view_t *view)
+static void view_hide(view_t *view)
{
- if (view->display != NULL)
- {
- ply_terminal_t *terminal;
+ if (view->display != NULL) {
+ ply_terminal_t *terminal;
- terminal = ply_text_display_get_terminal (view->display);
+ terminal = ply_text_display_get_terminal(view->display);
- ply_text_display_set_background_color (view->display,
PLY_TERMINAL_COLOR_DEFAULT);
- ply_text_display_clear_screen (view->display);
- ply_text_display_show_cursor (view->display);
+ ply_text_display_set_background_color(view->display,
PLY_TERMINAL_COLOR_DEFAULT);
+ ply_text_display_clear_screen(view->display);
+ ply_text_display_show_cursor(view->display);
- ply_terminal_reset_colors (terminal);
+ ply_terminal_reset_colors(terminal);
}
}
-static void
-hide_views (ply_boot_splash_plugin_t *plugin)
+static void hide_views(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_hide (view);
+ view_hide(view);
- node = next_node;
+ node = next_node;
}
}
-static void
-pause_views (ply_boot_splash_plugin_t *plugin)
+static void pause_views(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- ply_text_display_pause_updates (view->display);
+ ply_text_display_pause_updates(view->display);
- node = next_node;
+ node = next_node;
}
}
-static void
-unpause_views (ply_boot_splash_plugin_t *plugin)
+static void unpause_views(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- ply_text_display_unpause_updates (view->display);
+ ply_text_display_unpause_updates(view->display);
- node = next_node;
+ node = next_node;
}
}
-static ply_boot_splash_plugin_t *
-create_plugin (ply_key_file_t *key_file)
+static ply_boot_splash_plugin_t *create_plugin(ply_key_file_t *key_file)
{
- char *option;
+ char *option;
- ply_boot_splash_plugin_t *plugin;
+ ply_boot_splash_plugin_t *plugin;
- ply_trace ("creating plugin");
+ ply_trace("creating plugin");
- plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
- plugin->message = NULL;
+ plugin = calloc(1, sizeof(ply_boot_splash_plugin_t));
+ plugin->message = NULL;
- plugin->views = ply_list_new ();
+ plugin->views = ply_list_new();
- /* Not a pretty API for setting defaults for your config file... */
- plugin->black = 0x000000;
- plugin->white = 0xeff0f1; // progress bar block 1
- plugin->blue = 0xeff0f1; // progress bar block 2
- plugin->brown = 0xeff0f1; // progress bar block 3
+ /* Not a pretty API for setting defaults for your config file... */
+ plugin->black = 0x000000;
+ plugin->white = 0xeff0f1; // progress bar block 1
+ plugin->blue = 0xeff0f1; // progress bar block 2
+ plugin->brown = 0xeff0f1; // progress bar block 3
- option = ply_key_file_get_value (key_file, PLUGIN_NAME, "black");
- if (option)
- sscanf(option, "0x%x", &plugin->black);
- option = ply_key_file_get_value (key_file, PLUGIN_NAME, "white");
- if (option)
- sscanf(option, "0x%x", &plugin->white);
- option = ply_key_file_get_value (key_file, PLUGIN_NAME, "brown");
- if (option)
- sscanf(option, "0x%x", &plugin->brown);
- option = ply_key_file_get_value (key_file, PLUGIN_NAME, "blue");
- if (option)
- sscanf(option, "0x%x", &plugin->blue);
+ option = ply_key_file_get_value(key_file, PLUGIN_NAME, "black");
+ if (option)
+ sscanf(option, "0x%x", &plugin->black);
+ option = ply_key_file_get_value(key_file, PLUGIN_NAME, "white");
+ if (option)
+ sscanf(option, "0x%x", &plugin->white);
+ option = ply_key_file_get_value(key_file, PLUGIN_NAME, "brown");
+ if (option)
+ sscanf(option, "0x%x", &plugin->brown);
+ option = ply_key_file_get_value(key_file, PLUGIN_NAME, "blue");
+ if (option)
+ sscanf(option, "0x%x", &plugin->blue);
- plugin->title = ply_key_file_get_value (key_file, PLUGIN_NAME, "title");
+ plugin->title = ply_key_file_get_value(key_file, PLUGIN_NAME, "title");
- return plugin;
+ return plugin;
}
-static void
-detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
+static void detach_from_event_loop(ply_boot_splash_plugin_t *plugin)
{
- plugin->loop = NULL;
+ plugin->loop = NULL;
- ply_trace ("detaching from event loop");
+ ply_trace("detaching from event loop");
}
-static void
-free_views (ply_boot_splash_plugin_t *plugin)
+static void free_views(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
+ node = ply_list_get_first_node(plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_free (view);
- ply_list_remove_node (plugin->views, node);
+ view_free(view);
+ ply_list_remove_node(plugin->views, node);
- node = next_node;
+ node = next_node;
}
- ply_list_free (plugin->views);
- plugin->views = NULL;
+ ply_list_free(plugin->views);
+ plugin->views = NULL;
}
-static void
-destroy_plugin (ply_boot_splash_plugin_t *plugin)
+static void destroy_plugin(ply_boot_splash_plugin_t *plugin)
{
- ply_trace ("destroying plugin");
+ ply_trace("destroying plugin");
- if (plugin == NULL)
- return;
+ if (plugin == NULL)
+ return;
- /* It doesn't ever make sense to keep this plugin on screen
- * after exit
- */
- hide_splash_screen (plugin, plugin->loop);
+ /* It doesn't ever make sense to keep this plugin on screen
+ * after exit
+ */
+ hide_splash_screen(plugin, plugin->loop);
- free_views (plugin);
- if (plugin->message != NULL)
- free (plugin->message);
+ free_views(plugin);
+ if (plugin->message != NULL)
+ free(plugin->message);
- free (plugin);
+ free(plugin);
}
-static void
-show_message (ply_boot_splash_plugin_t *plugin)
+static void show_message(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_show_message (view);
+ view_show_message(view);
- node = next_node;
+ node = next_node;
}
}
-static void
-start_animation (ply_boot_splash_plugin_t *plugin)
+static void start_animation(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- assert (plugin != NULL);
- assert (plugin->loop != NULL);
+ assert(plugin != NULL);
+ assert(plugin->loop != NULL);
- redraw_views (plugin);
+ redraw_views(plugin);
- if (plugin->message != NULL)
- show_message (plugin);
+ if (plugin->message != NULL)
+ show_message(plugin);
- if (plugin->is_animating)
- return;
+ if (plugin->is_animating)
+ return;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_start_animation (view);
+ view_start_animation(view);
- node = next_node;
+ node = next_node;
}
- plugin->is_animating = true;
+ plugin->is_animating = true;
}
-static void
-stop_animation (ply_boot_splash_plugin_t *plugin)
+static void stop_animation(ply_boot_splash_plugin_t *plugin)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- assert (plugin != NULL);
- assert (plugin->loop != NULL);
+ assert(plugin != NULL);
+ assert(plugin->loop != NULL);
- if (!plugin->is_animating)
- return;
+ if (!plugin->is_animating)
+ return;
- plugin->is_animating = false;
+ plugin->is_animating = false;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- breeze_text_progress_bar_hide (view->progress_bar);
+ breeze_text_progress_bar_hide(view->progress_bar);
- node = next_node;
+ node = next_node;
}
- redraw_views (plugin);
+ redraw_views(plugin);
}
-static void
-on_draw (view_t *view,
- ply_terminal_t *terminal,
- int x,
- int y,
- int width,
- int height)
+static void on_draw(view_t *view, ply_terminal_t *terminal, int x, int y, int
width, int height)
{
- ply_text_display_clear_screen (view->display);
+ ply_text_display_clear_screen(view->display);
}
-static void
-add_text_display (ply_boot_splash_plugin_t *plugin,
- ply_text_display_t *display)
+static void add_text_display(ply_boot_splash_plugin_t *plugin,
ply_text_display_t *display)
{
- view_t *view;
- ply_terminal_t *terminal;
+ view_t *view;
+ ply_terminal_t *terminal;
- view = view_new (plugin, display);
+ view = view_new(plugin, display);
- terminal = ply_text_display_get_terminal (view->display);
- if (ply_terminal_open (terminal))
- {
- ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
- ply_terminal_activate_vt (terminal);
+ terminal = ply_text_display_get_terminal(view->display);
+ if (ply_terminal_open(terminal)) {
+ ply_terminal_set_mode(terminal, PLY_TERMINAL_MODE_TEXT);
+ ply_terminal_activate_vt(terminal);
}
- ply_text_display_set_draw_handler (view->display,
- (ply_text_display_draw_handler_t)
- on_draw, view);
+ ply_text_display_set_draw_handler(view->display,
(ply_text_display_draw_handler_t)on_draw, view);
- ply_list_append_data (plugin->views, view);
+ ply_list_append_data(plugin->views, view);
}
-static void
-remove_text_display (ply_boot_splash_plugin_t *plugin,
- ply_text_display_t *display)
+static void remove_text_display(ply_boot_splash_plugin_t *plugin,
ply_text_display_t *display)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- view_t *view;
- ply_list_node_t *next_node;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ view_t *view;
+ ply_list_node_t *next_node;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- if (view->display == display)
- {
- ply_text_display_set_draw_handler (view->display,
- NULL, NULL);
- view_free (view);
- ply_list_remove_node (plugin->views, node);
- return;
+ if (view->display == display) {
+ ply_text_display_set_draw_handler(view->display, NULL, NULL);
+ view_free(view);
+ ply_list_remove_node(plugin->views, node);
+ return;
}
- node = next_node;
+ node = next_node;
}
}
-static bool
-show_splash_screen (ply_boot_splash_plugin_t *plugin,
- ply_event_loop_t *loop,
- ply_buffer_t *boot_buffer,
- ply_boot_splash_mode_t mode)
+static bool show_splash_screen(ply_boot_splash_plugin_t *plugin,
ply_event_loop_t *loop, ply_buffer_t *boot_buffer, ply_boot_splash_mode_t mode)
{
- assert (plugin != NULL);
+ assert(plugin != NULL);
- plugin->loop = loop;
- plugin->mode = mode;
- ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
- detach_from_event_loop,
- plugin);
+ plugin->loop = loop;
+ plugin->mode = mode;
+ ply_event_loop_watch_for_exit(loop,
(ply_event_loop_exit_handler_t)detach_from_event_loop, plugin);
- ply_show_new_kernel_messages (false);
- start_animation (plugin);
+ ply_show_new_kernel_messages(false);
+ start_animation(plugin);
- return true;
+ return true;
}
-static void
-update_status (ply_boot_splash_plugin_t *plugin,
- const char *status)
+static void update_status(ply_boot_splash_plugin_t *plugin, const char *status)
{
- assert (plugin != NULL);
+ assert(plugin != NULL);
- ply_trace ("status update");
+ ply_trace("status update");
}
-static void
-on_boot_progress (ply_boot_splash_plugin_t *plugin,
- double duration,
- double percent_done)
+static void on_boot_progress(ply_boot_splash_plugin_t *plugin, double
duration, double percent_done)
{
- ply_list_node_t *node;
- double total_duration;
+ ply_list_node_t *node;
+ double total_duration;
- total_duration = duration / percent_done;
+ total_duration = duration / percent_done;
- /* Fun made-up smoothing function to make the growth asymptotic:
- * fraction(time,estimate)=1-2^(-(time^1.45)/estimate) */
- percent_done = 1.0 - pow (2.0, -pow (duration, 1.45) / total_duration) *
(1.0 - percent_done);
+ /* Fun made-up smoothing function to make the growth asymptotic:
+ * fraction(time,estimate)=1-2^(-(time^1.45)/estimate) */
+ percent_done = 1.0 - pow(2.0, -pow(duration, 1.45) / total_duration) *
(1.0 - percent_done);
- node = ply_list_get_first_node (plugin->views);
+ node = ply_list_get_first_node(plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- {
- int display_width = ply_text_display_get_number_of_columns
(view->display);
- int display_height = ply_text_display_get_number_of_rows
(view->display);
+ {
+ int display_width =
ply_text_display_get_number_of_columns(view->display);
+ int display_height =
ply_text_display_get_number_of_rows(view->display);
- ply_text_display_set_cursor_position (view->display,
- (display_width - 12) / 2,
- display_height / 2);
+ ply_text_display_set_cursor_position(view->display, (display_width
- 12) / 2, display_height / 2);
- ply_text_display_set_background_color (view->display,
PLY_TERMINAL_COLOR_BLACK);
- ply_text_display_set_foreground_color (view->display,
PLY_TERMINAL_COLOR_WHITE);
- ply_text_display_write (view->display, "%s", plugin->title);
- }
+ ply_text_display_set_background_color(view->display,
PLY_TERMINAL_COLOR_BLACK);
+ ply_text_display_set_foreground_color(view->display,
PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_write(view->display, "%s", plugin->title);
+ }
- breeze_text_progress_bar_set_percent_done (view->progress_bar,
percent_done);
- breeze_text_progress_bar_draw (view->progress_bar);
+ breeze_text_progress_bar_set_percent_done(view->progress_bar,
percent_done);
+ breeze_text_progress_bar_draw(view->progress_bar);
- node = next_node;
+ node = next_node;
}
}
-static void
-hide_splash_screen (ply_boot_splash_plugin_t *plugin,
- ply_event_loop_t *loop)
+static void hide_splash_screen(ply_boot_splash_plugin_t *plugin,
ply_event_loop_t *loop)
{
- assert (plugin != NULL);
+ assert(plugin != NULL);
- ply_trace ("hiding splash screen");
+ ply_trace("hiding splash screen");
- if (plugin->loop != NULL)
- {
- stop_animation (plugin);
+ if (plugin->loop != NULL) {
+ stop_animation(plugin);
- ply_event_loop_stop_watching_for_exit (plugin->loop,
- (ply_event_loop_exit_handler_t)
- detach_from_event_loop,
- plugin);
- detach_from_event_loop (plugin);
+ ply_event_loop_stop_watching_for_exit(plugin->loop,
(ply_event_loop_exit_handler_t)detach_from_event_loop, plugin);
+ detach_from_event_loop(plugin);
}
- hide_views (plugin);
- ply_show_new_kernel_messages (true);
+ hide_views(plugin);
+ ply_show_new_kernel_messages(true);
}
-static void
-display_normal (ply_boot_splash_plugin_t *plugin)
+static void display_normal(ply_boot_splash_plugin_t *plugin)
{
- pause_views (plugin);
- if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
- {
- plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
- start_animation (plugin);
- redraw_views (plugin);
+ pause_views(plugin);
+ if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL) {
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
+ start_animation(plugin);
+ redraw_views(plugin);
}
- unpause_views (plugin);
+ unpause_views(plugin);
}
-static void
-display_message (ply_boot_splash_plugin_t *plugin,
- const char *message)
+static void display_message(ply_boot_splash_plugin_t *plugin, const char
*message)
{
- if (plugin->message != NULL)
- free (plugin->message);
+ if (plugin->message != NULL)
+ free(plugin->message);
- plugin->message = strdup (message);
- start_animation (plugin);
+ plugin->message = strdup(message);
+ start_animation(plugin);
}
-static void
-show_password_prompt (ply_boot_splash_plugin_t *plugin,
- const char *prompt,
- int bullets)
+static void show_password_prompt(ply_boot_splash_plugin_t *plugin, const char
*prompt, int bullets)
{
- ply_list_node_t *node;
- int i;
- char *entered_text;
+ ply_list_node_t *node;
+ int i;
+ char *entered_text;
- entered_text = calloc (bullets + 1, sizeof (char));
+ entered_text = calloc(bullets + 1, sizeof(char));
- for (i = 0; i < bullets; i++)
- entered_text[i] = '*';
+ for (i = 0; i < bullets; i++)
+ entered_text[i] = '*';
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_show_prompt (view, prompt, entered_text);
+ view_show_prompt(view, prompt, entered_text);
- node = next_node;
+ node = next_node;
}
- free (entered_text);
+ free(entered_text);
}
-static void
-show_prompt (ply_boot_splash_plugin_t *plugin,
- const char *prompt,
- const char *text)
+static void show_prompt(ply_boot_splash_plugin_t *plugin, const char *prompt,
const char *text)
{
- ply_list_node_t *node;
+ ply_list_node_t *node;
- node = ply_list_get_first_node (plugin->views);
- while (node != NULL)
- {
- ply_list_node_t *next_node;
- view_t *view;
+ node = ply_list_get_first_node(plugin->views);
+ while (node != NULL) {
+ ply_list_node_t *next_node;
+ view_t *view;
- view = ply_list_node_get_data (node);
- next_node = ply_list_get_next_node (plugin->views, node);
+ view = ply_list_node_get_data(node);
+ next_node = ply_list_get_next_node(plugin->views, node);
- view_show_prompt (view, prompt, text);
+ view_show_prompt(view, prompt, text);
- node = next_node;
+ node = next_node;
}
}
-static void
-display_password (ply_boot_splash_plugin_t *plugin,
- const char *prompt,
- int bullets)
+static void display_password(ply_boot_splash_plugin_t *plugin, const char
*prompt, int bullets)
{
- pause_views (plugin);
- if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
- stop_animation (plugin);
+ pause_views(plugin);
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+ stop_animation(plugin);
- plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
- if (!prompt)
- prompt = "Password";
+ if (!prompt)
+ prompt = "Password";
- show_password_prompt (plugin, prompt, bullets);
+ show_password_prompt(plugin, prompt, bullets);
- unpause_views (plugin);
+ unpause_views(plugin);
}
-static void
-display_question (ply_boot_splash_plugin_t *plugin,
- const char *prompt,
- const char *entry_text)
+static void display_question(ply_boot_splash_plugin_t *plugin, const char
*prompt, const char *entry_text)
{
- pause_views (plugin);
- if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
- stop_animation (plugin);
+ pause_views(plugin);
+ if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+ stop_animation(plugin);
- plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY;
- if (!prompt)
- prompt = "Password";
+ if (!prompt)
+ prompt = "Password";
- show_prompt (plugin, prompt, entry_text);
+ show_prompt(plugin, prompt, entry_text);
- unpause_views (plugin);
+ unpause_views(plugin);
}
-ply_boot_splash_plugin_interface_t *
-ply_boot_splash_plugin_get_interface (void)
+ply_boot_splash_plugin_interface_t *ply_boot_splash_plugin_get_interface(void)
{
- static ply_boot_splash_plugin_interface_t plugin_interface =
- {
- .create_plugin = create_plugin,
- .destroy_plugin = destroy_plugin,
- .add_text_display = add_text_display,
- .remove_text_display = remove_text_display,
- .show_splash_screen = show_splash_screen,
- .update_status = update_status,
- .on_boot_progress = on_boot_progress,
- .hide_splash_screen = hide_splash_screen,
- .display_normal = display_normal,
- .display_message = display_message,
- .display_password = display_password,
- .display_question = display_question,
+ static ply_boot_splash_plugin_interface_t plugin_interface = {
+ .create_plugin = create_plugin,
+ .destroy_plugin = destroy_plugin,
+ .add_text_display = add_text_display,
+ .remove_text_display = remove_text_display,
+ .show_splash_screen = show_splash_screen,
+ .update_status = update_status,
+ .on_boot_progress = on_boot_progress,
+ .hide_splash_screen = hide_splash_screen,
+ .display_normal = display_normal,
+ .display_message = display_message,
+ .display_password = display_password,
+ .display_question = display_question,
};
- return &plugin_interface;
+ return &plugin_interface;
}
/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/breeze-plymouth-5.21.5/breeze-text/ply-text-progress-bar.c
new/breeze-plymouth-5.22.0/breeze-text/ply-text-progress-bar.c
--- old/breeze-plymouth-5.21.5/breeze-text/ply-text-progress-bar.c
2021-05-04 13:47:32.000000000 +0200
+++ new/breeze-plymouth-5.22.0/breeze-text/ply-text-progress-bar.c
2021-06-03 15:57:54.000000000 +0200
@@ -1,6 +1,6 @@
/* fork. doesn't include os_string and draws all blocks white.
*
- * SPDX-FileCopyrightText: 2008 Red Hat Inc.
+ * SPDX-FileCopyrightText: 2008 Red Hat Inc.
* SPDX-FileContributor: Adam Jackson <a...@redhat.com>
* SPDX-FileContributor: Bill Nottingham <nott...@redhat.com>
* SPDX-FileContributor: Ray Strode <rstr...@redhat.com>
@@ -18,21 +18,21 @@
#include <math.h>
#include <signal.h>
#include <stdbool.h>
-#include <stdio.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <values.h>
#include <unistd.h>
+#include <values.h>
#include <wchar.h>
-#include <ply-text-display.h>
#include <ply-array.h>
#include <ply-logger.h>
+#include <ply-text-display.h>
#include <ply-utils.h>
#include <linux/kd.h>
@@ -45,161 +45,136 @@
static char *os_string;
-struct _breeze_text_progress_bar
-{
- ply_text_display_t *display;
+struct _breeze_text_progress_bar {
+ ply_text_display_t *display;
- int column, row;
- int number_of_rows;
- int number_of_columns;
+ int column, row;
+ int number_of_rows;
+ int number_of_columns;
- double percent_done;
- uint32_t is_hidden : 1;
+ double percent_done;
+ uint32_t is_hidden : 1;
};
-breeze_text_progress_bar_t *
-breeze_text_progress_bar_new (void)
+breeze_text_progress_bar_t *breeze_text_progress_bar_new(void)
{
- breeze_text_progress_bar_t *progress_bar;
+ breeze_text_progress_bar_t *progress_bar;
- progress_bar = calloc (1, sizeof (breeze_text_progress_bar_t));
+ progress_bar = calloc(1, sizeof(breeze_text_progress_bar_t));
- progress_bar->row = 0;
- progress_bar->column = 0;
- progress_bar->number_of_columns = 0;
- progress_bar->number_of_rows = 0;
+ progress_bar->row = 0;
+ progress_bar->column = 0;
+ progress_bar->number_of_columns = 0;
+ progress_bar->number_of_rows = 0;
- return progress_bar;
+ return progress_bar;
}
-void
-breeze_text_progress_bar_free (breeze_text_progress_bar_t *progress_bar)
+void breeze_text_progress_bar_free(breeze_text_progress_bar_t *progress_bar)
{
- if (progress_bar == NULL)
- return;
+ if (progress_bar == NULL)
+ return;
- free (progress_bar);
+ free(progress_bar);
}
-static void
-get_os_string (void)
+static void get_os_string(void)
{
- os_string = "";
+ os_string = "";
}
-void
-breeze_text_progress_bar_draw (breeze_text_progress_bar_t *progress_bar)
+void breeze_text_progress_bar_draw(breeze_text_progress_bar_t *progress_bar)
{
int i, width;
double brown_fraction, blue_fraction, white_fraction;
if (progress_bar->is_hidden)
- return;
+ return;
- width = progress_bar->number_of_columns - 2 - strlen (os_string);
+ width = progress_bar->number_of_columns - 2 - strlen(os_string);
- ply_text_display_set_cursor_position (progress_bar->display,
- progress_bar->column,
- progress_bar->row);
+ ply_text_display_set_cursor_position(progress_bar->display,
progress_bar->column, progress_bar->row);
- brown_fraction = - (progress_bar->percent_done *
progress_bar->percent_done) + 2 * progress_bar->percent_done;
- blue_fraction = progress_bar->percent_done;
+ brown_fraction = -(progress_bar->percent_done *
progress_bar->percent_done) + 2 * progress_bar->percent_done;
+ blue_fraction = progress_bar->percent_done;
white_fraction = progress_bar->percent_done * progress_bar->percent_done;
for (i = 0; i < width; i++) {
double f;
- f = (double) i / (double) width;
+ f = (double)i / (double)width;
if (f < white_fraction)
- ply_text_display_set_background_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_background_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
else if (f < blue_fraction)
- ply_text_display_set_background_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_background_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
else if (f < brown_fraction)
- ply_text_display_set_background_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_background_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
else
- break;
+ break;
- ply_text_display_write (progress_bar->display, "%c", ' ');
+ ply_text_display_write(progress_bar->display, "%c", ' ');
}
- ply_text_display_set_background_color (progress_bar->display,
- PLY_TERMINAL_COLOR_BLACK);
+ ply_text_display_set_background_color(progress_bar->display,
PLY_TERMINAL_COLOR_BLACK);
if (brown_fraction > 0.5) {
if (white_fraction > 0.875)
- ply_text_display_set_foreground_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_foreground_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
else if (blue_fraction > 0.66)
- ply_text_display_set_foreground_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_foreground_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
else
- ply_text_display_set_foreground_color (progress_bar->display,
- PLY_TERMINAL_COLOR_WHITE);
+ ply_text_display_set_foreground_color(progress_bar->display,
PLY_TERMINAL_COLOR_WHITE);
- ply_text_display_set_cursor_position (progress_bar->display,
- progress_bar->column + width,
- progress_bar->row);
+ ply_text_display_set_cursor_position(progress_bar->display,
progress_bar->column + width, progress_bar->row);
- ply_text_display_write (progress_bar->display, "%s", os_string);
+ ply_text_display_write(progress_bar->display, "%s", os_string);
- ply_text_display_set_foreground_color (progress_bar->display,
- PLY_TERMINAL_COLOR_DEFAULT);
+ ply_text_display_set_foreground_color(progress_bar->display,
PLY_TERMINAL_COLOR_DEFAULT);
}
}
-void
-breeze_text_progress_bar_show (breeze_text_progress_bar_t *progress_bar,
- ply_text_display_t *display)
+void breeze_text_progress_bar_show(breeze_text_progress_bar_t *progress_bar,
ply_text_display_t *display)
{
- assert (progress_bar != NULL);
+ assert(progress_bar != NULL);
- progress_bar->display = display;
+ progress_bar->display = display;
- progress_bar->number_of_rows = ply_text_display_get_number_of_rows (display);
- progress_bar->row = progress_bar->number_of_rows - 1;
- progress_bar->number_of_columns = ply_text_display_get_number_of_columns
(display);
- progress_bar->column = 2;
+ progress_bar->number_of_rows =
ply_text_display_get_number_of_rows(display);
+ progress_bar->row = progress_bar->number_of_rows - 1;
+ progress_bar->number_of_columns =
ply_text_display_get_number_of_columns(display);
+ progress_bar->column = 2;
- get_os_string ();
+ get_os_string();
- progress_bar->is_hidden = false;
+ progress_bar->is_hidden = false;
- breeze_text_progress_bar_draw (progress_bar);
+ breeze_text_progress_bar_draw(progress_bar);
}
-void
-breeze_text_progress_bar_hide (breeze_text_progress_bar_t *progress_bar)
+void breeze_text_progress_bar_hide(breeze_text_progress_bar_t *progress_bar)
{
- progress_bar->display = NULL;
- progress_bar->is_hidden = true;
+ progress_bar->display = NULL;
+ progress_bar->is_hidden = true;
}
-void
-breeze_text_progress_bar_set_percent_done (breeze_text_progress_bar_t
*progress_bar,
- double percent_done)
+void breeze_text_progress_bar_set_percent_done(breeze_text_progress_bar_t
*progress_bar, double percent_done)
{
- progress_bar->percent_done = percent_done;
+ progress_bar->percent_done = percent_done;
}
-double
-breeze_text_progress_bar_get_percent_done (breeze_text_progress_bar_t
*progress_bar)
+double breeze_text_progress_bar_get_percent_done(breeze_text_progress_bar_t
*progress_bar)
{
- return progress_bar->percent_done;
+ return progress_bar->percent_done;
}
-int
-breeze_text_progress_bar_get_number_of_columns (breeze_text_progress_bar_t
*progress_bar)
+int breeze_text_progress_bar_get_number_of_columns(breeze_text_progress_bar_t
*progress_bar)
{
- return progress_bar->number_of_columns;
+ return progress_bar->number_of_columns;
}
-int
-breeze_text_progress_bar_get_number_of_rows (breeze_text_progress_bar_t
*progress_bar)
+int breeze_text_progress_bar_get_number_of_rows(breeze_text_progress_bar_t
*progress_bar)
{
- return progress_bar->number_of_rows;
+ return progress_bar->number_of_rows;
}
/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/breeze-plymouth-5.21.5/breeze-text/ply-text-progress-bar.h
new/breeze-plymouth-5.22.0/breeze-text/ply-text-progress-bar.h
--- old/breeze-plymouth-5.21.5/breeze-text/ply-text-progress-bar.h
2021-05-04 13:47:32.000000000 +0200
+++ new/breeze-plymouth-5.22.0/breeze-text/ply-text-progress-bar.h
2021-06-03 15:57:54.000000000 +0200
@@ -1,6 +1,6 @@
/* ply-text-progress-bar.h - simple text based pulsing animation
*
- * SPDX-FileCopyrightText: 2008 Red Hat Inc.
+ * SPDX-FileCopyrightText: 2008 Red Hat Inc.
* SPDX-FileContributor: Adam Jackson <a...@redhat.com>
* SPDX-FileContributor: Bill Nottingham <nott...@redhat.com>
* SPDX-FileContributor: Ray Strode <rstr...@redhat.com>
@@ -21,21 +21,19 @@
typedef struct _breeze_text_progress_bar breeze_text_progress_bar_t;
#ifndef PLY_HIDE_FUNCTION_DECLARATIONS
-breeze_text_progress_bar_t *breeze_text_progress_bar_new (void);
-void breeze_text_progress_bar_free (breeze_text_progress_bar_t *progress_bar);
+breeze_text_progress_bar_t *breeze_text_progress_bar_new(void);
+void breeze_text_progress_bar_free(breeze_text_progress_bar_t *progress_bar);
-void breeze_text_progress_bar_draw (breeze_text_progress_bar_t *progress_bar);
-void breeze_text_progress_bar_show (breeze_text_progress_bar_t *progress_bar,
- ply_text_display_t *display);
-void breeze_text_progress_bar_hide (breeze_text_progress_bar_t *progress_bar);
+void breeze_text_progress_bar_draw(breeze_text_progress_bar_t *progress_bar);
+void breeze_text_progress_bar_show(breeze_text_progress_bar_t *progress_bar,
ply_text_display_t *display);
+void breeze_text_progress_bar_hide(breeze_text_progress_bar_t *progress_bar);
-void breeze_text_progress_bar_set_percent_done (breeze_text_progress_bar_t
*progress_bar,
- double percent_done);
+void breeze_text_progress_bar_set_percent_done(breeze_text_progress_bar_t
*progress_bar, double percent_done);
-double breeze_text_progress_bar_get_percent_done (breeze_text_progress_bar_t
*progress_bar);
+double breeze_text_progress_bar_get_percent_done(breeze_text_progress_bar_t
*progress_bar);
-int breeze_text_progress_bar_get_number_of_rows (breeze_text_progress_bar_t
*progress_bar);
-int breeze_text_progress_bar_get_number_of_columns (breeze_text_progress_bar_t
*progress_bar);
+int breeze_text_progress_bar_get_number_of_rows(breeze_text_progress_bar_t
*progress_bar);
+int breeze_text_progress_bar_get_number_of_columns(breeze_text_progress_bar_t
*progress_bar);
#endif
#endif /* BREEZE_TEXT_PULSER_H */
