Re: kern/51782: pull up VT-220-style GLASSTTY wsconsole fonts to netbsd-7

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

The following reply was made to PR kern/51782; it has been noted by GNATS.

From: "John D. Baker" <jdbaker%mylinuxisp.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: kern/51782: pull up VT-220-style GLASSTTY wsconsole fonts to
 netbsd-7
Date: Thu, 5 Jan 2017 07:35:08 -0600 (CST)

 As mentioned in the PR, patches against "sys/dev/wsfont/files.wsfont"
 and "sys/dev/wsfont/wsfont.c" from netbsd-7:
 
 +Index: sys/dev/wsfont/files.wsfont
 +===================================================================
 +RCS file: /cvsroot/src/sys/dev/wsfont/files.wsfont,v
 +retrieving revision 1.19
 +retrieving revision 1.21
 +diff -u -p -r1.19 -r1.21
 +--- sys/dev/wsfont/files.wsfont	5 Apr 2012 02:46:21 -0000	1.19
 ++++ sys/dev/wsfont/files.wsfont	25 Jan 2015 20:09:42 -0000	1.21
 +@@ -8,6 +8,8 @@ file	dev/wsfont/wsfont.c	(wsfont_glue & 
 +     rasterconsole | wsdisplay | wsfont		needs-flag
 + 
 + defflag	opt_wsfont.h		FONT_BOLD8x16
 ++				FONT_GLASS10x19
 ++				FONT_GLASS10x25
 + 				FONT_GALLANT12x22
 + 				FONT_QVSS8x15
 + 				FONT_LUCIDA16x29
 
 +Index: sys/dev/wsfont/wsfont.c
 +===================================================================
 +RCS file: /cvsroot/src/sys/dev/wsfont/wsfont.c,v
 +retrieving revision 1.55
 +retrieving revision 1.57
 +diff -u -p -r1.55 -r1.57
 +--- sys/dev/wsfont/wsfont.c	5 Apr 2012 02:46:21 -0000	1.55
 ++++ sys/dev/wsfont/wsfont.c	25 Jan 2015 20:09:42 -0000	1.57
 +@@ -115,6 +115,16 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
 + #include <dev/wsfont/omron12x20.h>
 + #endif
 + 
 ++#ifdef FONT_GLASS10x19
 ++#define HAVE_FONT 1
 ++#include <dev/wsfont/glass10x19.h>
 ++#endif
 ++
 ++#ifdef FONT_GLASS10x25
 ++#define HAVE_FONT 1
 ++#include <dev/wsfont/glass10x25.h>
 ++#endif
 ++
 + #ifdef FONT_DEJAVU_SANS_MONO12x22
 + #include <dev/wsfont/DejaVu_Sans_Mono_12x22.h>
 + #endif
 +@@ -207,6 +221,12 @@ static struct font builtin_fonts[] = {
 + #ifdef FONT_OMRON12x20
 + 	{ { NULL, NULL }, &omron12x20, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 + #endif
 ++#ifdef FONT_GLASS10x19
 ++	{ { NULL, NULL }, &Glass_TTY_VT220_10x19, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 ++#endif
 ++#ifdef FONT_GLASS10x25
 ++	{ { NULL, NULL }, &Glass_TTY_VT220_10x25, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 ++#endif
 + #ifdef FONT_DEJAVU_SANS_MONO12x22
 + 	{ { NULL, NULL }, &DejaVu_Sans_Mono_12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 + #endif
 
 -- 
 |/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
 |\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
 | X  No HTML/proprietary data in email.   BSD just sits there and works!
 |/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645