Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leave font selection to 'rasops' until 'rasops1' has been completed and can 

handle non {8,16} pixel wide fonts.
This commit is contained in:
ad 1999-04-13 19:02:38 +00:00
parent 2269d36c97
commit 33df642800
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/sparc/dev/fb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.25 1999/04/13 18:45:41 ad Exp $ */
/* $NetBSD: fb.c,v 1.26 1999/04/13 19:02:38 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@ -388,12 +388,15 @@ fbrcons_init(fb)
/* Pick our default font. There is always a fallback */
wsfont_init();
/* XXX leave font init to rasops until rasops1 is fixed */
if (ri->ri_depth != 1)
#ifdef RASTERCONS_SMALLFONT
if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
#else
if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
#endif
wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, WSFONT_LITTLE);
wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE,
WSFONT_LITTLE);
#if !defined(RASTERCONS_FULLSCREEN) && !defined(RASTERCONS_SMALLFONT)
#if defined(SUN4)

11
sys/arch/sparc64/dev/fb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fb.c,v 1.4 1999/04/13 18:45:42 ad Exp $ */
/* $NetBSD: fb.c,v 1.5 1999/04/13 19:02:38 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@ -267,12 +267,15 @@ fbrcons_init(fb)
/* Pick our default font. There is always a fallback */
wsfont_init();
/* XXX leave font init to rasops until rasops1 is fixed */
if (ri->ri_depth != 1)
#ifdef RASTERCONS_SMALLFONT
if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
#else
if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
#endif
wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, WSFONT_LITTLE);
wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE,
WSFONT_LITTLE);
#if !defined(RASTERCONS_FULLSCREEN) && !defined(RASTERCONS_SMALLFONT)
#if defined(SUN4)