yoctoproject/psplash
1
0
Fork 0
mirror of https://git.yoctoproject.org/psplash synced 2025-10-14 02:07:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add configure options to disable progress bar

Browse Source 
Progress bar can overlap with products logos, added
--disable-progress-bar configure option to disable progress
bar completely without patching the code.
Default behaviour is to show progress bar

Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pavel Zhukov
2021-10-14 08:28:38 +02:00
committed by Richard Purdie
parent fdbd111d6b
commit 44afb7506d
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -37,6 +37,14 @@ AS_IF([test x$disable_startup_msg = xtrue], [
EXTRA_GCC_FLAGS="$EXTRA_GCC_FLAGS -DPSPLASH_DISABLE_STARTUP_MSG" EXTRA_GCC_FLAGS="$EXTRA_GCC_FLAGS -DPSPLASH_DISABLE_STARTUP_MSG"
]) ])
AC_ARG_ENABLE([progress-bar],
AS_HELP_STRING([--disable-progress-bar], [Disable progress bar]),
[disable_progress_bar=true],
[disable_progress_bar=false])
AS_IF([test x$disable_progress_bar = xtrue], [
EXTRA_GCC_FLAGS="$EXTRA_GCC_FLAGS -DPSPLASH_DISABLE_PROGRESS_BAR"
])
AC_ARG_ENABLE([img-fullscreen], AC_ARG_ENABLE([img-fullscreen],
AS_HELP_STRING([--enable-img-fullscreen], [Enable the logo image in fullscreen mode)]), AS_HELP_STRING([--enable-img-fullscreen], [Enable the logo image in fullscreen mode)]),
[img_fullscreen=true], [img_fullscreen=true],

5
psplash-config.h
View File

@@ -21,6 +21,11 @@
#define PSPLASH_IMG_FULLSCREEN 0 #define PSPLASH_IMG_FULLSCREEN 0
#endif #endif
/* Bool indicated if the progress bar should be disabled */
#ifndef PSPLASH_DISABLE_PROGRESS_BAR
#define PSPLASH_SHOW_PROGRESS_BAR 1
#endif
/* Position of the image split from top edge, numerator of fraction */ /* Position of the image split from top edge, numerator of fraction */
#define PSPLASH_IMG_SPLIT_NUMERATOR 5 #define PSPLASH_IMG_SPLIT_NUMERATOR 5

22
psplash.c
View File

@@ -61,6 +61,7 @@ psplash_draw_msg (PSplashFB *fb, const char *msg)
msg); msg);
} }
#ifdef PSPLASH_SHOW_PROGRESS_BAR
void void
psplash_draw_progress (PSplashFB *fb, int value) psplash_draw_progress (PSplashFB *fb, int value)
{ {
@@ -95,6 +96,7 @@ psplash_draw_progress (PSplashFB *fb, int value)
DBG("value: %i, width: %i, barwidth :%i\n", value, DBG("value: %i, width: %i, barwidth :%i\n", value,
width, barwidth); width, barwidth);
} }
#endif /* PSPLASH_SHOW_PROGRESS_BAR */
static int static int
parse_command (PSplashFB *fb, char *string) parse_command (PSplashFB *fb, char *string)
@@ -108,20 +110,22 @@ parse_command (PSplashFB *fb, char *string)
command = strtok(string," "); command = strtok(string," ");
if (!strcmp(command,"PROGRESS")) if (!strcmp(command,"MSG"))
{
char *arg = strtok(NULL, "\0");
if (arg)
psplash_draw_progress (fb, atoi(arg));
}
else if (!strcmp(command,"MSG"))
{ {
char *arg = strtok(NULL, "\0"); char *arg = strtok(NULL, "\0");
if (arg) if (arg)
psplash_draw_msg (fb, arg); psplash_draw_msg (fb, arg);
} }
#ifdef PSPLASH_SHOW_PROGRESS_BAR
else if (!strcmp(command,"PROGRESS"))
{
char *arg = strtok(NULL, "\0");
if (arg)
psplash_draw_progress (fb, atoi(arg));
}
#endif
else if (!strcmp(command,"QUIT")) else if (!strcmp(command,"QUIT"))
{ {
return 1; return 1;
@@ -311,6 +315,7 @@ main (int argc, char** argv)
POKY_IMG_ROWSTRIDE, POKY_IMG_ROWSTRIDE,
POKY_IMG_RLE_PIXEL_DATA); POKY_IMG_RLE_PIXEL_DATA);
#ifdef PSPLASH_SHOW_PROGRESS_BAR
/* Draw progress bar border */ /* Draw progress bar border */
psplash_fb_draw_image (fb, psplash_fb_draw_image (fb,
(fb->width - BAR_IMG_WIDTH)/2, (fb->width - BAR_IMG_WIDTH)/2,
@@ -322,6 +327,7 @@ main (int argc, char** argv)
BAR_IMG_RLE_PIXEL_DATA); BAR_IMG_RLE_PIXEL_DATA);
psplash_draw_progress (fb, 0); psplash_draw_progress (fb, 0);
#endif
#ifdef PSPLASH_STARTUP_MSG #ifdef PSPLASH_STARTUP_MSG
psplash_draw_msg (fb, PSPLASH_STARTUP_MSG); psplash_draw_msg (fb, PSPLASH_STARTUP_MSG);