Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 303b86d9 authored by Jurriaan's avatar Jurriaan Committed by Linus Torvalds
Browse files

[PATCH] New framebuffer fonts + updated 12x22 font available 



Improve the fonts for use with the framebuffer.

I've added all the characters marked 'FIXME' in the sun12x22 font and
created a 10x18 font (based on the sun12x22 font) and a 7x14 font (based
on the vga8x16 font).

This patch is non-intrusive, no options are enabled by default so most
users won't notice a thing.

I am placing my changes under the GPL, however, I've not seen any copyright
notices on the sun12x22 font and the vga8x16 font which I derived my new
fonts from so I don't know what the copyright status is.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d5881eb4

drivers/video/console/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -153,6 +153,15 @@ config FONT_6x11 
	  Small console font with Macintosh-style high-half glyphs.  Some Mac

	  framebuffer drivers don't support this one at all.



config FONT_7x14

	bool "console 7x14 font (not supported by all drivers)" if FONTS

	depends on FRAMEBUFFER_CONSOLE

	default y if !SPARC32 && !SPARC64 && !FONTS

	help

	  Console font with characters just a bit smaller than the default.

	  If the standard 8x16 font is a little too big for you, say Y.

	  Otherwise, say N.



config FONT_PEARL_8x8

	bool "Pearl (old m68k) console 8x8 font" if FONTS

	depends on FRAMEBUFFER_CONSOLE
@@ -187,5 +196,13 @@ config FONT_SUN12x22 
	  big letters (like the letters used in the SPARC PROM). If the

	  standard font is unreadable for you, say Y, otherwise say N.



config FONT_10x18

	bool "console 10x18 font (not supported by all drivers)"

	depends on FONTS

	help

	  This is a high resolution console font for machines with very

	  big letters. It fits between the sun 12x22 and the normal 8x16 font.

	  If other fonts are too big or too small for you, say Y, otherwise say N.



endmenu

drivers/video/console/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ font-objs-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o 
font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o

font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o

font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o

font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o

font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o

font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o

font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o

font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o

drivers/video/console/font_10x18.c

0 → 100644
+5146 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/video/console/font_7x14.c

0 → 100644
+4118 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/video/console/font_sun12x22.c

+762 −817

File changed.

Preview size limit exceeded, changes collapsed.