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

it's ready?!

Browse source
This commit is contained in:
Caleb Connolly 2022-03-12 23:01:53 +00:00
parent ec1bfbd2fd
commit 6d899d9971
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
2 changed files with 94 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/animate.c
View file

@ -8,20 +8,45 @@ struct col color = {.r = 255, .g = 255, .b = 255, .a = 255};
// FIXME: calculate constants based on display size/resolution // FIXME: calculate constants based on display size/resolution
#define PI 3.1415926535897932384626433832795
#define n_circles 5 #define n_circles 5
#define amplitude 40 #define amplitude 40
#define rad 12 #define rad 12
void animate_frame(int frame, int w, int y_off) #define speed 3
{
void circles_wave(int frame, int w, int y_off) {
unsigned int t_col = tfb_make_color(color.r, color.g, color.b); unsigned int t_col = tfb_make_color(color.r, color.g, color.b);
int f = frame * speed;
for (unsigned int i = 0; i < n_circles; i++) for (unsigned int i = 0; i < n_circles; i++)
{ {
int c_dist = w * 0.05; int c_dist = w * 0.05;
int x = i * c_dist + w / 2 - c_dist * n_circles / 2.f; int x = i * c_dist + w / 2 - c_dist * n_circles / 2.f;
double s = sin(frame / 30.0 * 3.1415 + i * 0.5); double s = sin(f / 60.0 * PI + i * 0.2 * n_circles);
int y = y_off + s * amplitude; int y = y_off + s * amplitude;
tfb_fill_rect(x - rad- 1, y_off - amplitude - rad, rad* 2 + 2, 400 +rad* 2, tfb_black); tfb_fill_rect(x - rad- 1, y_off - amplitude - rad, rad* 2 + 2, 400 +rad* 2, tfb_black);
tfb_fill_circle(x, y, rad, t_col); tfb_fill_circle(x, y, rad, t_col);
} }
} }
void circles_wave_1x1(int frame, int w, int y_off) {
unsigned int t_col = tfb_make_color(color.r, color.g, color.b);
int f = -frame * speed;
int which = (f / 120) % n_circles;
for (unsigned int i = 0; i < n_circles; i++)
{
int c_dist = w * 0.05;
int x = i * c_dist + w / 2 - c_dist * n_circles / 2.f;
double s = sin((f - 90) / 60.0 * PI);
int y = y_off + (i == which ? s * amplitude : amplitude); // * (i == which);
tfb_fill_rect(x - rad- 1, y_off - amplitude - rad, rad * 2 + 2, 400 + rad * 2, tfb_black);
tfb_fill_circle(x, y, rad, t_col);
}
}
void animate_frame(int frame, int w, int y_off)
{
circles_wave(frame, w, y_off - 200);
//circles_wave_1x1(frame, w, y_off + 100);
}

89
src/pbsplash.c
View file

