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

Commit 33ac9dba authored by Maarten ter Huurne's avatar Maarten ter Huurne Committed by Tomi Valkeinen
Browse files

fonts: Add 6x10 font 



This font is suitable for framebuffer consoles on devices with a
320x240 screen, to get a reasonable number of characters (53x24) that
are still at a readable size.

The font is derived from the existing 6x11 font, but gets 3 extra
lines without sacrificing readability. Also I redesigned a some glyhps
so they are more distinct and better fill the available space.

Signed-off-by: default avatarMaarten ter Huurne <maarten@treewalker.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 422b67e0

include/linux/font.h

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct font_desc { 
#define SUN12x22_IDX	7

#define ACORN8x8_IDX	8

#define	MINI4x6_IDX	9

#define FONT6x10_IDX	10



extern const struct font_desc	font_vga_8x8,

			font_vga_8x16,
@@ -41,7 +42,8 @@ extern const struct font_desc font_vga_8x8, 
			font_sun_8x16,

			font_sun_12x22,

			font_acorn_8x8,

			font_mini_4x6;

			font_mini_4x6,

			font_6x10;



/* Find a font with a specific name */

lib/fonts/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,14 @@ config FONT_MINI_4x6 
	bool "Mini 4x6 font"

	depends on !SPARC && FONTS



config FONT_6x10

	bool "Medium-size 6x10 font"

	depends on !SPARC && FONTS

	help

	  Medium-size console font. Suitable for framebuffer consoles on

	  embedded devices with a 320x240 screen, to get a reasonable number

	  of characters (53x24) that are still at a readable size.



config FONT_SUN8x16

	bool "Sparc console 8x16 font"

	depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
@@ -109,6 +117,7 @@ config FONT_AUTOSELECT 
	depends on !FONT_PEARL_8x8

	depends on !FONT_ACORN_8x8

	depends on !FONT_MINI_4x6

	depends on !FONT_6x10

	depends on !FONT_SUN8x16

	depends on !FONT_SUN12x22

	depends on !FONT_10x18

lib/fonts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 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

font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o



font-objs += $(font-objs-y)

lib/fonts/font_6x10.c

0 → 100644
+3086 −0

File added.

Preview size limit exceeded, changes collapsed.

lib/fonts/fonts.c

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ static const struct font_desc *fonts[] = { 
#undef NO_FONTS

    &font_mini_4x6,

#endif

#ifdef CONFIG_FONT_6x10

#undef NO_FONTS

    &font_6x10,

#endif

};



#define num_fonts ARRAY_SIZE(fonts)