Module Name: src
Committed By: macallan
Date: Fri May 19 19:23:25 UTC 2017
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
enable font loading and screen resizing
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/wsfb/genfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.59 src/sys/dev/wsfb/genfb.c:1.60
--- src/sys/dev/wsfb/genfb.c:1.59 Sat Feb 25 01:11:55 2017
+++ src/sys/dev/wsfb/genfb.c Fri May 19 19:23:24 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.59 2017/02/25 01:11:55 nonaka Exp $ */
+/* $NetBSD: genfb.c,v 1.60 2017/05/19 19:23:24 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.59 2017/02/25 01:11:55 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.60 2017/05/19 19:23:24 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -235,7 +235,8 @@ genfb_attach(struct genfb_softc *sc, str
0, 0,
NULL,
8, 16,
- WSSCREEN_WSCOLORS | WSSCREEN_HILIT,
+ WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE |
+ WSSCREEN_RESIZE,
NULL
};
sc->sc_screens[0] = &sc->sc_defaultscreen_descr;
@@ -538,6 +539,8 @@ genfb_init_screen(void *cookie, struct v
if (sc->sc_want_clear)
ri->ri_flg |= RI_FULLCLEAR;
+ scr->scr_flags |= VCONS_LOADFONT;
+
if (sc->sc_shadowfb != NULL) {
ri->ri_hwbits = (char *)sc->sc_fbaddr;
ri->ri_bits = (char *)sc->sc_shadowfb;
@@ -582,8 +585,8 @@ genfb_init_screen(void *cookie, struct v
rasops_init(ri, 0, 0);
- ri->ri_caps = WSSCREEN_WSCOLORS;
-
+ ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE |
+ WSSCREEN_RESIZE;
rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
sc->sc_width / ri->ri_font->fontwidth);
