White background with OLPC logo
Bernardo Innocenti
bernie at codewiz.org
Tue Jun 5 11:39:42 EDT 2007
Jordan Crouse wrote:
>> I'm not attaching the patch because the OLPC logo as an
>> ASCII PPM file makes a big diff. Please pull from:
>
> Can you at least post the first patch, or move the tree to d.l.o
> so we can use the git web viewer? I don't have the wherewithall
> to download a new tree just for these two patches.
Here they are, both of them, except for the image data
that is anyway identical to the OFW logo, just sanitized
of jpeg ants and converted to PPM.
commit 83f6751670ea1e52648facc080dd81eaf3ea3490
Author: Bernardo Innocenti <bernie at codewiz.org>
Date: Tue Jun 5 07:33:33 2007 -0400
OLPC console logo
Works well with CONFIG_VT_BRIGHT_SCHEME.
Signed-off-by: Bernardo Innocenti <bernie at codewiz.org>
diff --git a/.config b/.config
index a553b49..15e0fbe 100644
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22-rc3
-# Wed May 30 01:21:00 2007
+# Tue Jun 5 07:15:01 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -1477,7 +1477,8 @@ CONFIG_FONT_SUN12x22=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_OLPC_CLUT224=y
#
# Sound
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 9397bce..1773f74 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -67,4 +67,9 @@ config LOGO_M32R_CLUT224
depends on M32R
default y
+config LOGO_OLPC_CLUT224
+ bool "224-color OLPC Linux logo"
+ depends on OLPC
+ default y
+
endif # LOGO
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index b985dfa..63a6248 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_OLPC_CLUT224) += logo_olpc_clut224.o
# How to generate logo's
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 80c0361..2e2c28f 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -33,6 +33,7 @@ extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224;
+extern const struct linux_logo logo_olpc_clut224;
const struct linux_logo *fb_find_logo(int depth)
@@ -101,6 +102,10 @@ const struct linux_logo *fb_find_logo(int depth)
/* M32R Linux logo */
logo = &logo_m32r_clut224;
#endif
+#ifdef CONFIG_LOGO_OLPC_CLUT224
+ /* OLPC Linux logo */
+ logo = &logo_olpc_clut224;
+#endif
}
return logo;
}
commit 88766510eb3943b2622f5235ae0def9455d17661
Author: Bernardo Innocenti <bernie at codewiz.org>
Date: Sun Jun 3 01:31:02 2007 -0400
black on white console color scheme
The penguin logo looks ugly with this scheme enabled
and needs to be either disabled or replaced.
diff --git a/.config b/.config
index 5b89bf9..408b709 100644
--- a/.config
+++ b/.config
@@ -1133,6 +1133,7 @@ CONFIG_SERIO_RAW=m
# Character devices
#
CONFIG_VT=y
+CONFIG_VT_BRIGHT_SCHEME=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d0c978f..f35c20e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -35,6 +35,17 @@ config VT
If unsure, say Y, or else you won't be able to do much with your new
shiny Linux system :-)
+config VT_BRIGHT_SCHEME
+ bool "Virtual terminal black on white color scheme"
+ depends on VT
+ default n
+ ---help---
+ Use by default a bright color scheme with black text on white background.
+
+ Say Y if you live in the 21st century. Say N for the traditional Linux
+ console colors.
+
+
config VT_CONSOLE
bool "Support for console on virtual terminal" if EMBEDDED
depends on VT
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 1bbb45b..9c5b8f2 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -926,13 +926,18 @@ void vc_deallocate(unsigned int currcons)
unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7,
8,12,10,14, 9,13,11,15 };
-/* the default colour table, for VGA+ colour systems */
-int default_red[] = {0x00,0xaa,0x00,0xaa,0x00,0xaa,0x00,0xaa,
- 0x55,0xff,0x55,0xff,0x55,0xff,0x55,0xff};
-int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa,
- 0x55,0x55,0xff,0xff,0x55,0x55,0xff,0xff};
-int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa,
- 0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff};
+#define CONFIG_VT_BRIGHT_SCHEME 1 // FIXME
+#ifdef CONFIG_VT_BRIGHT_SCHEME
+/* a modern, bright color scheme for the console */
+int default_red[] = {0xff,0x88,0x33,0x88,0x33,0x88,0x33,0x22,0x88,0xff,0x55,0xff,0x55,0xff,0x55,0x00};
+int default_grn[] = {0xff,0x33,0x88,0x66,0x33,0x33,0x88,0x22,0x88,0x55,0xff,0xff,0x55,0x55,0xff,0x00};
+int default_blu[] = {0xff,0x33,0x33,0x33,0x88,0x88,0x88,0x22,0x88,0x55,0x55,0x55,0xff,0xff,0xff,0x00};
+#else
+/* the default color table, for VGA+ color systems */
+int default_red[] = {0x00,0xaa,0x00,0xaa,0x00,0xaa,0x00,0xaa,0x55,0xff,0x55,0xff,0x55,0xff,0x55,0xff};
+int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa,0x55,0x55,0xff,0xff,0x55,0x55,0xff,0xff};
+int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa,0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff};
+#endif
/*
* gotoxy() must verify all boundaries, because the arguments
--
// Bernardo Innocenti
\X/ http://www.codewiz.org/
More information about the Devel
mailing list