From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 9 Dec 2013 15:32:42 +0000 (+0000)
Subject: [vesafb] Set "magic" colour to transparent when a background picture is used
X-Git-Tag: v1.20.1~1309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f0173b5c8ac6de9e9fa8115e37357c2aeb88101;p=thirdparty%2Fipxe.git

[vesafb] Set "magic" colour to transparent when a background picture is used

Use the magic colour facility to cause the user interface background
to become transparent when we have a background picture.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/i386/interface/pcbios/vesafb.c
index 8fc6f3d41..557f9017b 100644
--- a/src/arch/i386/interface/pcbios/vesafb.c
+++ b/src/arch/i386/interface/pcbios/vesafb.c
@@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <ipxe/console.h>
 #include <ipxe/io.h>
+#include <ipxe/ansicol.h>
 #include <ipxe/fbcon.h>
 #include <ipxe/vesafb.h>
 #include <config/console.h>
@@ -462,6 +463,7 @@ static int vesafb_configure ( struct console_configuration *config ) {
 	if ( ! vesafb_console.disabled ) {
 		vesafb_fini();
 		bios_console.disabled &= ~CONSOLE_DISABLED_OUTPUT;
+		ansicol_reset_magic();
 	}
 	vesafb_console.disabled = CONSOLE_DISABLED;
 
@@ -480,6 +482,10 @@ static int vesafb_configure ( struct console_configuration *config ) {
 	vesafb_console.disabled = 0;
 	bios_console.disabled |= CONSOLE_DISABLED_OUTPUT;
 
+	/* Set magic colour to transparent if we have a background picture */
+	if ( config->pixbuf )
+		ansicol_set_magic_transparent();
+
 	return 0;
 }