mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 07/11] splash: add support to set a background color
Date: Wed, 12 Sep 2012 15:42:45 +0200	[thread overview]
Message-ID: <1347457369-9215-7-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1347457369-9215-1-git-send-email-plagnioj@jcrosoft.com>

This will allow to reset the screen to a default color when using transparent
PNG.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/splash.c |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/commands/splash.c b/commands/splash.c
index 88a6cf1..f40e3e1 100644
--- a/commands/splash.c
+++ b/commands/splash.c
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <fb.h>
 #include <image_renderer.h>
+#include <graphic_utils.h>
 
 static int do_splash(int argc, char *argv[])
 {
@@ -19,13 +20,19 @@ static int do_splash(int argc, char *argv[])
 	int startx = -1, starty = -1;
 	int xres, yres;
 	int offscreen = 0;
+	u32 bg_color = 0x00000000;
+	bool do_bg = false;
 	void *offscreenbuf = NULL;
 
-	while((opt = getopt(argc, argv, "f:x:y:o")) > 0) {
+	while((opt = getopt(argc, argv, "f:x:y:ob:")) > 0) {
 		switch(opt) {
 		case 'f':
 			fbdev = optarg;
 			break;
+		case 'b':
+			bg_color = simple_strtoul(optarg, NULL, 0);
+			do_bg = true;
+			break;
 		case 'x':
 			startx = simple_strtoul(optarg, NULL, 0);
 			break;
@@ -71,8 +78,14 @@ static int do_splash(int argc, char *argv[])
 
 		fbsize = xres * yres * (info.bits_per_pixel >> 3);
 		offscreenbuf = malloc(fbsize);
-		if (offscreenbuf)
-			memcpy(offscreenbuf, fb, fbsize);
+		if (offscreenbuf) {
+			if (do_bg)
+				memset_pixel(&info, offscreenbuf, bg_color, xres * yres);
+			else
+				memcpy(offscreenbuf, fb, fbsize);
+		}
+	} else if (do_bg) {
+		memset_pixel(&info, fb, bg_color, xres * yres);
 	}
 
 	if (image_renderer_file(&info, image_file, fb, startx, starty,
@@ -98,6 +111,7 @@ BAREBOX_CMD_HELP_SHORT("Show the bitmap FILE on the framebuffer.\n")
 BAREBOX_CMD_HELP_OPT  ("-f <fb>",   "framebuffer device (/dev/fb0)\n")
 BAREBOX_CMD_HELP_OPT  ("-x <xofs>", "x offset (default center)\n")
 BAREBOX_CMD_HELP_OPT  ("-y <yofs>", "y offset (default center)\n")
+BAREBOX_CMD_HELP_OPT  ("-b <color>", "background color in 0xttrrggbb\n")
 BAREBOX_CMD_HELP_OPT  ("-o",        "render offscreen\n")
 BAREBOX_CMD_HELP_END
 
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-09-12 13:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-12 13:24 [PATCH 00/11 v4] add PNG support Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42 ` [PATCH 01/11] bmp: rename it to splash Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` [PATCH 02/11] bmp: split bmp rending in lib/bmp.c Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:08     ` Sascha Hauer
2012-09-12 15:18       ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:24         ` Sascha Hauer
2012-09-12 13:42   ` [PATCH 03/11] Introduce graphic utils Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` [PATCH 04/11] introduce image_renderer framework Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` [PATCH 05/11] filetype: add BMP support Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:13     ` Sascha Hauer
2012-09-12 13:42   ` [PATCH 06/11] splash/bmp: switch to image_renderer Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-12 13:42   ` [PATCH 08/11] graphic_utils: add rgba support Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` [PATCH 09/11] filetype: add PNG support Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:14     ` Sascha Hauer
2012-09-12 13:42   ` [PATCH 10/11] " Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 13:42   ` [PATCH 11/11] png: add picoPNG lib support Jean-Christophe PLAGNIOL-VILLARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347457369-9215-7-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox