root/pbsplash
1
0
Fork 0
mirror of https://git.sr.ht/~calebccff/pbsplash synced 2026-01-12 20:48:40 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add argument to disable animation

Browse source 
For displaying error messages, let's not show the loading animation.
This commit is contained in:
Oliver Smith 2022-07-31 21:10:11 +02:00 committed by Caleb Connolly
parent 1ab85c2a33
commit 85fc1c0a41
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pbsplash.c
View file

@ -51,7 +51,7 @@ int usage()
fprintf(stderr, "-------------------------------------------\n"); fprintf(stderr, "-------------------------------------------\n");
fprintf(stderr, "pbsplash [-v] [-h] [-f font] [-s splash image] [-m message]\n"); fprintf(stderr, "pbsplash [-v] [-h] [-f font] [-s splash image] [-m message]\n");
fprintf(stderr, " [-b message bottom] [-o font size bottom]\n"); fprintf(stderr, " [-b message bottom] [-o font size bottom]\n");
fprintf(stderr, " [-p font size] [-q max logo size] [-d]\n\n"); fprintf(stderr, " [-p font size] [-q max logo size] [-d] [-e]\n\n");
fprintf(stderr, " -v enable verbose logging\n"); fprintf(stderr, " -v enable verbose logging\n");
fprintf(stderr, " -h show this help\n"); fprintf(stderr, " -h show this help\n");
fprintf(stderr, " -f path to SVG font file (default: %s)\n", DEFAULT_FONT_PATH); fprintf(stderr, " -f path to SVG font file (default: %s)\n", DEFAULT_FONT_PATH);
@ -62,6 +62,7 @@ int usage()
fprintf(stderr, " -p font size in pt (default: %d)\n", FONT_SIZE_PT); fprintf(stderr, " -p font size in pt (default: %d)\n", FONT_SIZE_PT);
fprintf(stderr, " -q max logo size in mm (default: %d)\n", LOGO_SIZE_MAX_MM); fprintf(stderr, " -q max logo size in mm (default: %d)\n", LOGO_SIZE_MAX_MM);
fprintf(stderr, " -d custom DPI (for testing)\n"); fprintf(stderr, " -d custom DPI (for testing)\n");
fprintf(stderr, " -e error (no loading animation)\n");
// clang-format on // clang-format on
return 1; return 1;
@ -220,6 +221,7 @@ int main(int argc, char **argv)
float logo_size_max = LOGO_SIZE_MAX_MM; float logo_size_max = LOGO_SIZE_MAX_MM;
int optflag; int optflag;
long dpi = 0; long dpi = 0;
bool animation = true;
memset(active_tty, '\0', TTY_PATH_LEN); memset(active_tty, '\0', TTY_PATH_LEN);
strcat(active_tty, "/dev/"); strcat(active_tty, "/dev/");
@ -229,7 +231,7 @@ int main(int argc, char **argv)
sigaction(SIGTERM, &action, NULL); sigaction(SIGTERM, &action, NULL);
sigaction(SIGINT, &action, NULL); sigaction(SIGINT, &action, NULL);
while ((optflag = getopt(argc, argv, "hvf:s:m:b:o:p:q:d:")) != -1) { while ((optflag = getopt(argc, argv, "hvf:s:m:b:o:p:q:d:e")) != -1) {
char *end = NULL; char *end = NULL;
switch (optflag) { switch (optflag) {
case 'h': case 'h':
@ -281,6 +283,9 @@ int main(int argc, char **argv)
return usage(); return usage();
} }
break; break;
case 'e':
animation = false;
break;
default: default:
return usage(); return usage();
} }
@ -412,6 +417,10 @@ int main(int argc, char **argv)
int tty = open(active_tty, O_RDWR); int tty = open(active_tty, O_RDWR);
float y_off = y + image_h + MM_TO_PX(dpi, 5); float y_off = y + image_h + MM_TO_PX(dpi, 5);
while (!terminate) { while (!terminate) {
if (!animation) {
sleep(1);
continue;
}
animate_frame(frame++, screenWidth, y_off, dpi); animate_frame(frame++, screenWidth, y_off, dpi);
tfb_flush_fb(); tfb_flush_fb();
} }