1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 1419578..e920c06 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -9,6 +9,7 @@
* - put somewhere fbsplash.cfg file and an image in .ppm format.
* - run applet: $ setsid fbsplash [params] &
* -c: hide cursor
+ * -b: fill background with the color of top left pixel of image
* -d /dev/fbN: framebuffer device (if not /dev/fb0)
* -s path_to_image_file (can be "-" for stdin)
* -i path_to_cfg_file
@@ -47,10 +48,11 @@
//kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o
//usage:#define fbsplash_trivial_usage
-//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
+//usage: "-s IMGFILE [-c] [-b] [-d DEV] [-i INIFILE] [-f CMD]"
//usage:#define fbsplash_full_usage "\n\n"
//usage: " -s Image"
//usage: "\n -c Hide cursor"
+//usage: "\n -b Fill background with color of top left pixel of image"
//usage: "\n -d Framebuffer device (default /dev/fb0)"
//usage: "\n -i Config file (var=value):"
//usage: "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT"
@@ -82,6 +84,7 @@ struct globals {
unsigned red_shift;
unsigned green_shift;
unsigned blue_shift;
+ bool bfill_background;
};
#define G (*ptr_to_globals)
#define INIT_G() do { \
@@ -369,6 +372,23 @@ static void fb_drawprogressbar(unsigned percent)
G.nbar_colr, G.nbar_colg, G.nbar_colb);
}
+/**
+ * Fill screen around image with given color
+ */
+static void fb_fillbackground(unsigned char* pixel, const int xoffset, const int yoffset, const int width, const int height)
+{
+ int i, j;
+ unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
+
+ for (j = 0; j < G.scr_var.yres; j++) {
+ unsigned char *src = G.addr + j * G.scr_fix.line_length;
+
+ for (i = 0; i < G.scr_var.xres; i++) {
+ if ((j < yoffset || j >= yoffset + height) || (i < xoffset || i >= xoffset + width))
+ fb_write_pixel(src + i * G.bytes_per_pixel, thispix);
+ }
+ }
+}
/**
* Draw image from PPM file
@@ -440,6 +460,10 @@ static void fb_drawimage(void)
bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
pixel = pixline;
src = G.addr + (G.img_posy + j) * G.scr_fix.line_length + G.img_posx * G.bytes_per_pixel;
+
+ if (G.bfill_background && j == 0)
+ fb_fillbackground(pixel, G.img_posx, G.img_posy, width, height);
+
for (i = 0; i < width; i++) {
unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
fb_write_pixel(src, thispix);
@@ -496,6 +520,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
FILE *fp = fp; // for compiler
char *num_buf;
unsigned num;
+ unsigned optret;
bool bCursorOff;
INIT_G();
@@ -504,8 +529,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
fb_device = "/dev/fb0";
cfg_filename = NULL;
fifo_filename = NULL;
- bCursorOff = 1 & getopt32(argv, "cs:d:i:f:",
+ optret = getopt32(argv, "cbs:d:i:f:",
&G.image_filename, &fb_device, &cfg_filename, &fifo_filename);
+ bCursorOff = 1 & optret;
+ G.bfill_background = 2 & optret;
// parse configuration file
if (cfg_filename)
|