@ -4,6 +4,8 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h>
#include <linux/kd.h>
#include <fcntl.h> #include <fcntl.h>
#include <tfblib/tfblib.h> #include <tfblib/tfblib.h>
#include <tfblib/tfb_colors.h> #include <tfblib/tfb_colors.h>
@ -21,7 +23,7 @@
#define MSG_MAX_LEN 4096 #define MSG_MAX_LEN 4096
#define DEFAULT_FONT_PATH "/usr/share/pbsplash/OpenSans-Regular.svg" #define DEFAULT_FONT_PATH "/usr/share/pbsplash/OpenSans-Regular.svg"
#define LOGO_SIZE_MAX_MM 90 #define LOGO_SIZE_MAX_MM 90
#define FONT_SIZE_PT 13 #define FONT_SIZE_PT 9
#define PT_TO_MM 0.38f #define PT_TO_MM 0.38f
#define TTY_PATH_LEN 11 #define TTY_PATH_LEN 11
@ -32,7 +34,12 @@ volatile sig_atomic_t terminate = 0;
bool debug = true; bool debug = true;
struct col background_color = {.r = 0, .g = 0, .b = 0, .a = 255}; struct col background_color = {.r = 0, .g = 0, .b = 0, .a = 255};
#define LOG(fmt, ...) do { if (debug) fprintf(stdout, fmt, ##__VA_ARGS__); } while (0) #define LOG(fmt, ...) \
do \
{ \
if (debug) \
fprintf(stdout, fmt, ##__VA_ARGS__); \
} while (0)
int usage() int usage()
{ {
@ -55,30 +62,37 @@ void term(int signum)
terminate = 1; terminate = 1;
} }
static void blit_buf(unsigned char* buf, int x, int y, int w, int h, bool vflip, bool redraw) static void blit_buf(unsigned char *buf, int x, int y, int w, int h, bool vflip, bool redraw)
{ {
unsigned int bg_col = tfb_make_color(background_color.r, background_color.g, background_color.b); struct col prev_col = {.r = 0, .g = 0, .b = 0, .a = 0};
unsigned int col; unsigned int col = tfb_make_color(background_color.r, background_color.g, background_color.b);
for (size_t i = 0; i < w; i++) for (size_t i = 0; i < w; i++)
{ {
for (size_t j = 0; j < h; j++) for (size_t j = 0; j < h; j++)
{ {
#if DEBUGRENDER == 1 #if DEBUGRENDER == 1
if (i == 0 || i == w - 1 || j == 0 || j == h-1) { if (i == 0 || i == w - 1 || j == 0 || j == h - 1)
{
tfb_draw_pixel(x + i, y + h - j, tfb_red); tfb_draw_pixel(x + i, y + h - j, tfb_red);
continue; continue;
} }
#endif #endif
struct col rgba = *(struct col *)(buf + (j * w + i) * 4); struct col rgba = *(struct col *)(buf + (j * w + i) * 4);
if (!redraw && rgba.a == 0) if (rgba.a == 0 || rgba.rgba == background_color.rgba)
continue; continue;
if (redraw && rgba.a == 0) { // Alpha blending
col = bg_col; if (rgba.a != 255)
} else { {
rgba.r = (rgba.r * rgba.a + background_color.r * (255 - rgba.a)) >> 8; rgba.r = (rgba.r * rgba.a + background_color.r * (255 - rgba.a)) >> 8;
rgba.g = (rgba.g * rgba.a + background_color.g * (255 - rgba.a)) >> 8; rgba.g = (rgba.g * rgba.a + background_color.g * (255 - rgba.a)) >> 8;
rgba.b = (rgba.b * rgba.a + background_color.b * (255 - rgba.a)) >> 8; rgba.b = (rgba.b * rgba.a + background_color.b * (255 - rgba.a)) >> 8;
}
// No need to generate the colour again if it's the same as the previous one
if (rgba.rgba != prev_col.rgba) {
prev_col.rgba = rgba.rgba;
col = tfb_make_color(rgba.r, rgba.g, rgba.b); col = tfb_make_color(rgba.r, rgba.g, rgba.b);
} }
if (vflip) if (vflip)
@ -93,7 +107,6 @@ static void draw_svg(NSVGimage *image, int x, int y, int w, int h)
{ {
float sz = (int)((float)w / (float)image->width * 100.f) / 100.f; float sz = (int)((float)w / (float)image->width * 100.f) / 100.f;
LOG("draw_svg: %dx%d, %dx%d, %f\n", x, y, w, h, sz); LOG("draw_svg: %dx%d, %dx%d, %f\n", x, y, w, h, sz);
//sz = 1.5;
NSVGrasterizer *rast = nsvgCreateRasterizer(); NSVGrasterizer *rast = nsvgCreateRasterizer();
unsigned char *img = malloc(w * h * 4); unsigned char *img = malloc(w * h * 4);
nsvgRasterize(rast, image, 0, 0, sz, img, w, h, w * 4); nsvgRasterize(rast, image, 0, 0, sz, img, w, h, w * 4);
@ -140,9 +153,12 @@ static void getTextDimensions(NSVGimage *font, char *text, float scale, int *wid
for (i = 0; i < strlen(text); i++) for (i = 0; i < strlen(text); i++)
{ {
NSVGshape *shape = shapes[i]; NSVGshape *shape = shapes[i];
if (shape) { if (shape)
{
*width += (float)shapes[i]->horizAdvX * scale + 0.5; *width += (float)shapes[i]->horizAdvX * scale + 0.5;
} else { }
else
{
*width += font->defaultHorizAdv * scale; *width += font->defaultHorizAdv * scale;
} }
} }
@ -157,8 +173,8 @@ int main(int argc, char **argv)
char *splash_image = NULL; char *splash_image = NULL;
char *font_path = DEFAULT_FONT_PATH; char *font_path = DEFAULT_FONT_PATH;
char active_tty[TTY_PATH_LEN + 1]; char active_tty[TTY_PATH_LEN + 1];
NSVGimage *image; NSVGimage *image = NULL;
NSVGimage *font; NSVGimage *font = NULL;
struct sigaction action; struct sigaction action;
float font_size = FONT_SIZE_PT; float font_size = FONT_SIZE_PT;
int optflag; int optflag;
@ -167,7 +183,6 @@ int main(int argc, char **argv)
memset(active_tty, '\0', TTY_PATH_LEN); memset(active_tty, '\0', TTY_PATH_LEN);
strcat(active_tty, "/dev/"); strcat(active_tty, "/dev/");
memset(&action, 0, sizeof(action)); memset(&action, 0, sizeof(action));
action.sa_handler = term; action.sa_handler = term;
sigaction(SIGTERM, &action, NULL); sigaction(SIGTERM, &action, NULL);
@ -222,7 +237,7 @@ int main(int argc, char **argv)
FILE *fp = fopen("/sys/devices/virtual/tty/tty0/active", "r"); FILE *fp = fopen("/sys/devices/virtual/tty/tty0/active", "r");
int len = strlen(active_tty); int len = strlen(active_tty);
char *ptr = active_tty + len; char *ptr = active_tty + len;
if(fp != NULL) if (fp != NULL)
{ {
fgets(ptr, TTY_PATH_LEN - len, fp); fgets(ptr, TTY_PATH_LEN - len, fp);
*(ptr + strlen(ptr) - 1) = '\0'; *(ptr + strlen(ptr) - 1) = '\0';
@ -250,17 +265,23 @@ int main(int argc, char **argv)
{ {
w_mm = w / (float)dpi * 25.4; w_mm = w / (float)dpi * 25.4;
h_mm = h / (float)dpi * 25.4; h_mm = h / (float)dpi * 25.4;
} else { }
else
{
dpi = (float)w / (float)w_mm * 25.4; dpi = (float)w / (float)w_mm * 25.4;
} }
int pixels_per_milli = (float)w / (float)w_mm; int pixels_per_milli = (float)w / (float)w_mm;
float logo_size_px = (float)(w < h ? w : h) * 0.75f; float logo_size_px = (float)(w < h ? w : h) * 0.75f;
if (w_mm > 0 && h_mm > 0) { if (w_mm > 0 && h_mm > 0)
if (w_mm < h_mm) { {
if (w_mm < h_mm)
{
if (w_mm > (float)LOGO_SIZE_MAX_MM * 1.2f) if (w_mm > (float)LOGO_SIZE_MAX_MM * 1.2f)
logo_size_px = (float)LOGO_SIZE_MAX_MM * pixels_per_milli; logo_size_px = (float)LOGO_SIZE_MAX_MM * pixels_per_milli;
} else { }
else
{
if (h_mm > (float)LOGO_SIZE_MAX_MM * 1.2f) if (h_mm > (float)LOGO_SIZE_MAX_MM * 1.2f)
logo_size_px = (float)LOGO_SIZE_MAX_MM * pixels_per_milli; logo_size_px = (float)LOGO_SIZE_MAX_MM * pixels_per_milli;
} }
@ -289,7 +310,8 @@ int main(int argc, char **argv)
draw_svg(image, x, y, image_w, image_h); draw_svg(image, x, y, image_w, image_h);
if (message) { if (message)
{
int textWidth, textHeight; int textWidth, textHeight;
font = nsvgParseFromFile(font_path, "px", 512); font = nsvgParseFromFile(font_path, "px", 512);
@ -302,8 +324,6 @@ int main(int argc, char **argv)
float fontsz = ((float)font_size * PT_TO_MM) / (font->fontAscent - font->fontDescent) * pixels_per_milli; float fontsz = ((float)font_size * PT_TO_MM) / (font->fontAscent - font->fontDescent) * pixels_per_milli;
//fontsz = 0.1;
getTextDimensions(font, message, fontsz, &textWidth, &textHeight); getTextDimensions(font, message, fontsz, &textWidth, &textHeight);
int tx = w / 2.f - textWidth / 2.f; int tx = w / 2.f - textWidth / 2.f;
@ -315,20 +335,25 @@ int main(int argc, char **argv)
tfb_flush_window(); tfb_flush_window();
tfb_flush_fb(); tfb_flush_fb();
#define ANIM_HEIGHT 600 #define ANIM_HEIGHT 600
//unsigned char* animation_buf = malloc(w * ANIM_HEIGHT * 4);
int frame = 0; int frame = 0;
int tty = open(active_tty, O_RDWR);
int tty_mode = 0;
while (!terminate) while (!terminate)
{ {
//printf("FRAME: %d\n", frame); animate_frame(frame++, w, h * 0.8);
animate_frame(frame++, w, y + image_h + 500);
//blit_buf(animation_buf, 0, y + image_h + 200, w, ANIM_HEIGHT, false, true);
//memset(animation_buf, 0, w * ANIM_HEIGHT * 4);
//tfb_flush_window();
tfb_flush_fb(); tfb_flush_fb();
//usleep(1666); ioctl(tty, KDGETMODE, &tty_mode);
// Login started and has reset the TTY back to text mode
if (tty_mode == KD_TEXT)
{
// tfb_flush_window();
draw_svg(image, x, y, image_w, image_h);
goto out;
}
// usleep(1666);
} }
//free(animation_buf); // free(animation_buf);
out: out:
nsvgDelete(font); nsvgDelete(font);