303b86d991
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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
57 lines
1.1 KiB
C
57 lines
1.1 KiB
C
/*
|
|
* font.h -- `Soft' font definitions
|
|
*
|
|
* Created 1995 by Geert Uytterhoeven
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef _VIDEO_FONT_H
|
|
#define _VIDEO_FONT_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct font_desc {
|
|
int idx;
|
|
char *name;
|
|
int width, height;
|
|
void *data;
|
|
int pref;
|
|
};
|
|
|
|
#define VGA8x8_IDX 0
|
|
#define VGA8x16_IDX 1
|
|
#define PEARL8x8_IDX 2
|
|
#define VGA6x11_IDX 3
|
|
#define FONT7x14_IDX 4
|
|
#define FONT10x18_IDX 5
|
|
#define SUN8x16_IDX 6
|
|
#define SUN12x22_IDX 7
|
|
#define ACORN8x8_IDX 8
|
|
#define MINI4x6_IDX 9
|
|
|
|
extern struct font_desc font_vga_8x8,
|
|
font_vga_8x16,
|
|
font_pearl_8x8,
|
|
font_vga_6x11,
|
|
font_7x14,
|
|
font_10x18,
|
|
font_sun_8x16,
|
|
font_sun_12x22,
|
|
font_acorn_8x8,
|
|
font_mini_4x6;
|
|
|
|
/* Find a font with a specific name */
|
|
|
|
extern struct font_desc *find_font(char *name);
|
|
|
|
/* Get the default font for a specific screen size */
|
|
|
|
extern struct font_desc *get_default_font(int xres, int yres);
|
|
|
|
/* Max. length for the name of a predefined font */
|
|
#define MAX_FONT_NAME 32
|
|
|
|
#endif /* _VIDEO_FONT_H */
|